Provisional support for PHP 8.5, proactive Symfony 8.0 compat fix

Author: mbabker

.github/workflows/run-tests.yml

@@ -18,6 +18,10 @@ jobs:
             symfony: '6.4.*'
             composer-flags: '--prefer-stable --prefer-lowest'
             can-fail: false
+          - php: '8.5'
+            symfony: '7.4.*@dev'
+            composer-flags: '--prefer-stable'
+            can-fail: true
 
     name: "PHP ${{ matrix.php }} - Symfony ${{ matrix.symfony }}${{ matrix.composer-flags != '' && format(' - Composer {0}', matrix.composer-flags) || '' }}"
 

composer.json

@@ -10,7 +10,7 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "8.3.* || 8.4.*",
+        "php": "8.3.* || 8.4.* || 8.5.*",
         "ext-pcntl": "*",
         "babdev/websocket-server": "0.1.*",
         "symfony/config": "^6.4 || ^7.3",

docs/intro.md

@@ -15,4 +15,4 @@ The below table shows the supported PHP and Symfony versions for this bundle.
 
 | Version | Status         | PHP Versions | Symfony Versions |
 |---------|----------------|--------------|------------------|
-| 1.x     | In Development | 8.3-8.4      | 6.4, 7.3         |
+| 1.x     | In Development | 8.3-8.5      | 6.4, 7.3         |

phpstan-baseline.neon

@@ -192,12 +192,6 @@ parameters:
 			count: 1
 			path: src/DependencyInjection/Factory/Authentication/SessionAuthenticationProviderFactory.php
 
-		-
-			message: '#^Call to function method_exists\(\) with \$this\(BabDev\\WebSocketBundle\\Routing\\Loader\\AttributeLoader\) and ''setRouteAttributeCl…'' will always evaluate to true\.$#'
-			identifier: function.alreadyNarrowedType
-			count: 1
-			path: src/Routing/Loader/AttributeLoader.php
-
 		-
 			message: '#^Parameter \#1 \$class of function class_exists expects string, mixed given\.$#'
 			identifier: argument.type

src/Routing/Loader/AttributeLoader.php

@@ -13,17 +13,35 @@
  */
 final class AttributeLoader extends AttributeClassLoader
 {
+    /**
+     * @var class-string
+     */
+    private string $routeAttributeClass;
+
     public function __construct(?string $env = null)
     {
+        $this->routeAttributeClass = AsMessageHandler::class;
+
         parent::__construct($env);
 
+        /** @phpstan-ignore function.alreadyNarrowedType */
         if (method_exists($this, 'setRouteAttributeClass')) {
             $this->setRouteAttributeClass(AsMessageHandler::class);
         } else {
             $this->setRouteAnnotationClass(AsMessageHandler::class);
         }
     }
 
+    /**
+     * @param class-string $class
+     */
+    public function setRouteAttributeClass(string $class): void
+    {
+        $this->routeAttributeClass = $class;
+
+        parent::setRouteAttributeClass($class);
+    }
+
     /**
      * Loads from attributes from a class.
      *
@@ -47,7 +65,7 @@ public function load(mixed $class, ?string $type = null): RouteCollection
         $collection->addResource(new FileResource($class->getFileName()));
 
         /** @var \ReflectionAttribute<AsMessageHandler>|null $attribute */
-        $attribute = $class->getAttributes($this->routeAnnotationClass, \ReflectionAttribute::IS_INSTANCEOF)[0] ?? null;
+        $attribute = $class->getAttributes($this->routeAttributeClass, \ReflectionAttribute::IS_INSTANCEOF)[0] ?? null;
 
         if (!$attribute instanceof \ReflectionAttribute) {
             return $collection;
@@ -109,7 +127,7 @@ public function load(mixed $class, ?string $type = null): RouteCollection
     /**
      * @param \ReflectionClass<AsMessageHandler> $class
      */
-    protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot): void
+    protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $attr): void
     {
         // Method is purposefully unused, but is required by the parent class
     }