From 6fbef866de4d07b1be24bebda728963352f1f8fc Mon Sep 17 00:00:00 2001 From: Barthold Bos Date: Fri, 8 Dec 2023 14:31:46 +0100 Subject: [PATCH 1/5] Allow symfony 7.0 and rename MASTER_REQUEST to MAIN_REQUEST --- composer.json | 16 ++++++++-------- src/EventListener/BlameListener.php | 2 +- src/EventListener/LoggerListener.php | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 068e9952..59a8f4ec 100644 --- a/composer.json +++ b/composer.json @@ -13,17 +13,17 @@ ], "require": { "php": "^7.2.5 || ^8.0", - "symfony/cache": "^5.4 || ^6.0", - "symfony/config": "^5.4 || ^6.0", - "symfony/dependency-injection": "^5.4 || ^6.0", - "symfony/event-dispatcher": "^5.4 || ^6.0", - "symfony/http-kernel": "^5.4 || ^6.0", + "symfony/cache": "^5.4 || ^6.0 || ^7.0", + "symfony/config": "^5.4 || ^6.0 || ^7.0", + "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0", + "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0", + "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0", "gedmo/doctrine-extensions": "^3.5.0" }, "require-dev": { - "symfony/mime": "^5.4 || ^6.0", - "symfony/phpunit-bridge": "^v5.4 || ^6.0", - "symfony/security-core": "^5.4 || ^6.0" + "symfony/mime": "^5.4 || ^6.0 || ^7.0", + "symfony/phpunit-bridge": "^v5.4 || ^6.0 || ^7.0", + "symfony/security-core": "^5.4 || ^6.0 || ^7.0" }, "suggest": { "doctrine/doctrine-bundle": "to use the ORM extensions", diff --git a/src/EventListener/BlameListener.php b/src/EventListener/BlameListener.php index 77131f05..e469b18d 100644 --- a/src/EventListener/BlameListener.php +++ b/src/EventListener/BlameListener.php @@ -34,7 +34,7 @@ public function __construct(BlameableListener $blameableListener, TokenStorageIn */ public function onKernelRequest(RequestEvent $event) { - if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) { + if (HttpKernelInterface::MAIN_REQUEST !== $event->getRequestType()) { return; } diff --git a/src/EventListener/LoggerListener.php b/src/EventListener/LoggerListener.php index 5d4ee01c..f7ed9911 100644 --- a/src/EventListener/LoggerListener.php +++ b/src/EventListener/LoggerListener.php @@ -33,7 +33,7 @@ public function __construct(LoggableListener $loggableListener, TokenStorageInte */ public function onKernelRequest(RequestEvent $event) { - if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) { + if (HttpKernelInterface::MAIN_REQUEST !== $event->getRequestType()) { return; } From 8b1491dc86600c24af3dbdff8ca8a45c7973dc10 Mon Sep 17 00:00:00 2001 From: Barthold Bos Date: Fri, 8 Dec 2023 14:39:13 +0100 Subject: [PATCH 2/5] Allow symfony 7.0 and rename MASTER_REQUEST to MAIN_REQUEST --- src/EventListener/BlameListener.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/EventListener/BlameListener.php b/src/EventListener/BlameListener.php index e469b18d..77131f05 100644 --- a/src/EventListener/BlameListener.php +++ b/src/EventListener/BlameListener.php @@ -34,7 +34,7 @@ public function __construct(BlameableListener $blameableListener, TokenStorageIn */ public function onKernelRequest(RequestEvent $event) { - if (HttpKernelInterface::MAIN_REQUEST !== $event->getRequestType()) { + if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) { return; } From 3c9900b2e8ff21a284f603b8dab56182e8234741 Mon Sep 17 00:00:00 2001 From: Barthold Bos Date: Fri, 8 Dec 2023 14:45:09 +0100 Subject: [PATCH 3/5] Allow symfony 7.0 and rename MASTER_REQUEST to MAIN_REQUEST --- src/EventListener/BlameListener.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/EventListener/BlameListener.php b/src/EventListener/BlameListener.php index 77131f05..e469b18d 100644 --- a/src/EventListener/BlameListener.php +++ b/src/EventListener/BlameListener.php @@ -34,7 +34,7 @@ public function __construct(BlameableListener $blameableListener, TokenStorageIn */ public function onKernelRequest(RequestEvent $event) { - if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) { + if (HttpKernelInterface::MAIN_REQUEST !== $event->getRequestType()) { return; } From 89d72b389706dbeade7737394a20854e7cd7fa5d Mon Sep 17 00:00:00 2001 From: Barthold Bos Date: Fri, 8 Dec 2023 14:52:08 +0100 Subject: [PATCH 4/5] Allow symfony 7.0 and rename MASTER_REQUEST to MAIN_REQUEST --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 59a8f4ec..f1747136 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ }, "require-dev": { "symfony/mime": "^5.4 || ^6.0 || ^7.0", - "symfony/phpunit-bridge": "^v5.4 || ^6.0 || ^7.0", + "symfony/phpunit-bridge": "^v5.4 || ^6.0", "symfony/security-core": "^5.4 || ^6.0 || ^7.0" }, "suggest": { From 8cc7141afd2b42835cb79df6b86b6594255b4f8f Mon Sep 17 00:00:00 2001 From: Barthold Bos Date: Fri, 8 Dec 2023 14:54:15 +0100 Subject: [PATCH 5/5] Allow symfony 7.0 and rename MASTER_REQUEST to MAIN_REQUEST --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f1747136..59a8f4ec 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ }, "require-dev": { "symfony/mime": "^5.4 || ^6.0 || ^7.0", - "symfony/phpunit-bridge": "^v5.4 || ^6.0", + "symfony/phpunit-bridge": "^v5.4 || ^6.0 || ^7.0", "symfony/security-core": "^5.4 || ^6.0 || ^7.0" }, "suggest": {