Add zircote/swagger-php attributes support

.github/workflows/ci.yml

@@ -76,4 +76,4 @@ jobs:
 
             -   name: Run tests
                 continue-on-error: true
-                run: vendor/bin/simple-phpunit
+                run: vendor/bin/simple-phpunit tests

.gitignore

@@ -1,3 +1,4 @@
 .phpunit.result.cache
 composer.lock
 vendor/
+docker-compose.override.yml

README.md

@@ -13,6 +13,8 @@ Version < 1.2 requires zircote/swagger-php 2.x which works with the OpenAPI Spec
 So tobion/openapi-symfony-routing can be used with both OpenAPI v2 and v3 and composer will select the compatible one for your dependencies.
 Route loading stays the same between those versions. You just need to update the annotations when migrating from OpenAPI v2 to v3.
 
+Version >= 1.3 requires zircote/swagger-php 4.x which is compatible with the OpenAPI Specification version 3.0.1 and supports attributes. This package need php >= 8.1 for attributes support from zircote/swagger-php.
+
 ## Basic Usage
 
 This library allows to (re-)use your OpenAPI documentation to configure the routing of your Symfony-based API.

composer.json

@@ -16,7 +16,7 @@
         "symfony/finder": "^4.4|^5.0|^6.0",
         "symfony/framework-bundle": "^4.4|^5.0|^6.0",
         "symfony/routing": "^4.4|^5.0|^6.0",
-        "zircote/swagger-php": "^3.0.3"
+        "zircote/swagger-php": "^3.0.3|^4.0"
     },
     "require-dev": {
         "symfony/phpunit-bridge": "^5.2|^6.0"

docker-compose.yml

@@ -0,0 +1,20 @@
+services:
+    php7:
+        image: php:7.2-fpm
+        user: "1000:1000"
+        working_dir: /var/www/html
+        volumes:
+            - ./:/var/www/html
+    php8.0:
+        image: php:8.0-fpm
+        user: "1000:1000"
+        working_dir: /var/www/html
+        volumes:
+            - ./:/var/www/html
+    php8.1:
+        image: php:8.1-fpm
+        working_dir: /var/www/html
+        user: "1000:1000"
+        volumes:
+            - ./:/var/www/html
+

phpunit.xml

@@ -9,7 +9,7 @@
 >
     <testsuites>
         <testsuite name="Test Suite">
-            <directory>tests/</directory>
+            <directory>tests/Annotations</directory>
         </testsuite>
     </testsuites>
 

src/OpenApiRouteLoader.php

@@ -4,6 +4,9 @@
 
 namespace Tobion\OpenApiSymfonyRouting;
 
+use OpenApi\Analysers\AttributeAnnotationFactory;
+use OpenApi\Analysers\DocBlockAnnotationFactory;
+use OpenApi\Analysers\ReflectionAnalyser;
 use OpenApi\Analysis;
 use OpenApi\Annotations\OpenApi;
 use OpenApi\Annotations\Operation;
@@ -86,12 +89,23 @@ private function createOpenApi(): OpenApi
            return \OpenApi\scan($this->finder);
         }
 
-        $processors = array_filter(Analysis::processors(), static function ($processor): bool {
-            // remove OperationId processor which would hash the controller starting in 3.2.2 breaking the default route name logic
-            return !$processor instanceof OperationId && !$processor instanceof DocBlockDescriptions;
-        });
+        if (method_exists(Analysis::class, 'processors')) {
+            $processors = array_filter(Analysis::processors(), static function ($processor): bool {
+                // remove OperationId processor which would hash the controller starting in 3.2.2 breaking the default route name logic
+                return !$processor instanceof OperationId && !$processor instanceof DocBlockDescriptions;
+            });
 
-        return (new Generator())->setProcessors($processors)->generate($this->finder);
+            return (new Generator())->setProcessors($processors)->generate($this->finder);
+        }
+
+        $analyser = new ReflectionAnalyser([
+            new AttributeAnnotationFactory(),
+            new DocBlockAnnotationFactory()]
+        );
+
+        return (new Generator())
+            ->setAnalyser($analyser)
+            ->generate($this->finder);
     }
 
     /**

tests/Fixtures/Basic/Controller.php → tests/Annotations/Fixtures/Basic/Controller.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tobion\OpenApiSymfonyRouting\Tests\Fixtures\Basic;
+namespace Tobion\OpenApiSymfonyRouting\Tests\Annotations\Fixtures\Basic;
 
 use OpenApi\Annotations as OA;
 

tests/Fixtures/FormatSuffix/Controller.php → tests/Annotations/Fixtures/FormatSuffix/Controller.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tobion\OpenApiSymfonyRouting\Tests\Fixtures\FormatSuffix;
+namespace Tobion\OpenApiSymfonyRouting\Tests\Annotations\Fixtures\FormatSuffix;
 
 use OpenApi\Annotations as OA;
 

tests/Fixtures/OperationId/Controller.php → tests/Annotations/Fixtures/OperationId/Controller.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tobion\OpenApiSymfonyRouting\Tests\Fixtures\OperationId;
+namespace Tobion\OpenApiSymfonyRouting\Tests\Annotations\Fixtures\OperationId;
 
 use OpenApi\Annotations as OA;
 

tests/Fixtures/PathParameterPattern/Controller.php → tests/Annotations/Fixtures/PathParameterPattern/Controller.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tobion\OpenApiSymfonyRouting\Tests\Fixtures\PathParameterPattern;
+namespace Tobion\OpenApiSymfonyRouting\Tests\Annotations\Fixtures\PathParameterPattern;
 
 use OpenApi\Annotations as OA;
 

tests/Fixtures/Priority/Controller.php → tests/Annotations/Fixtures/Priority/Controller.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tobion\OpenApiSymfonyRouting\Tests\Fixtures\Priority;
+namespace Tobion\OpenApiSymfonyRouting\Tests\Annotations\Fixtures\Priority;
 
 use OpenApi\Annotations as OA;
 

tests/Fixtures/SeveralClasses/BarController.php → tests/Annotations/Fixtures/SeveralClasses/BarController.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tobion\OpenApiSymfonyRouting\Tests\Fixtures\SeveralClasses;
+namespace Tobion\OpenApiSymfonyRouting\Tests\Annotations\Fixtures\SeveralClasses;
 
 use OpenApi\Annotations as OA;
 

tests/Fixtures/SeveralClasses/FooController.php → tests/Annotations/Fixtures/SeveralClasses/FooController.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tobion\OpenApiSymfonyRouting\Tests\Fixtures\SeveralClasses;
+namespace Tobion\OpenApiSymfonyRouting\Tests\Annotations\Fixtures\SeveralClasses;
 
 use OpenApi\Annotations as OA;
 

tests/Fixtures/SeveralClasses/SubNamespace/SubController.php → tests/Annotations/Fixtures/SeveralClasses/SubNamespace/SubController.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tobion\OpenApiSymfonyRouting\Tests\Fixtures\SeveralClasses\SubNamespace;
+namespace Tobion\OpenApiSymfonyRouting\Tests\Annotations\Fixtures\SeveralClasses\SubNamespace;
 
 use OpenApi\Annotations as OA;
 

tests/Fixtures/SeveralHttpMethods/Controller.php → tests/Annotations/Fixtures/SeveralHttpMethods/Controller.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tobion\OpenApiSymfonyRouting\Tests\Fixtures\SeveralHttpMethods;
+namespace Tobion\OpenApiSymfonyRouting\Tests\Annotations\Fixtures\SeveralHttpMethods;
 
 use OpenApi\Annotations as OA;
 

tests/Fixtures/SeveralRoutesOnOneAction/Controller.php → tests/Annotations/Fixtures/SeveralRoutesOnOneAction/Controller.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tobion\OpenApiSymfonyRouting\Tests\Fixtures\SeveralRoutesOnOneAction;
+namespace Tobion\OpenApiSymfonyRouting\Tests\Annotations\Fixtures\SeveralRoutesOnOneAction;
 
 use OpenApi\Annotations as OA;