diff --git a/composer.json b/composer.json index cebd788..ced3e87 100644 --- a/composer.json +++ b/composer.json @@ -6,20 +6,20 @@ "type": "symfony-bundle", "require": { "php": "^7.4 || ^8.0", - "symfony/framework-bundle": "^4.4 || ^5.4 || ^6.0", + "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0", "ramsey/uuid": "^3.9 || ^4.3" }, "require-dev": { "phpunit/phpunit": "^9.5", "symfony/monolog-bundle": "^3.7", "twig/twig": "^2.7 || ^3.0", - "symfony/twig-bundle": "^4.4 || ^5.4 || ^6.0", - "symfony/browser-kit": "^4.4 || ^5.4 || ^6.0", - "symfony/css-selector": "^4.4 || ^5.4 || ^6.0", - "symfony/phpunit-bridge": "^4.4 || ^5.4 || ^6.0", - "symfony/yaml": "^4.4 || ^5.4 || ^6.0", - "symfony/templating": "^4.4 || ^5.4 || ^6.0", - "symfony/monolog-bridge": "^4.4 || ^5.4 || ^6.0" + "symfony/twig-bundle": "^5.4 || ^6.0 || ^7.0", + "symfony/browser-kit": "^5.4 || ^6.0 || ^7.0", + "symfony/css-selector": "^5.4 || ^6.0 || ^7.0", + "symfony/phpunit-bridge": "^5.4 || ^6.0 || ^7.0", + "symfony/yaml": "^5.4 || ^6.0 || ^7.0", + "symfony/templating": "^5.4 || ^6.0 || ^7.0", + "symfony/monolog-bridge": "^5.4 || ^6.0 || ^7.0" }, "autoload": { "psr-4": { diff --git a/test/unit/EventListener/RequestIdListenerTest.php b/test/unit/EventListener/RequestIdListenerTest.php index 44ee1fb..3860da9 100644 --- a/test/unit/EventListener/RequestIdListenerTest.php +++ b/test/unit/EventListener/RequestIdListenerTest.php @@ -15,7 +15,6 @@ use Chrisguitarguy\RequestId\RequestIdGenerator; use Chrisguitarguy\RequestId\RequestIdStorage; use Chrisguitarguy\RequestId\UnitTestCase; -use Symfony\Component\EventDispatcher\Event; use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -56,7 +55,7 @@ public function testListenerSetsTheRequestIdToStorageWhenFoundInRequestHeaders() $event = new RequestEvent( $this->kernel, $this->request, - HttpKernelInterface::MASTER_REQUEST + HttpKernelInterface::MAIN_REQUEST ); $this->dispatcher->dispatch($event, KernelEvents::REQUEST); @@ -73,7 +72,7 @@ public function testListenerSetsTheIdOnRequestWhenItsFoundInStorage() $event = new RequestEvent( $this->kernel, $this->request, - HttpKernelInterface::MASTER_REQUEST + HttpKernelInterface::MAIN_REQUEST ); $this->dispatcher->dispatch($event, KernelEvents::REQUEST); @@ -95,7 +94,7 @@ public function testListenerGenerateNewIdAndSetsItOnRequestAndStorageWhenNoIdIsF $event = new RequestEvent( $this->kernel, $this->request, - HttpKernelInterface::MASTER_REQUEST + HttpKernelInterface::MAIN_REQUEST ); $this->dispatcher->dispatch($event, KernelEvents::REQUEST); @@ -128,7 +127,7 @@ public function testListenerIgnoresIncomingRequestHeadersWhenTrustRequestIsFalse $event = new RequestEvent( $this->kernel, $this->request, - HttpKernelInterface::MASTER_REQUEST + HttpKernelInterface::MAIN_REQUEST ); $this->dispatcher->dispatch($event, KernelEvents::REQUEST); @@ -164,7 +163,7 @@ public function testRequestWithoutIdInStorageDoesNotSetHeaderOnResponse() new ResponseEvent( $this->kernel, $this->request, - HttpKernelInterface::MASTER_REQUEST, + HttpKernelInterface::MAIN_REQUEST, $this->response ), KernelEvents::RESPONSE @@ -183,7 +182,7 @@ public function testRequestWithIdInStorageSetsIdOnResponse() new ResponseEvent( $this->kernel, $this->request, - HttpKernelInterface::MASTER_REQUEST, + HttpKernelInterface::MAIN_REQUEST, $this->response ), KernelEvents::RESPONSE