Skip to content

Commit 1fa5485

Browse files
estringanaestringana
committed
Remove non required changes
1 parent 432b0c0 commit 1fa5485

4 files changed

Lines changed: 9 additions & 19 deletions

‎tests/Integrations/Laminas/ApiTools/Latest/RESTTest.php‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,6 @@ public static function getTestedLibrary()
2323
return 'laminas-api-tools/api-tools';
2424
}
2525

26-
private static function restFieldsToIgnore(): array
27-
{
28-
// http.status_code and error.message vary between PHP/Laminas versions
29-
return [
30-
'metrics.php.compilation.total_time_ms', 'metrics.php.memory.peak_usage_bytes',
31-
'metrics.php.memory.peak_real_usage_bytes', 'meta.error.stack', 'meta._dd.p.tid',
32-
'start', 'duration', 'meta.http.status_code', 'meta.error.message',
33-
];
34-
}
35-
3626
public function testScenarioRest4xx()
3727
{
3828
$this->tracesFromWebRequestSnapshot(function () {
@@ -42,7 +32,7 @@ public function testScenarioRest4xx()
4232
'/datadog-rest-service/1'
4333
)
4434
);
45-
}, self::restFieldsToIgnore());
35+
});
4636
}
4737

4838
public function testScenarioRest2xx()
@@ -56,7 +46,7 @@ public function testScenarioRest2xx()
5646
['data' => 'dog']
5747
)
5848
);
59-
}, self::restFieldsToIgnore());
49+
});
6050
}
6151

6252
public function testScenarioRest5xx()
@@ -68,6 +58,6 @@ public function testScenarioRest5xx()
6858
'/datadog-rest-service/42'
6959
)
7060
);
71-
}, self::restFieldsToIgnore());
61+
});
7262
}
7363
}

‎tests/snapshots/tests.integrations.laminas.api_tools.latest.rest_test.test_scenario_rest2xx.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"http.method": "POST",
1414
"http.route": "[/v:version]/datadog-rest-service[/:datadog_rest_service_id]",
1515
"_dd.appsec.normalized_route": "/datadog-rest-service",
16-
"http.status_code": "200",
16+
"http.status_code": "201",
1717
"http.url": "http://localhost/datadog-rest-service",
1818
"http.version": "1.1",
1919
"laminas.route.action": "DatadogApi\\V1\\Rest\\DatadogRestService\\DatadogRestServiceResource@create",

‎tests/snapshots/tests.integrations.laminas.api_tools.latest.rest_test.test_scenario_rest4xx.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"http.method": "GET",
1414
"http.route": "[/v:version]/datadog-rest-service[/:datadog_rest_service_id]",
1515
"_dd.appsec.normalized_route": "/datadog-rest-service/{datadog_rest_service_id}",
16-
"http.status_code": "200",
16+
"http.status_code": "405",
1717
"http.url": "http://localhost/datadog-rest-service/1",
1818
"http.version": "1.1",
1919
"laminas.route.action": "DatadogApi\\V1\\Rest\\DatadogRestService\\DatadogRestServiceResource@fetch",

‎tests/snapshots/tests.integrations.laminas.api_tools.latest.rest_test.test_scenario_rest5xx.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
"meta": {
1212
"_dd.p.dm": "-0",
1313
"component": "laminas",
14-
"error.message": "Uncaught Error: Attempt to assign property \"b\" on null in {path}/tests/Frameworks/Laminas/ApiTools/Latest/module/DatadogApi/src/V1/Rest/DatadogRestService/DatadogRestServiceResource.php:55",
14+
"error.message": "Uncaught Error (500): Attempt to assign property \"b\" on null in {path}/tests/Frameworks/Laminas/ApiTools/Latest/module/DatadogApi/src/V1/Rest/DatadogRestService/DatadogRestServiceResource.php:55",
1515
"error.stack": "#0 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas-api-tools/api-tools-rest/src/AbstractResourceListener.php(182): DatadogApi\\V1\\Rest\\DatadogRestService\\DatadogRestServiceResource->fetch()\n#1 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-eventmanager/src/EventManager.php(319): Laminas\\ApiTools\\Rest\\AbstractResourceListener->dispatch()\n#2 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-eventmanager/src/EventManager.php(177): Laminas\\EventManager\\EventManager->triggerListeners()\n#3 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas-api-tools/api-tools-rest/src/Resource.php(544): Laminas\\EventManager\\EventManager->triggerEventUntil()\n#4 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas-api-tools/api-tools-rest/src/Resource.php(499): Laminas\\ApiTools\\Rest\\Resource->triggerEvent()\n#5 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas-api-tools/api-tools-rest/src/RestController.php(493): Laminas\\ApiTools\\Rest\\Resource->fetch()\n#6 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-mvc/src/Controller/AbstractRestfulController.php(372): Laminas\\ApiTools\\Rest\\RestController->get()\n#7 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas-api-tools/api-tools-rest/src/RestController.php(335): Laminas\\Mvc\\Controller\\AbstractRestfulController->onDispatch()\n#8 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-eventmanager/src/EventManager.php(319): Laminas\\ApiTools\\Rest\\RestController->onDispatch()\n#9 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-eventmanager/src/EventManager.php(177): Laminas\\EventManager\\EventManager->triggerListeners()\n#10 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-mvc/src/Controller/AbstractController.php(105): Laminas\\EventManager\\EventManager->triggerEventUntil()\n#11 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-mvc/src/Controller/AbstractRestfulController.php(306): Laminas\\Mvc\\Controller\\AbstractController->dispatch()\n#12 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-mvc/src/DispatchListener.php(117): Laminas\\Mvc\\Controller\\AbstractRestfulController->dispatch()\n#13 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-eventmanager/src/EventManager.php(319): Laminas\\Mvc\\DispatchListener->onDispatch()\n#14 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-eventmanager/src/EventManager.php(177): Laminas\\EventManager\\EventManager->triggerListeners()\n#15 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-mvc/src/Application.php(319): Laminas\\EventManager\\EventManager->triggerEventUntil()\n#16 {path}/tests/Frameworks/Laminas/ApiTools/Latest/public/index.php(60): Laminas\\Mvc\\Application->run()\n#17 {main}",
1616
"error.type": "Error",
1717
"http.method": "GET",
1818
"http.route": "[/v:version]/datadog-rest-service[/:datadog_rest_service_id]",
1919
"_dd.appsec.normalized_route": "/datadog-rest-service/{datadog_rest_service_id}",
20-
"http.status_code": "200",
20+
"http.status_code": "500",
2121
"http.url": "http://localhost/datadog-rest-service/42",
2222
"http.version": "1.1",
2323
"laminas.route.action": "DatadogApi\\V1\\Rest\\DatadogRestService\\DatadogRestServiceResource@fetch",
@@ -376,7 +376,7 @@
376376
"error": 1,
377377
"meta": {
378378
"component": "laminas",
379-
"error.message": "Thrown Error: Attempt to assign property \"b\" on null in {path}/tests/Frameworks/Laminas/ApiTools/Latest/module/DatadogApi/src/V1/Rest/DatadogRestService/DatadogRestServiceResource.php:55",
379+
"error.message": "Thrown Error (500): Attempt to assign property \"b\" on null in {path}/tests/Frameworks/Laminas/ApiTools/Latest/module/DatadogApi/src/V1/Rest/DatadogRestService/DatadogRestServiceResource.php:55",
380380
"error.stack": "#0 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas-api-tools/api-tools-rest/src/AbstractResourceListener.php(182): DatadogApi\\V1\\Rest\\DatadogRestService\\DatadogRestServiceResource->fetch()\n#1 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-eventmanager/src/EventManager.php(319): Laminas\\ApiTools\\Rest\\AbstractResourceListener->dispatch()\n#2 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-eventmanager/src/EventManager.php(177): Laminas\\EventManager\\EventManager->triggerListeners()\n#3 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas-api-tools/api-tools-rest/src/Resource.php(544): Laminas\\EventManager\\EventManager->triggerEventUntil()\n#4 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas-api-tools/api-tools-rest/src/Resource.php(499): Laminas\\ApiTools\\Rest\\Resource->triggerEvent()\n#5 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas-api-tools/api-tools-rest/src/RestController.php(493): Laminas\\ApiTools\\Rest\\Resource->fetch()\n#6 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-mvc/src/Controller/AbstractRestfulController.php(372): Laminas\\ApiTools\\Rest\\RestController->get()\n#7 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas-api-tools/api-tools-rest/src/RestController.php(335): Laminas\\Mvc\\Controller\\AbstractRestfulController->onDispatch()\n#8 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-eventmanager/src/EventManager.php(319): Laminas\\ApiTools\\Rest\\RestController->onDispatch()\n#9 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-eventmanager/src/EventManager.php(177): Laminas\\EventManager\\EventManager->triggerListeners()\n#10 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-mvc/src/Controller/AbstractController.php(105): Laminas\\EventManager\\EventManager->triggerEventUntil()\n#11 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-mvc/src/Controller/AbstractRestfulController.php(306): Laminas\\Mvc\\Controller\\AbstractController->dispatch()\n#12 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-mvc/src/DispatchListener.php(117): Laminas\\Mvc\\Controller\\AbstractRestfulController->dispatch()\n#13 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-eventmanager/src/EventManager.php(319): Laminas\\Mvc\\DispatchListener->onDispatch()\n#14 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-eventmanager/src/EventManager.php(177): Laminas\\EventManager\\EventManager->triggerListeners()\n#15 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-mvc/src/Application.php(319): Laminas\\EventManager\\EventManager->triggerEventUntil()\n#16 {path}/tests/Frameworks/Laminas/ApiTools/Latest/public/index.php(60): Laminas\\Mvc\\Application->run()\n#17 {main}",
381381
"error.type": "Error"
382382
}
@@ -392,7 +392,7 @@
392392
"error": 1,
393393
"meta": {
394394
"component": "laminas",
395-
"error.message": "Thrown Error: Attempt to assign property \"b\" on null in {path}/tests/Frameworks/Laminas/ApiTools/Latest/module/DatadogApi/src/V1/Rest/DatadogRestService/DatadogRestServiceResource.php:55",
395+
"error.message": "Thrown Error (500): Attempt to assign property \"b\" on null in {path}/tests/Frameworks/Laminas/ApiTools/Latest/module/DatadogApi/src/V1/Rest/DatadogRestService/DatadogRestServiceResource.php:55",
396396
"error.stack": "#0 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas-api-tools/api-tools-rest/src/AbstractResourceListener.php(182): DatadogApi\\V1\\Rest\\DatadogRestService\\DatadogRestServiceResource->fetch()\n#1 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-eventmanager/src/EventManager.php(319): Laminas\\ApiTools\\Rest\\AbstractResourceListener->dispatch()\n#2 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-eventmanager/src/EventManager.php(177): Laminas\\EventManager\\EventManager->triggerListeners()\n#3 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas-api-tools/api-tools-rest/src/Resource.php(544): Laminas\\EventManager\\EventManager->triggerEventUntil()\n#4 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas-api-tools/api-tools-rest/src/Resource.php(499): Laminas\\ApiTools\\Rest\\Resource->triggerEvent()\n#5 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas-api-tools/api-tools-rest/src/RestController.php(493): Laminas\\ApiTools\\Rest\\Resource->fetch()\n#6 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-mvc/src/Controller/AbstractRestfulController.php(372): Laminas\\ApiTools\\Rest\\RestController->get()\n#7 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas-api-tools/api-tools-rest/src/RestController.php(335): Laminas\\Mvc\\Controller\\AbstractRestfulController->onDispatch()\n#8 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-eventmanager/src/EventManager.php(319): Laminas\\ApiTools\\Rest\\RestController->onDispatch()\n#9 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-eventmanager/src/EventManager.php(177): Laminas\\EventManager\\EventManager->triggerListeners()\n#10 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-mvc/src/Controller/AbstractController.php(105): Laminas\\EventManager\\EventManager->triggerEventUntil()\n#11 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-mvc/src/Controller/AbstractRestfulController.php(306): Laminas\\Mvc\\Controller\\AbstractController->dispatch()\n#12 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-mvc/src/DispatchListener.php(117): Laminas\\Mvc\\Controller\\AbstractRestfulController->dispatch()\n#13 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-eventmanager/src/EventManager.php(319): Laminas\\Mvc\\DispatchListener->onDispatch()\n#14 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-eventmanager/src/EventManager.php(177): Laminas\\EventManager\\EventManager->triggerListeners()\n#15 {path}/tests/Frameworks/Laminas/ApiTools/Latest/vendor/laminas/laminas-mvc/src/Application.php(319): Laminas\\EventManager\\EventManager->triggerEventUntil()\n#16 {path}/tests/Frameworks/Laminas/ApiTools/Latest/public/index.php(60): Laminas\\Mvc\\Application->run()\n#17 {main}",
397397
"error.type": "Error"
398398
}

0 commit comments

Comments
 (0)