Skip to content

Commit 56e9dfe

Browse files
PROFeNoMPROFeNoM
committed
Fix Laminas calls
1 parent 44cf2a5 commit 56e9dfe

10 files changed

+222
-222
lines changed

‎Makefile

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ TEST_WEB_73 := \
726726
test_web_codeigniter_22 \
727727
test_web_codeigniter_31 \
728728
test_web_drupal_89 \
729-
test_web_laminas_36 \
729+
test_web_laminas_mvc_36 \
730730
test_web_laravel_57 \
731731
test_web_laravel_58 \
732732
test_web_laravel_8x \
@@ -789,7 +789,7 @@ TEST_WEB_74 := \
789789
test_web_codeigniter_31 \
790790
test_web_drupal_89 \
791791
test_web_drupal_95 \
792-
test_web_laminas_36 \
792+
test_web_laminas_mvc_36 \
793793
test_web_laravel_57 \
794794
test_web_laravel_58 \
795795
test_web_laravel_8x \
@@ -852,9 +852,9 @@ TEST_WEB_80 := \
852852
test_web_codeigniter_22 \
853853
test_web_codeigniter_31 \
854854
test_web_drupal_95 \
855-
test_web_laminas_rest_19 \
856-
test_web_laminas_36 \
857-
test_web_laminas_latest \
855+
test_web_laminas_rest_latest \
856+
test_web_laminas_mvc_36 \
857+
test_web_laminas_mvc_latest \
858858
test_web_laravel_8x \
859859
test_web_laravel_9x \
860860
test_web_lumen_81 \
@@ -908,8 +908,8 @@ TEST_WEB_81 := \
908908
test_web_codeigniter_31 \
909909
test_web_drupal_95 \
910910
test_web_drupal_101 \
911-
test_web_laminas_rest_19 \
912-
test_web_laminas_latest \
911+
test_web_laminas_rest_latest \
912+
test_web_laminas_mvc_latest \
913913
test_web_laravel_8x \
914914
test_web_laravel_9x \
915915
test_web_laravel_10x \
@@ -966,8 +966,8 @@ TEST_WEB_82 := \
966966
test_web_codeigniter_31 \
967967
test_web_drupal_95 \
968968
test_web_drupal_101 \
969-
test_web_laminas_rest_19 \
970-
test_web_laminas_latest \
969+
test_web_laminas_rest_latest \
970+
test_web_laminas_mvc_latest \
971971
test_web_laravel_8x \
972972
test_web_laravel_9x \
973973
test_web_laravel_10x \
@@ -1315,11 +1315,11 @@ test_web_drupal_95: global_test_run_dependencies tests/Frameworks/Drupal/Version
13151315
$(call run_tests_debug,tests/Integrations/Drupal/V9_5)
13161316
test_web_drupal_101: global_test_run_dependencies tests/Frameworks/Drupal/Version_10_1/core/composer.lock-php tests/Frameworks/Drupal/Version_10_1/composer.lock-php
13171317
$(call run_tests_debug,tests/Integrations/Drupal/V10_1)
1318-
test_web_laminas_rest_19: global_test_run_dependencies tests/Frameworks/Laminas/ApiTools/Version_1_9/composer.lock-php$(PHP_MAJOR_MINOR)
1319-
$(call run_tests_debug,tests/Integrations/Laminas/ApiTools/V1_9)
1320-
test_web_laminas_36: global_test_run_dependencies tests/Frameworks/Laminas/Mvc/Version_3_6/composer.lock-php$(PHP_MAJOR_MINOR)
1318+
test_web_laminas_rest_latest: global_test_run_dependencies tests/Frameworks/Laminas/ApiTools/Latest/composer.lock-php$(PHP_MAJOR_MINOR)
1319+
$(call run_tests_debug,tests/Integrations/Laminas/ApiTools/Latest)
1320+
test_web_laminas_mvc_36: global_test_run_dependencies tests/Frameworks/Laminas/Mvc/Version_3_6/composer.lock-php$(PHP_MAJOR_MINOR)
13211321
$(call run_tests_debug,tests/Integrations/Laminas/Mvc/V3_6)
1322-
test_web_laminas_latest: global_test_run_dependencies tests/Frameworks/Laminas/Mvc/Latest/composer.lock-php$(PHP_MAJOR_MINOR)
1322+
test_web_laminas_mvc_latest: global_test_run_dependencies tests/Frameworks/Laminas/Mvc/Latest/composer.lock-php$(PHP_MAJOR_MINOR)
13231323
$(call run_tests_debug,tests/Integrations/Laminas/Mvc/Latest)
13241324
test_web_laravel_42: global_test_run_dependencies tests/Frameworks/Laravel/Version_4_2/composer.lock-php$(PHP_MAJOR_MINOR)
13251325
php tests/Frameworks/Laravel/Version_4_2/artisan optimize

‎tests/Integrations/Laminas/Mvc/Latest/CommonScenariosTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public static function getAppIndexScript()
1414

1515
protected static function getEnvs()
1616
{
17-
return array_merge(parent::getEnvs(), ['DD_SERVICE' => 'test_laminas']);
17+
return array_merge(parent::getEnvs(), ['DD_SERVICE' => 'test_laminas_mvc_latest']);
1818
}
1919

2020
public static function getTestedLibrary()

‎tests/snapshots/tests.integrations.laminas.v1_4.common_scenarios_test.test_scenario_get_return_string.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[[
22
{
33
"name": "laminas.request",
4-
"service": "test_laminas",
4+
"service": "test_laminas_mvc_latest",
55
"resource": "Application\\Controller\\CommonSpecsController@simple simple",
66
"trace_id": 0,
77
"span_id": 1,
@@ -24,7 +24,7 @@
2424
},
2525
{
2626
"name": "laminas.application.init",
27-
"service": "test_laminas",
27+
"service": "test_laminas_mvc_latest",
2828
"resource": "laminas.application.init",
2929
"trace_id": 0,
3030
"span_id": 2,
@@ -36,7 +36,7 @@
3636
},
3737
{
3838
"name": "laminas.event.loadModules",
39-
"service": "test_laminas",
39+
"service": "test_laminas_mvc_latest",
4040
"resource": "laminas.event.loadModules",
4141
"trace_id": 0,
4242
"span_id": 4,
@@ -48,7 +48,7 @@
4848
},
4949
{
5050
"name": "laminas.event.loadModules.post",
51-
"service": "test_laminas",
51+
"service": "test_laminas_mvc_latest",
5252
"resource": "laminas.event.loadModules.post",
5353
"trace_id": 0,
5454
"span_id": 5,
@@ -60,7 +60,7 @@
6060
},
6161
{
6262
"name": "laminas.application.bootstrap",
63-
"service": "test_laminas",
63+
"service": "test_laminas_mvc_latest",
6464
"resource": "laminas.application.bootstrap",
6565
"trace_id": 0,
6666
"span_id": 6,
@@ -72,7 +72,7 @@
7272
},
7373
{
7474
"name": "laminas.event.bootstrap",
75-
"service": "test_laminas",
75+
"service": "test_laminas_mvc_latest",
7676
"resource": "laminas.event.bootstrap",
7777
"trace_id": 0,
7878
"span_id": 10,
@@ -84,7 +84,7 @@
8484
},
8585
{
8686
"name": "laminas.mvcEventListener",
87-
"service": "test_laminas",
87+
"service": "test_laminas_mvc_latest",
8888
"resource": "Laminas\\Mvc\\View\\Http\\ViewManager@onBootstrap",
8989
"trace_id": 0,
9090
"span_id": 16,
@@ -96,7 +96,7 @@
9696
},
9797
{
9898
"name": "laminas.application.run",
99-
"service": "test_laminas",
99+
"service": "test_laminas_mvc_latest",
100100
"resource": "laminas.application.run",
101101
"trace_id": 0,
102102
"span_id": 3,
@@ -108,7 +108,7 @@
108108
},
109109
{
110110
"name": "laminas.event.route",
111-
"service": "test_laminas",
111+
"service": "test_laminas_mvc_latest",
112112
"resource": "laminas.event.route",
113113
"trace_id": 0,
114114
"span_id": 7,
@@ -120,7 +120,7 @@
120120
},
121121
{
122122
"name": "laminas.mvcEventListener",
123-
"service": "test_laminas",
123+
"service": "test_laminas_mvc_latest",
124124
"resource": "Laminas\\Mvc\\HttpMethodListener@onRoute",
125125
"trace_id": 0,
126126
"span_id": 11,
@@ -132,7 +132,7 @@
132132
},
133133
{
134134
"name": "laminas.mvcEventListener",
135-
"service": "test_laminas",
135+
"service": "test_laminas_mvc_latest",
136136
"resource": "Laminas\\Mvc\\RouteListener@onRoute",
137137
"trace_id": 0,
138138
"span_id": 12,
@@ -144,7 +144,7 @@
144144
},
145145
{
146146
"name": "laminas.route.match",
147-
"service": "test_laminas",
147+
"service": "test_laminas_mvc_latest",
148148
"resource": "Laminas\\Router\\Http\\TreeRouteStack@match",
149149
"trace_id": 0,
150150
"span_id": 17,
@@ -156,7 +156,7 @@
156156
},
157157
{
158158
"name": "laminas.event.dispatch",
159-
"service": "test_laminas",
159+
"service": "test_laminas_mvc_latest",
160160
"resource": "laminas.event.dispatch",
161161
"trace_id": 0,
162162
"span_id": 8,
@@ -168,7 +168,7 @@
168168
},
169169
{
170170
"name": "laminas.mvcEventListener",
171-
"service": "test_laminas",
171+
"service": "test_laminas_mvc_latest",
172172
"resource": "Laminas\\Mvc\\MiddlewareListener@onDispatch",
173173
"trace_id": 0,
174174
"span_id": 13,
@@ -180,7 +180,7 @@
180180
},
181181
{
182182
"name": "laminas.mvcEventListener",
183-
"service": "test_laminas",
183+
"service": "test_laminas_mvc_latest",
184184
"resource": "Laminas\\Mvc\\DispatchListener@onDispatch",
185185
"trace_id": 0,
186186
"span_id": 14,
@@ -192,7 +192,7 @@
192192
},
193193
{
194194
"name": "laminas.controller.dispatch",
195-
"service": "test_laminas",
195+
"service": "test_laminas_mvc_latest",
196196
"resource": "Application\\Controller\\CommonSpecsController",
197197
"trace_id": 0,
198198
"span_id": 18,
@@ -204,7 +204,7 @@
204204
},
205205
{
206206
"name": "laminas.mvcEventListener",
207-
"service": "test_laminas",
207+
"service": "test_laminas_mvc_latest",
208208
"resource": "Application\\Controller\\CommonSpecsController@onDispatch",
209209
"trace_id": 0,
210210
"span_id": 19,
@@ -216,7 +216,7 @@
216216
},
217217
{
218218
"name": "laminas.controller.action",
219-
"service": "test_laminas",
219+
"service": "test_laminas_mvc_latest",
220220
"resource": "Application\\Controller\\CommonSpecsController@simpleAction",
221221
"trace_id": 0,
222222
"span_id": 20,
@@ -228,7 +228,7 @@
228228
},
229229
{
230230
"name": "laminas.event.finish",
231-
"service": "test_laminas",
231+
"service": "test_laminas_mvc_latest",
232232
"resource": "laminas.event.finish",
233233
"trace_id": 0,
234234
"span_id": 9,
@@ -240,7 +240,7 @@
240240
},
241241
{
242242
"name": "laminas.mvcEventListener",
243-
"service": "test_laminas",
243+
"service": "test_laminas_mvc_latest",
244244
"resource": "Laminas\\Mvc\\SendResponseListener@sendResponse",
245245
"trace_id": 0,
246246
"span_id": 15,

0 commit comments

Comments
 (0)