From 0f55496abf8d1c31323906abd47f0bbee269aa1a Mon Sep 17 00:00:00 2001 From: Barbuslex Date: Thu, 26 Sep 2024 09:54:23 +0200 Subject: [PATCH 01/25] =?UTF-8?q?=F0=9F=91=8CIMPROVE:=20compatibility=20wi?= =?UTF-8?q?th=20Symfony=207.0+?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 6 +++--- src/DependencyInjection/Configuration.php | 4 ++-- src/EventListener/BreadcrumbListener.php | 2 +- src/Resources/config/services.xml | 7 +++++++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 55cf879..51389d5 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "license": "MIT", "require": { "php": ">=7.2", - "symfony/framework-bundle": "^4.4|^5.0|^6.0", + "symfony/framework-bundle": "^4.4|^5.0|^6.0|^7.0", "twig/twig": "^2.15|^3.0", "symfony/deprecation-contracts": "^2.4|^3.0" }, @@ -23,10 +23,10 @@ }, "require-dev": { "symfony/phpunit-bridge": "^5.0|^6.0", - "nyholm/symfony-bundle-test": "^v2.0", + "nyholm/symfony-bundle-test": "^v3.0", "matthiasnoback/symfony-dependency-injection-test": "^4.0", "doctrine/doctrine-bundle": "^v1.0|^v2.0", - "doctrine/annotations": "^v1.7", + "doctrine/annotations": "^2.0", "symfony/twig-bundle": "^3.4|^4.0|^5.0|^6.0" }, "autoload-dev": { diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index 46e48d6..66cf70a 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -16,7 +16,7 @@ class Configuration implements ConfigurationInterface { #[\ReturnTypeWillChange] - public function getConfigTreeBuilder() + public function getConfigTreeBuilder(): TreeBuilder { $treeBuilder = new TreeBuilder('apy_breadcrumb_trail'); // BC layer for symfony/config < 4.2 @@ -27,7 +27,7 @@ public function getConfigTreeBuilder() ->scalarNode('template') ->defaultValue('@APYBreadcrumbTrail/breadcrumbtrail.html.twig') ->end() - ->end() + ->end() ; return $treeBuilder; diff --git a/src/EventListener/BreadcrumbListener.php b/src/EventListener/BreadcrumbListener.php index 6978c56..6aca47e 100644 --- a/src/EventListener/BreadcrumbListener.php +++ b/src/EventListener/BreadcrumbListener.php @@ -70,7 +70,7 @@ public function onKernelController(KernelEvent $event) throw new \InvalidArgumentException(sprintf('Annotations from class "%s" cannot be read as it is abstract.', $class)); } - if (HttpKernelInterface::MASTER_REQUEST == $event->getRequestType()) { + if (HttpKernelInterface::MAIN_REQUEST == $event->getRequestType()) { $this->breadcrumbTrail->reset(); // Annotations from class diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml index 8d882c4..9fa86f9 100644 --- a/src/Resources/config/services.xml +++ b/src/Resources/config/services.xml @@ -19,5 +19,12 @@ + + + + + + + From 910964f2d8ea816de406a0f59fa3dcccf4844283 Mon Sep 17 00:00:00 2001 From: Barbuslex Date: Tue, 15 Oct 2024 08:56:41 +0200 Subject: [PATCH 02/25] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20symfony=20bundle=20?= =?UTF-8?q?test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 51389d5..4713936 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ }, "require-dev": { "symfony/phpunit-bridge": "^5.0|^6.0", - "nyholm/symfony-bundle-test": "^v3.0", + "nyholm/symfony-bundle-test": "v2.0|v3.0", "matthiasnoback/symfony-dependency-injection-test": "^4.0", "doctrine/doctrine-bundle": "^v1.0|^v2.0", "doctrine/annotations": "^2.0", From f31467c074d9f9e0fd2bfa490729a30a90c7e9ef Mon Sep 17 00:00:00 2001 From: Barbuslex Date: Tue, 15 Oct 2024 09:03:05 +0200 Subject: [PATCH 03/25] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20revert=20symfony=20?= =?UTF-8?q?bundle=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4713936..51389d5 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ }, "require-dev": { "symfony/phpunit-bridge": "^5.0|^6.0", - "nyholm/symfony-bundle-test": "v2.0|v3.0", + "nyholm/symfony-bundle-test": "^v3.0", "matthiasnoback/symfony-dependency-injection-test": "^4.0", "doctrine/doctrine-bundle": "^v1.0|^v2.0", "doctrine/annotations": "^2.0", From 944e503307392cc195c697abd2b942e53a16a50e Mon Sep 17 00:00:00 2001 From: Barbuslex Date: Tue, 15 Oct 2024 09:08:43 +0200 Subject: [PATCH 04/25] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20symfony=20bundle=20?= =?UTF-8?q?tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 51389d5..dba1e1e 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ }, "require-dev": { "symfony/phpunit-bridge": "^5.0|^6.0", - "nyholm/symfony-bundle-test": "^v3.0", + "nyholm/symfony-bundle-test": "^v2.0|^v3.0", "matthiasnoback/symfony-dependency-injection-test": "^4.0", "doctrine/doctrine-bundle": "^v1.0|^v2.0", "doctrine/annotations": "^2.0", From 51bfe9f55096b8e5d5cad2b01d6c69f004e645d5 Mon Sep 17 00:00:00 2001 From: Barbuslex Date: Tue, 15 Oct 2024 13:31:24 +0200 Subject: [PATCH 05/25] =?UTF-8?q?=F0=9F=93=96=20DOC:=20update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e1d718e..9e8169b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Getting Started With BreadcrumbTrailBundle +Getting Started With BreadcrumbTrailBundle ========================================== This bundle provides a breadcrumb trail service also known as breadcrumbs or Fil d'Ariane. From f2e24b473a37cbe227d1036f9085b3e6a67bae36 Mon Sep 17 00:00:00 2001 From: Barbuslex Date: Tue, 15 Oct 2024 13:47:00 +0200 Subject: [PATCH 06/25] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20kernel=20Request=20?= =?UTF-8?q?type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/EventListener/BreadcrumbListener.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/EventListener/BreadcrumbListener.php b/src/EventListener/BreadcrumbListener.php index 6aca47e..2dea7c9 100644 --- a/src/EventListener/BreadcrumbListener.php +++ b/src/EventListener/BreadcrumbListener.php @@ -70,7 +70,9 @@ public function onKernelController(KernelEvent $event) throw new \InvalidArgumentException(sprintf('Annotations from class "%s" cannot be read as it is abstract.', $class)); } - if (HttpKernelInterface::MAIN_REQUEST == $event->getRequestType()) { + $kernelRequest = defined('HttpKernelInterface::MASTER_REQUEST') ? HttpKernelInterface::MASTER_REQUEST : HttpKernelInterface::MAIN_REQUEST; + + if ($kernelRequest == $event->getRequestType()) { $this->breadcrumbTrail->reset(); // Annotations from class From bcb2eb05497a09c7b4a49caf3289a1f974f7448a Mon Sep 17 00:00:00 2001 From: Barbuslex Date: Tue, 15 Oct 2024 13:50:46 +0200 Subject: [PATCH 07/25] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20kernet=20Request=20?= =?UTF-8?q?type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/EventListener/BreadcrumbListener.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/EventListener/BreadcrumbListener.php b/src/EventListener/BreadcrumbListener.php index 2dea7c9..101dcd3 100644 --- a/src/EventListener/BreadcrumbListener.php +++ b/src/EventListener/BreadcrumbListener.php @@ -17,6 +17,7 @@ use APY\BreadcrumbTrailBundle\MixedAnnotationWithAttributeBreadcrumbsException; use Doctrine\Common\Annotations\Reader; use Symfony\Component\HttpKernel\Event\KernelEvent; +use Symfony\Component\HttpKernel\HttpKernel; use Symfony\Component\HttpKernel\HttpKernelInterface; class BreadcrumbListener @@ -70,7 +71,7 @@ public function onKernelController(KernelEvent $event) throw new \InvalidArgumentException(sprintf('Annotations from class "%s" cannot be read as it is abstract.', $class)); } - $kernelRequest = defined('HttpKernelInterface::MASTER_REQUEST') ? HttpKernelInterface::MASTER_REQUEST : HttpKernelInterface::MAIN_REQUEST; + $kernelRequest = defined(HttpKernelInterface::class.'::MASTER_REQUEST') ? HttpKernelInterface::MASTER_REQUEST : HttpKernelInterface::MAIN_REQUEST; if ($kernelRequest == $event->getRequestType()) { $this->breadcrumbTrail->reset(); From ce27e90c036bae9f4e32d93e9040d4634ec90b3a Mon Sep 17 00:00:00 2001 From: Barbuslex Date: Tue, 15 Oct 2024 13:55:11 +0200 Subject: [PATCH 08/25] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20kernel=20test=20cas?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/Twig/BreadcrumbTrailExtensionTest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Twig/BreadcrumbTrailExtensionTest.php b/tests/Twig/BreadcrumbTrailExtensionTest.php index 3994ddd..3040a9e 100644 --- a/tests/Twig/BreadcrumbTrailExtensionTest.php +++ b/tests/Twig/BreadcrumbTrailExtensionTest.php @@ -34,7 +34,8 @@ protected static function createKernel(array $options = []): KernelInterface */ public function testTwigFunctionGetsRegistered() { - $container = self::getContainer(); + $kernel = $this->bootKernel(); + $container = $kernel->getContainer(); /** @var BreadcrumbTrailExtension $extension */ $extension = $container->get(BreadcrumbTrailExtension::class); From 0473cb6333dbb558392c81fd254cb161944058dd Mon Sep 17 00:00:00 2001 From: Barbuslex Date: Tue, 15 Oct 2024 13:59:28 +0200 Subject: [PATCH 09/25] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20kernel=20test=20cas?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/Twig/BreadcrumbTrailExtensionTest.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/Twig/BreadcrumbTrailExtensionTest.php b/tests/Twig/BreadcrumbTrailExtensionTest.php index 3040a9e..1a54f7a 100644 --- a/tests/Twig/BreadcrumbTrailExtensionTest.php +++ b/tests/Twig/BreadcrumbTrailExtensionTest.php @@ -34,8 +34,7 @@ protected static function createKernel(array $options = []): KernelInterface */ public function testTwigFunctionGetsRegistered() { - $kernel = $this->bootKernel(); - $container = $kernel->getContainer(); + $container = static::getContainer(); /** @var BreadcrumbTrailExtension $extension */ $extension = $container->get(BreadcrumbTrailExtension::class); From a31c29ddab5eca3a3a8f9a3f20debe8189d6e4fb Mon Sep 17 00:00:00 2001 From: Barbuslex Date: Tue, 15 Oct 2024 14:03:10 +0200 Subject: [PATCH 10/25] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20kernel=20test=20cas?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/Twig/BreadcrumbTrailExtensionTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Twig/BreadcrumbTrailExtensionTest.php b/tests/Twig/BreadcrumbTrailExtensionTest.php index 1a54f7a..1c4075a 100644 --- a/tests/Twig/BreadcrumbTrailExtensionTest.php +++ b/tests/Twig/BreadcrumbTrailExtensionTest.php @@ -34,7 +34,7 @@ protected static function createKernel(array $options = []): KernelInterface */ public function testTwigFunctionGetsRegistered() { - $container = static::getContainer(); + $container = defined('self::$container') ? self::$container : self::getContainer(); /** @var BreadcrumbTrailExtension $extension */ $extension = $container->get(BreadcrumbTrailExtension::class); From 30b1579266db702930fee29d6037958e9ab12eb9 Mon Sep 17 00:00:00 2001 From: Barbuslex Date: Tue, 15 Oct 2024 14:06:10 +0200 Subject: [PATCH 11/25] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20kernel=20test=20cas?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/Twig/BreadcrumbTrailExtensionTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Twig/BreadcrumbTrailExtensionTest.php b/tests/Twig/BreadcrumbTrailExtensionTest.php index 1c4075a..23a2087 100644 --- a/tests/Twig/BreadcrumbTrailExtensionTest.php +++ b/tests/Twig/BreadcrumbTrailExtensionTest.php @@ -34,7 +34,7 @@ protected static function createKernel(array $options = []): KernelInterface */ public function testTwigFunctionGetsRegistered() { - $container = defined('self::$container') ? self::$container : self::getContainer(); + $container = defined(KernelTestCase::class.'::$container') ? self::$container : self::getContainer(); /** @var BreadcrumbTrailExtension $extension */ $extension = $container->get(BreadcrumbTrailExtension::class); From 1f66be777c7eb7f0b6134dc499047ed92e4f5ac6 Mon Sep 17 00:00:00 2001 From: Barbuslex Date: Tue, 15 Oct 2024 14:09:49 +0200 Subject: [PATCH 12/25] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20kernel=20test=20cas?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/Twig/BreadcrumbTrailExtensionTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Twig/BreadcrumbTrailExtensionTest.php b/tests/Twig/BreadcrumbTrailExtensionTest.php index 23a2087..8b966df 100644 --- a/tests/Twig/BreadcrumbTrailExtensionTest.php +++ b/tests/Twig/BreadcrumbTrailExtensionTest.php @@ -34,7 +34,7 @@ protected static function createKernel(array $options = []): KernelInterface */ public function testTwigFunctionGetsRegistered() { - $container = defined(KernelTestCase::class.'::$container') ? self::$container : self::getContainer(); + $container = method_exists($this, 'getContainer') ? self::getContainer() : self::$container; /** @var BreadcrumbTrailExtension $extension */ $extension = $container->get(BreadcrumbTrailExtension::class); From 717c6ccad877afc15504a04fff2fe35e59d71b14 Mon Sep 17 00:00:00 2001 From: Barbuslex Date: Tue, 15 Oct 2024 14:14:02 +0200 Subject: [PATCH 13/25] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20kernel=20test=20cas?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/Twig/BreadcrumbTrailExtensionTest.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/Twig/BreadcrumbTrailExtensionTest.php b/tests/Twig/BreadcrumbTrailExtensionTest.php index 8b966df..dec33c3 100644 --- a/tests/Twig/BreadcrumbTrailExtensionTest.php +++ b/tests/Twig/BreadcrumbTrailExtensionTest.php @@ -34,7 +34,13 @@ protected static function createKernel(array $options = []): KernelInterface */ public function testTwigFunctionGetsRegistered() { - $container = method_exists($this, 'getContainer') ? self::getContainer() : self::$container; + if(method_exists($this, 'getContainer')) { + $container = self::getContainer(); + } + else { + self::bootKernel(); + $container = self::$container; + } /** @var BreadcrumbTrailExtension $extension */ $extension = $container->get(BreadcrumbTrailExtension::class); From 5f28cfde32aa48c0101703a8450606da6499f6e2 Mon Sep 17 00:00:00 2001 From: Barbuslex Date: Tue, 15 Oct 2024 14:20:33 +0200 Subject: [PATCH 14/25] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20use=5Fnullable=5Fty?= =?UTF-8?q?pe=5Fdeclaration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .php-cs-fixer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index e914a6a..cae33d7 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -11,7 +11,7 @@ '@Symfony' => true, '@Symfony:risky' => true, 'protected_to_private' => false, - 'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => false], + 'nullable_type_declaration_for_default_null_value' => false, ]) ->setRiskyAllowed(true) ->setFinder( From 2d67760e224eb7f58a57a8f843a2323cf93920f6 Mon Sep 17 00:00:00 2001 From: Barbuslex Date: Tue, 15 Oct 2024 14:24:35 +0200 Subject: [PATCH 15/25] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20symfony/phpunit-bri?= =?UTF-8?q?dge=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index dba1e1e..6412046 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "psr-4": { "APY\\BreadcrumbTrailBundle\\": "src/" } }, "require-dev": { - "symfony/phpunit-bridge": "^5.0|^6.0", + "symfony/phpunit-bridge": "^5.0|^6.0|^7.0", "nyholm/symfony-bundle-test": "^v2.0|^v3.0", "matthiasnoback/symfony-dependency-injection-test": "^4.0", "doctrine/doctrine-bundle": "^v1.0|^v2.0", From 23ce6cf9b58c75b8ae37f9da33cc97b408e10f1e Mon Sep 17 00:00:00 2001 From: Barbuslex Date: Tue, 15 Oct 2024 14:32:55 +0200 Subject: [PATCH 16/25] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20AnnotationRegistry:?= =?UTF-8?q?:registerLoader()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 6412046..0cf68e4 100644 --- a/composer.json +++ b/composer.json @@ -26,8 +26,8 @@ "nyholm/symfony-bundle-test": "^v2.0|^v3.0", "matthiasnoback/symfony-dependency-injection-test": "^4.0", "doctrine/doctrine-bundle": "^v1.0|^v2.0", - "doctrine/annotations": "^2.0", - "symfony/twig-bundle": "^3.4|^4.0|^5.0|^6.0" + "doctrine/annotations": "^1.0|^2.0", + "symfony/twig-bundle": "^4.0|^5.0|^6.0|^7.0" }, "autoload-dev": { "psr-4": { "APY\\BreadcrumbTrailBundle\\": "tests/" } From e8a4cee3040ea4eec1a0bfa577a8d108166372fe Mon Sep 17 00:00:00 2001 From: Barbuslex Date: Tue, 15 Oct 2024 14:47:31 +0200 Subject: [PATCH 17/25] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20CS=20Fixer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BreadcrumbTrail/Trail.php | 2 +- src/EventListener/BreadcrumbListener.php | 1 - tests/Twig/BreadcrumbTrailExtensionTest.php | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/BreadcrumbTrail/Trail.php b/src/BreadcrumbTrail/Trail.php index 9a28223..a30c4d8 100644 --- a/src/BreadcrumbTrail/Trail.php +++ b/src/BreadcrumbTrail/Trail.php @@ -70,7 +70,7 @@ public function getTemplate() * * @return self * - *@throws \InvalidArgumentException + * @throws \InvalidArgumentException * @throws \RuntimeException */ public function add($breadcrumbOrTitle, $routeName = null, $routeParameters = [], $routeAbsolute = true, $position = 0, $attributes = []) diff --git a/src/EventListener/BreadcrumbListener.php b/src/EventListener/BreadcrumbListener.php index 101dcd3..42d4cdd 100644 --- a/src/EventListener/BreadcrumbListener.php +++ b/src/EventListener/BreadcrumbListener.php @@ -17,7 +17,6 @@ use APY\BreadcrumbTrailBundle\MixedAnnotationWithAttributeBreadcrumbsException; use Doctrine\Common\Annotations\Reader; use Symfony\Component\HttpKernel\Event\KernelEvent; -use Symfony\Component\HttpKernel\HttpKernel; use Symfony\Component\HttpKernel\HttpKernelInterface; class BreadcrumbListener diff --git a/tests/Twig/BreadcrumbTrailExtensionTest.php b/tests/Twig/BreadcrumbTrailExtensionTest.php index dec33c3..15f9aff 100644 --- a/tests/Twig/BreadcrumbTrailExtensionTest.php +++ b/tests/Twig/BreadcrumbTrailExtensionTest.php @@ -36,8 +36,7 @@ public function testTwigFunctionGetsRegistered() { if(method_exists($this, 'getContainer')) { $container = self::getContainer(); - } - else { + } else { self::bootKernel(); $container = self::$container; } From 2466d58063d01d95105b64a60befba23252dc842 Mon Sep 17 00:00:00 2001 From: Barbuslex Date: Tue, 15 Oct 2024 14:59:43 +0200 Subject: [PATCH 18/25] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20PHP=20CS=20Fixer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Annotation/Breadcrumb.php | 12 ++++++------ src/BreadcrumbTrail/Trail.php | 10 ++-------- .../APYBreadcrumbTrailExtension.php | 3 --- src/EventListener/BreadcrumbListener.php | 6 +++--- tests/Twig/BreadcrumbTrailExtensionTest.php | 2 +- 5 files changed, 12 insertions(+), 21 deletions(-) diff --git a/src/Annotation/Breadcrumb.php b/src/Annotation/Breadcrumb.php index a6334f3..64cb1e1 100644 --- a/src/Annotation/Breadcrumb.php +++ b/src/Annotation/Breadcrumb.php @@ -20,12 +20,12 @@ class Breadcrumb /** * @var string Title of the breadcrumb */ - private $title = null; + private $title; /** * @var string The name of the route */ - private $routeName = null; + private $routeName; /** * @var mixed An array of parameters for the route @@ -45,7 +45,7 @@ class Breadcrumb /** * @var string Template of the breadcrumb trail */ - private $template = null; + private $template; /** * @var array with additional attributes for the breadcrumb @@ -68,7 +68,7 @@ public function __construct( $routeAbsolute = null, $position = null, $template = null, - $attributes = null + $attributes = null, ) { $data = []; @@ -101,7 +101,7 @@ public function __construct( foreach ($data['route'] as $key => $value) { $method = 'setRoute'.$key; if (!method_exists($this, $method)) { - throw new \BadMethodCallException(sprintf("Unknown property '%s' for the 'route' parameter on annotation '%s'.", $key, static::class)); + throw new \BadMethodCallException(\sprintf("Unknown property '%s' for the 'route' parameter on annotation '%s'.", $key, static::class)); } $this->$method($value); } @@ -120,7 +120,7 @@ public function __construct( $method = 'set'.$key; if (!method_exists($this, $method)) { - throw new \BadMethodCallException(sprintf("Unknown property '%s' on annotation '%s'.", $key, static::class)); + throw new \BadMethodCallException(\sprintf("Unknown property '%s' on annotation '%s'.", $key, static::class)); } $this->$method($value); } diff --git a/src/BreadcrumbTrail/Trail.php b/src/BreadcrumbTrail/Trail.php index a30c4d8..49fa47f 100644 --- a/src/BreadcrumbTrail/Trail.php +++ b/src/BreadcrumbTrail/Trail.php @@ -185,17 +185,11 @@ public function reset() return $this; } - /** - * {@inheritDoc} - */ public function count(): int { return $this->breadcrumbs->count(); } - /** - * {@inheritDoc} - */ public function getIterator(): \Traversable { $this->breadcrumbs->rewind(); @@ -246,7 +240,7 @@ private function retrieveChildObject($object, $function, $varName, array $functi return \call_user_func([$object, $fullFunctionName]); } - throw new \RuntimeException(sprintf('"%s" is not callable.', implode('.', array_merge([$varName], $functions)))); + throw new \RuntimeException(\sprintf('"%s" is not callable.', implode('.', array_merge([$varName], $functions)))); } /** @@ -263,6 +257,6 @@ private function retrieveObjectValue($object, $function, $parameters, $varName, return \call_user_func_array([$object, $fullFunctionName], $parameters); } - throw new \RuntimeException(sprintf('"%s" is not callable.', implode('.', array_merge([$varName], $functions)))); + throw new \RuntimeException(\sprintf('"%s" is not callable.', implode('.', array_merge([$varName], $functions)))); } } diff --git a/src/DependencyInjection/APYBreadcrumbTrailExtension.php b/src/DependencyInjection/APYBreadcrumbTrailExtension.php index ff0acf4..04a0c18 100644 --- a/src/DependencyInjection/APYBreadcrumbTrailExtension.php +++ b/src/DependencyInjection/APYBreadcrumbTrailExtension.php @@ -19,9 +19,6 @@ class APYBreadcrumbTrailExtension extends Extension { - /** - * {@inheritDoc} - */ public function load(array $configs, ContainerBuilder $container) { $configuration = new Configuration(); diff --git a/src/EventListener/BreadcrumbListener.php b/src/EventListener/BreadcrumbListener.php index 42d4cdd..e3b262b 100644 --- a/src/EventListener/BreadcrumbListener.php +++ b/src/EventListener/BreadcrumbListener.php @@ -55,7 +55,7 @@ public function onKernelController(KernelEvent $event) { $controller = $event->getController(); - $reflectableClass = \is_array($controller) ? $controller[0] : \get_class($controller); + $reflectableClass = \is_array($controller) ? $controller[0] : $controller::class; $reflectableMethod = \is_array($controller) ? $controller[1] : '__invoke'; // Annotations from class @@ -67,10 +67,10 @@ public function onKernelController(KernelEvent $event) } if ($class->isAbstract()) { - throw new \InvalidArgumentException(sprintf('Annotations from class "%s" cannot be read as it is abstract.', $class)); + throw new \InvalidArgumentException(\sprintf('Annotations from class "%s" cannot be read as it is abstract.', $class)); } - $kernelRequest = defined(HttpKernelInterface::class.'::MASTER_REQUEST') ? HttpKernelInterface::MASTER_REQUEST : HttpKernelInterface::MAIN_REQUEST; + $kernelRequest = \defined(HttpKernelInterface::class.'::MASTER_REQUEST') ? HttpKernelInterface::MASTER_REQUEST : HttpKernelInterface::MAIN_REQUEST; if ($kernelRequest == $event->getRequestType()) { $this->breadcrumbTrail->reset(); diff --git a/tests/Twig/BreadcrumbTrailExtensionTest.php b/tests/Twig/BreadcrumbTrailExtensionTest.php index 15f9aff..1c719d2 100644 --- a/tests/Twig/BreadcrumbTrailExtensionTest.php +++ b/tests/Twig/BreadcrumbTrailExtensionTest.php @@ -34,7 +34,7 @@ protected static function createKernel(array $options = []): KernelInterface */ public function testTwigFunctionGetsRegistered() { - if(method_exists($this, 'getContainer')) { + if (method_exists($this, 'getContainer')) { $container = self::getContainer(); } else { self::bootKernel(); From 0ceea910889d44995a718871a369b3df47ded8c2 Mon Sep 17 00:00:00 2001 From: Barbuslex Date: Tue, 15 Oct 2024 15:02:00 +0200 Subject: [PATCH 19/25] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20Test=20Lowest=20(7.?= =?UTF-8?q?3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Annotation/Breadcrumb.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Annotation/Breadcrumb.php b/src/Annotation/Breadcrumb.php index 64cb1e1..bc496ef 100644 --- a/src/Annotation/Breadcrumb.php +++ b/src/Annotation/Breadcrumb.php @@ -68,7 +68,7 @@ public function __construct( $routeAbsolute = null, $position = null, $template = null, - $attributes = null, + $attributes = null ) { $data = []; From 58a03fbefa77fa5ec9822a2bb62512349d09b56e Mon Sep 17 00:00:00 2001 From: Barbuslex Date: Tue, 15 Oct 2024 15:04:00 +0200 Subject: [PATCH 20/25] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20Test=20Lowest=20(7.?= =?UTF-8?q?2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/EventListener/BreadcrumbListener.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/EventListener/BreadcrumbListener.php b/src/EventListener/BreadcrumbListener.php index e3b262b..b57c6a7 100644 --- a/src/EventListener/BreadcrumbListener.php +++ b/src/EventListener/BreadcrumbListener.php @@ -55,7 +55,7 @@ public function onKernelController(KernelEvent $event) { $controller = $event->getController(); - $reflectableClass = \is_array($controller) ? $controller[0] : $controller::class; + $reflectableClass = \is_array($controller) ? $controller[0] : \get_class($controller); $reflectableMethod = \is_array($controller) ? $controller[1] : '__invoke'; // Annotations from class From b5cd4f494605bbf5c7d6176a7680f483fb13c41c Mon Sep 17 00:00:00 2001 From: Barbuslex Date: Tue, 15 Oct 2024 15:11:13 +0200 Subject: [PATCH 21/25] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20PHP=20CS=20Fixer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Annotation/Breadcrumb.php | 2 +- src/EventListener/BreadcrumbListener.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Annotation/Breadcrumb.php b/src/Annotation/Breadcrumb.php index bc496ef..64cb1e1 100644 --- a/src/Annotation/Breadcrumb.php +++ b/src/Annotation/Breadcrumb.php @@ -68,7 +68,7 @@ public function __construct( $routeAbsolute = null, $position = null, $template = null, - $attributes = null + $attributes = null, ) { $data = []; diff --git a/src/EventListener/BreadcrumbListener.php b/src/EventListener/BreadcrumbListener.php index b57c6a7..e3b262b 100644 --- a/src/EventListener/BreadcrumbListener.php +++ b/src/EventListener/BreadcrumbListener.php @@ -55,7 +55,7 @@ public function onKernelController(KernelEvent $event) { $controller = $event->getController(); - $reflectableClass = \is_array($controller) ? $controller[0] : \get_class($controller); + $reflectableClass = \is_array($controller) ? $controller[0] : $controller::class; $reflectableMethod = \is_array($controller) ? $controller[1] : '__invoke'; // Annotations from class From 482081bda317c56041de41c2fd5e27bb48849c5d Mon Sep 17 00:00:00 2001 From: Barbuslex Date: Tue, 15 Oct 2024 15:15:59 +0200 Subject: [PATCH 22/25] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20PHP=20CS=20Fixer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Annotation/Breadcrumb.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/Annotation/Breadcrumb.php b/src/Annotation/Breadcrumb.php index 64cb1e1..1d9984f 100644 --- a/src/Annotation/Breadcrumb.php +++ b/src/Annotation/Breadcrumb.php @@ -61,15 +61,8 @@ class Breadcrumb * @param ?string $template * @param array $attributes */ - public function __construct( - $title = null, - $routeName = null, - $routeParameters = null, - $routeAbsolute = null, - $position = null, - $template = null, - $attributes = null, - ) { + public function __construct($title = null, $routeName = null, $routeParameters = null, $routeAbsolute = null, $position = null, $template = null, $attributes = null) + { $data = []; if (\is_string($title)) { From d9b65e48f03260339fa495cd8c4ccd89e0144a56 Mon Sep 17 00:00:00 2001 From: Barbuslex Date: Tue, 15 Oct 2024 15:24:12 +0200 Subject: [PATCH 23/25] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20PHP=20CS=20Fixer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .php-cs-fixer.php | 1 + src/EventListener/BreadcrumbListener.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index cae33d7..252620d 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -12,6 +12,7 @@ '@Symfony:risky' => true, 'protected_to_private' => false, 'nullable_type_declaration_for_default_null_value' => false, + 'get_class_to_class_keyword' => false, ]) ->setRiskyAllowed(true) ->setFinder( diff --git a/src/EventListener/BreadcrumbListener.php b/src/EventListener/BreadcrumbListener.php index e3b262b..b57c6a7 100644 --- a/src/EventListener/BreadcrumbListener.php +++ b/src/EventListener/BreadcrumbListener.php @@ -55,7 +55,7 @@ public function onKernelController(KernelEvent $event) { $controller = $event->getController(); - $reflectableClass = \is_array($controller) ? $controller[0] : $controller::class; + $reflectableClass = \is_array($controller) ? $controller[0] : \get_class($controller); $reflectableMethod = \is_array($controller) ? $controller[1] : '__invoke'; // Annotations from class From f1072fcdfc9ce708389c621f9977292ab7325295 Mon Sep 17 00:00:00 2001 From: Barbuslex Date: Tue, 15 Oct 2024 15:28:04 +0200 Subject: [PATCH 24/25] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20Test=20Lowest=20(7.?= =?UTF-8?q?4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0cf68e4..b352a08 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "symfony/phpunit-bridge": "^5.0|^6.0|^7.0", "nyholm/symfony-bundle-test": "^v2.0|^v3.0", "matthiasnoback/symfony-dependency-injection-test": "^4.0", - "doctrine/doctrine-bundle": "^v1.0|^v2.0", + "doctrine/doctrine-bundle": "^v1.8|^v2.0", "doctrine/annotations": "^1.0|^2.0", "symfony/twig-bundle": "^4.0|^5.0|^6.0|^7.0" }, From 45923c7e776ff7160b6864e770358b8e679f8441 Mon Sep 17 00:00:00 2001 From: Barbuslex Date: Tue, 15 Oct 2024 15:28:48 +0200 Subject: [PATCH 25/25] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20Test=20Lowest=20(7.?= =?UTF-8?q?4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index b352a08..099eb1d 100644 --- a/composer.json +++ b/composer.json @@ -25,8 +25,8 @@ "symfony/phpunit-bridge": "^5.0|^6.0|^7.0", "nyholm/symfony-bundle-test": "^v2.0|^v3.0", "matthiasnoback/symfony-dependency-injection-test": "^4.0", - "doctrine/doctrine-bundle": "^v1.8|^v2.0", - "doctrine/annotations": "^1.0|^2.0", + "doctrine/doctrine-bundle": "^v1.0|^v2.0", + "doctrine/annotations": "^1.8|^2.0", "symfony/twig-bundle": "^4.0|^5.0|^6.0|^7.0" }, "autoload-dev": {