Merge pull request #28 from gyro-project/Symfony7

beberlei · web-flow · commit 2f48be498029 · 2025-03-23T22:43:50.000+01:00
Make Symfony 7 compatible
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,8 +5,9 @@ jobs:
     name: Tests
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        php-versions: ['7.4', '8.0', '8.1']
+        php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
         composer: ['--prefer-lowest', ' ']
 
     steps:
@@ -20,7 +21,7 @@ jobs:
         tools: "cs2pr"
 
     - name: "Cache dependencies installed with composer"
-      uses: "actions/cache@v1"
+      uses: "actions/cache@v3"
       with:
         path: "~/.composer/cache"
         key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
@@ -47,7 +48,7 @@ jobs:
         tools: "cs2pr"
 
     - name: "Cache dependencies installed with composer"
-      uses: "actions/cache@v1"
+      uses: "actions/cache@v3"
       with:
         path: "~/.composer/cache"
         key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
@@ -63,6 +64,7 @@ jobs:
     name: Psalm
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         composer: ['--prefer-lowest', ' ']
 
@@ -73,11 +75,11 @@ jobs:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: 8.1
+        php-version: 8.4
         tools: "cs2pr"
 
     - name: "Cache dependencies installed with composer"
-      uses: "actions/cache@v1"
+      uses: "actions/cache@v3"
       with:
         path: "~/.composer/cache"
         key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
diff --git a/composer.json b/composer.json
@@ -7,20 +7,23 @@
     "authors": [
         {"name": "Benjamin Eberlei", "email": "kontakt@beberlei.de"}
     ],
+    "require": {
+        "symfony/http-kernel": "~4.4|~5.4|~6.4|~7.0",
+        "psr/container": "^1.1|^2.0",
+        "composer-runtime-api": "*",
+        "symfony/polyfill-php80": "^1.31",
+        "technically/callable-reflection": "^0.4.1"
+    },
     "require-dev": {
         "php": "~7.4|~8.0",
         "phake/phake": "^4.2.0",
-        "phpunit/phpunit": "^9.4",
-        "vimeo/psalm": "4.15.0",
-        "nikic/php-parser": "^4.4",
-        "symfony/symfony": "~4.4|~5.4|~6.0",
+        "phpunit/phpunit": "^9.6|^10.5|^11.4",
+        "vimeo/psalm": "^5.26|^6.9",
+        "nikic/php-parser": "^4.4|^5.0",
+        "symfony/symfony": "~4.4|~5.4|~6.4|~7.0",
         "doctrine/coding-standard": "^8.2.1",
         "twig/twig": "^1.44|^2.14|^3.1"
     },
-    "require": {
-        "symfony/http-kernel": "~4.4|~5.4|~6.0",
-        "composer-runtime-api": "*"
-    },
     "autoload": {
         "psr-0": {
             "Gyro\\Bundle\\MVCBundle\\": "src/",
diff --git a/psalm.xml b/psalm.xml
@@ -17,13 +17,16 @@
         <MixedAssignment errorLevel="info" />
         <MixedArgument errorLevel="info" />
         <MixedArgumentTypeCoercion errorLevel="info" />
-        <MixedInferredReturnType errorLevel="info" />
         <MixedReturnStatement errorLevel="info" />
         <MoreSpecificReturnType errorLevel="info" />
         <LessSpecificReturnType errorLevel="info" />
         <LessSpecificReturnStatement errorLevel="info" />
         <UndefinedDocblockClass errorLevel="info" />
         <DeprecatedClass errorLevel="info" />
         <DeprecatedMethod errorLevel="info" />
+        <PossiblyUnusedMethod errorLevel="info" />
+        <MissingOverrideAttribute errorLevel="info" />
+        <ClassMustBeFinal errorLevel="info" />
+        <UnusedClass errorLevel="info" />
     </issueHandlers>
 </psalm>
diff --git a/src/Gyro/Bundle/MVCBundle/Controller/ResultConverter/AfterResponseYieldApplier.php b/src/Gyro/Bundle/MVCBundle/Controller/ResultConverter/AfterResponseYieldApplier.php
@@ -6,7 +6,6 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Event\TerminateEvent;
 
 class AfterResponseYieldApplier implements ControllerYieldApplier, EventSubscriberInterface
 {
@@ -31,7 +30,7 @@ public function apply($yield, Request $request, Response $response): void
         $this->tasks[] = $yield;
     }
 
-    public function onKernelTerminate(TerminateEvent $event): void
+    public function onKernelTerminate(): void
     {
         foreach ($this->tasks as $task) {
             $task();
diff --git a/src/Gyro/Bundle/MVCBundle/Controller/ResultConverter/ArrayToTemplateResponseConverter.php b/src/Gyro/Bundle/MVCBundle/Controller/ResultConverter/ArrayToTemplateResponseConverter.php
@@ -49,6 +49,7 @@ public function convert($result, Request $request): Response
             throw new \RuntimeException(sprintf('Result must be array or TemplateView, %s given', is_object($result) ? get_class($result) : gettype($result)));
         }
 
+        /** @psalm-suppress RiskyTruthyFalsyComparison */
         return $this->makeResponseFor(
             $controller,
             $result,
diff --git a/src/Gyro/Bundle/MVCBundle/DependencyInjection/Configuration.php b/src/Gyro/Bundle/MVCBundle/DependencyInjection/Configuration.php
@@ -25,6 +25,7 @@ public function getConfigTreeBuilder(): TreeBuilder
 
         assert($rootNode instanceof ArrayNodeDefinition);
 
+        /** @psalm-suppress UndefinedInterfaceMethod */
         $rootNode
             ->children()
                 ->arrayNode('convert_exceptions')
diff --git a/src/Gyro/Bundle/MVCBundle/DependencyInjection/GyroMVCExtension.php b/src/Gyro/Bundle/MVCBundle/DependencyInjection/GyroMVCExtension.php
@@ -11,6 +11,8 @@
  * This is the class that loads and manages your bundle configuration
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
+ *
+ * @psalm-suppress InternalClass
  */
 class GyroMVCExtension extends Extension
 {
diff --git a/src/Gyro/Bundle/MVCBundle/EventListener/ConvertExceptionListener.php b/src/Gyro/Bundle/MVCBundle/EventListener/ConvertExceptionListener.php
@@ -59,6 +59,7 @@ public function onKernelException($event): void
 
         $convertedExceptionClass = $this->findConvertToExceptionClass($exception);
 
+        /** @psalm-suppress RiskyTruthyFalsyComparison */
         if (!$convertedExceptionClass) {
             return;
         }
diff --git a/src/Gyro/Bundle/MVCBundle/EventListener/ParamConverterListener.php b/src/Gyro/Bundle/MVCBundle/EventListener/ParamConverterListener.php
@@ -9,6 +9,7 @@
 use Gyro\Bundle\MVCBundle\SymfonyTokenContext;
 use Gyro\MVC\FormRequest;
 use Gyro\MVC\TokenContext;
+use Technically\CallableReflection\CallableReflection;
 
 /**
  * Convert the request parameters into objects when typehinted.
@@ -41,28 +42,22 @@ public function onKernelController(ControllerEvent $event): void
         /** @psalm-suppress UndefinedClass */
         $request = $event->getRequest();
 
-        if (\is_array($controller)) {
-            $r = new \ReflectionMethod($controller[0], $controller[1]);
-        } elseif ($controller instanceof \Closure || \method_exists($controller, '__invoke')) {
-            $r = new \ReflectionMethod($controller, '__invoke');
-        } else {
-            $r = new \ReflectionFunction($controller);
-        }
+        $r = CallableReflection::fromCallable($controller);
 
         // automatically apply conversion for non-configured objects
         foreach ($r->getParameters() as $param) {
-            if (!$param->getType()) {
+            if (!$param->getTypes()) {
                 continue;
             }
 
-            $type = $param->getType();
+            $types = $param->getTypes();
 
             // skip union and intersection types (for now?)
-            if (!($type instanceof \ReflectionNamedType)) {
+            if (count($types) > 1) {
                 continue;
             }
 
-            $class = $type->getName();
+            $class = $types[0]->getType();
             $name = $param->getName();
 
             if (
diff --git a/src/Gyro/Bundle/MVCBundle/EventListener/ViewListener.php b/src/Gyro/Bundle/MVCBundle/EventListener/ViewListener.php
@@ -60,12 +60,13 @@ public function onKernelView($event): void
 
     private function unrollGenerator(Generator $generator, Request $request): Response
     {
-        /** @var array<object,array> $yields */
+        /** @var list<object|array> $yields */
         $yields = iterator_to_array($generator);
 
         $result = $generator->getReturn();
         \assert(\is_object($result) || \is_array($result));
 
+        /** @psalm-suppress RiskyTruthyFalsyComparison */
         if (!$result) {
             throw new \LogicException("Controllers with generators must return a result that is or can be converted to a Response.");
         }
diff --git a/src/Gyro/Bundle/MVCBundle/MockTokenContext.php b/src/Gyro/Bundle/MVCBundle/MockTokenContext.php
@@ -11,7 +11,7 @@ class MockTokenContext implements TokenContext
 {
     private $user;
 
-    public function __construct(UserInterface $user = null)
+    public function __construct(?UserInterface $user = null)
     {
         $this->user = $user;
     }
diff --git a/src/Gyro/Bundle/MVCBundle/SymfonyTokenContext.php b/src/Gyro/Bundle/MVCBundle/SymfonyTokenContext.php
@@ -75,7 +75,7 @@ public function getCurrentUser(string $expectedClass): \Symfony\Component\Securi
             throw new Exception\UnauthenticatedUserException(sprintf(
                 "Expecting user class %s, but got %s",
                 $expectedClass,
-                is_object($user) ? get_class($user) : gettype($user)
+                get_debug_type($user),
             ));
         }
 
diff --git a/src/Gyro/Bundle/MVCBundle/Versions.php b/src/Gyro/Bundle/MVCBundle/Versions.php
@@ -21,4 +21,20 @@ public static function isSecurityVersion6(): bool
 
         return false;
     }
+
+    public static function hasMainRequestConstant(): bool
+    {
+        $version = null;
+        if (InstalledVersions::isInstalled('symfony/symfony')) {
+            $version = InstalledVersions::getVersion('symfony/symfony');
+        } elseif (InstalledVersions::isInstalled('symfony/http-kernel')) {
+            $version = InstalledVersions::getVersion('symfony/http-kernel');
+        }
+
+        if ($version !== null && version_compare($version, '7.0.0') >= 0) {
+            return true;
+        }
+
+        return false;
+    }
 }
diff --git a/src/Gyro/MVC/EventDispatcher/EventDispatcher.php b/src/Gyro/MVC/EventDispatcher/EventDispatcher.php
@@ -16,6 +16,7 @@ public function __construct(EventDispatcherInterface $eventDispatcher)
 
     public function dispatch(object $event, ?string $eventName = null): void
     {
+        /** @psalm-suppress RiskyTruthyFalsyComparison */
         $eventName = $eventName ?: get_class($event);
 
         /** @psalm-suppress TooManyArguments, InvalidArgument */
diff --git a/src/Gyro/MVC/Exception/FormAlreadyHandledException.php b/src/Gyro/MVC/Exception/FormAlreadyHandledException.php
@@ -8,6 +8,7 @@ class FormAlreadyHandledException extends RuntimeException
 {
     public function __construct(?string $name)
     {
+        /** @psalm-suppress RiskyTruthyFalsyComparison */
         parent::__construct(sprintf(
             'The \Gyro\MVC\FormRequest was already handled with form %s earlier. ' .
             'You can only use a FormRequest with exactly one form.',
diff --git a/src/Gyro/MVC/RedirectRoute.php b/src/Gyro/MVC/RedirectRoute.php
@@ -34,7 +34,7 @@ public function __construct(string $routeName, array $parameters = [], $response
         } else {
             throw new \InvalidArgumentException(sprintf(
                 '$response must be of type int|Response|null, %s given',
-                is_object($response) ? get_class($response) : gettype($response)
+                get_debug_type($response)
             ));
         }
     }
diff --git a/tests/EventListener/ParamConverterListenerTest.php b/tests/EventListener/ParamConverterListenerTest.php
@@ -2,12 +2,11 @@
 
 namespace Gyro\Bundle\MVCBundle\Tests\EventListener;
 
-use PackageVersions\Versions;
+use Gyro\Bundle\MVCBundle\Versions;
 use PHPUnit\Framework\TestCase;
 use Gyro\Bundle\MVCBundle\EventListener\ParamConverterListener;
 use Gyro\Bundle\MVCBundle\ParamConverter\SymfonyServiceProvider;
 use Gyro\MVC\TokenContext;
-use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
@@ -134,6 +133,9 @@ public function setUp() : void
 
     public function createControllerEvent(callable $method, Request $request): object
     {
-        return new ControllerEvent($this->kernel, $method, $request, HttpKernelInterface::MASTER_REQUEST);
+        return new ControllerEvent($this->kernel, $method, $request,Versions::hasMainRequestConstant()
+            ? HttpKernelInterface::MAIN_REQUEST
+            : HttpKernelInterface::MASTER_REQUEST
+        );
     }
 }
diff --git a/tests/EventListener/ViewListenerTest.php b/tests/EventListener/ViewListenerTest.php
@@ -125,7 +125,9 @@ private function createEventWith(Request $request, $controllerResult = null)
         return new ViewEvent(
             \Phake::mock('Symfony\Component\HttpKernel\HttpKernelInterface'),
             $request,
-            HttpKernelInterface::MASTER_REQUEST,
+            \Gyro\Bundle\MVCBundle\Versions::hasMainRequestConstant()
+                ? HttpKernelInterface::MAIN_REQUEST
+                : HttpKernelInterface::MASTER_REQUEST,
             $controllerResult
         );
     }
diff --git a/tests/View/SymfonyConventionsTemplateGuesserTest.php b/tests/View/SymfonyConventionsTemplateGuesserTest.php
@@ -8,6 +8,8 @@
 class SymfonyConventionsTemplateGuesserTest extends TestCase
 {
     private $guesser;
+    private $bundleLocation;
+    private $parser;
 
     public function setUp() : void
     {

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`use Symfony\Component\EventDispatcher\EventSubscriberInterface;`
`7`	`7`	`use Symfony\Component\HttpFoundation\Request;`
`8`	`8`	`use Symfony\Component\HttpFoundation\Response;`
`9`		`-use Symfony\Component\HttpKernel\Event\TerminateEvent;`
`10`	`9`
`11`	`10`	`class AfterResponseYieldApplier implements ControllerYieldApplier, EventSubscriberInterface`
`12`	`11`	`{`
`@@ -31,7 +30,7 @@ public function apply($yield, Request $request, Response $response): void`
`31`	`30`	`$this->tasks[] = $yield;`
`32`	`31`	`}`
`33`	`32`
`34`		`- public function onKernelTerminate(TerminateEvent $event): void`
	`33`	`+ public function onKernelTerminate(): void`
`35`	`34`	`{`
`36`	`35`	`foreach ($this->tasks as $task) {`
`37`	`36`	`$task();`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ public function convert($result, Request $request): Response`
`49`	`49`	`throw new \RuntimeException(sprintf('Result must be array or TemplateView, %s given', is_object($result) ? get_class($result) : gettype($result)));`
`50`	`50`	`}`
`51`	`51`
	`52`	`+ /** @psalm-suppress RiskyTruthyFalsyComparison */`
`52`	`53`	`return $this->makeResponseFor(`
`53`	`54`	`$controller,`
`54`	`55`	`$result,`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`	`* This is the class that loads and manages your bundle configuration`
`12`	`12`	`*`
`13`	`13`	`* To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}`
	`14`	`+ *`
	`15`	`+ * @psalm-suppress InternalClass`
`14`	`16`	`*/`
`15`	`17`	`class GyroMVCExtension extends Extension`
`16`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ public function onKernelException($event): void`
`59`	`59`
`60`	`60`	`$convertedExceptionClass = $this->findConvertToExceptionClass($exception);`
`61`	`61`
	`62`	`+ /** @psalm-suppress RiskyTruthyFalsyComparison */`
`62`	`63`	`if (!$convertedExceptionClass) {`
`63`	`64`	`return;`
`64`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,12 +60,13 @@ public function onKernelView($event): void`
`60`	`60`
`61`	`61`	`private function unrollGenerator(Generator $generator, Request $request): Response`
`62`	`62`	`{`
`63`		`- /** @var array<object,array> $yields */`
	`63`	`+ /** @var list<object\|array> $yields */`
`64`	`64`	`$yields = iterator_to_array($generator);`
`65`	`65`
`66`	`66`	`$result = $generator->getReturn();`
`67`	`67`	`\assert(\is_object($result) \|\| \is_array($result));`
`68`	`68`
	`69`	`+ /** @psalm-suppress RiskyTruthyFalsyComparison */`
`69`	`70`	`if (!$result) {`
`70`	`71`	`throw new \LogicException("Controllers with generators must return a result that is or can be converted to a Response.");`
`71`	`72`	`}`