better annotation detection

DjordyKoert · Mar 4, 2024 · 048356f · 048356f
1 parent 1ff7236
commit 048356f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/tests/Functional/ControllerTest.php b/tests/Functional/ControllerTest.php
@@ -11,6 +11,7 @@
 
 namespace Nelmio\ApiDocBundle\Tests\Functional;
 
+use Nelmio\ApiDocBundle\Tests\Helper;
 use OpenApi\Annotations as OA;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\HttpKernel\KernelInterface;
@@ -56,7 +57,7 @@ public function testControllers(string $controllerName, ?string $fixtureName = n
         $fixtureName = $fixtureName ?? $controllerName;
 
         $routingConfiguration = function (RoutingConfigurator $routes) use ($controllerName) {
-            $routes->withPath('/')->import(__DIR__."/Controller/$controllerName.php", 'attribute');
+            $routes->withPath('/')->import(__DIR__."/Controller/$controllerName.php", Helper::isAnnotationsAvailable() ? 'annotation' : 'attribute');
         };
 
         $this->configurableContainerFactory->create([], $routingConfiguration, $extraConfigs);

diff --git a/tests/Functional/TestKernel.php b/tests/Functional/TestKernel.php
@@ -26,6 +26,7 @@
 use Nelmio\ApiDocBundle\Tests\Functional\Entity\SymfonyConstraintsWithValidationGroups;
 use Nelmio\ApiDocBundle\Tests\Functional\ModelDescriber\NameConverter;
 use Nelmio\ApiDocBundle\Tests\Functional\ModelDescriber\VirtualTypeClassDoesNotExistsHandlerDefinedDescriber;
+use Nelmio\ApiDocBundle\Tests\Helper;
 use ReflectionException;
 use ReflectionMethod;
 use Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle;
@@ -376,15 +377,7 @@ public function unserialize($str)
 
     public static function isAnnotationsAvailable(): bool
     {
-        if (Kernel::MAJOR_VERSION <= 5) {
-            return true;
-        }
-
-        if (Kernel::MAJOR_VERSION >= 7) {
-            return false;
-        }
-
-        return PHP_VERSION_ID < 80100;
+        return Helper::isAnnotationsAvailable();
     }
 
     public static function isAttributesAvailable(): bool

diff --git a/tests/Helper.php b/tests/Helper.php
@@ -14,4 +14,9 @@ public static function isCompoundValidatorConstraintSupported(): bool
 
         return version_compare($validatorVersion, 'v5.1', '>=');
     }
+
+    public static function isAnnotationsAvailable(): bool
+    {
+        return class_exists('Doctrine\Common\Annotations\Annotation');
+    }
 }