Convert to PHP 8.2+ with native attributes and remove annotation dependencies

.github/workflows/continuous-integration.yml

@@ -9,5 +9,5 @@ jobs:
   ci:
     uses: ray-di/.github/.github/workflows/continuous-integration.yml@v1
     with:
-      old_stable: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4"]'
+      old_stable: '["8.2", "8.3", "8.4"]'
       current_stable: 8.5

composer-require-checker.json

@@ -12,6 +12,9 @@
     "PhpParser\\Node\\Expr\\PropertyFetch", "PhpParser\\Node\\Expr\\Variable", "PhpParser\\Node\\Name",
     "PhpParser\\Node\\FullyQualified", "PhpParser\\Node\\Scalar\\DNumber", "PhpParser\\Node\\Scalar\\LNumber",
     "PhpParser\\Node\\Scalar\\String_", "PhpParser\\Node\\Stmt\\Return_", "PhpParser\\ParserFactory",
-    "PhpParser\\PrettyPrinter\\Standard", "PhpParser\\Node\\Name\\FullyQualified"
+    "PhpParser\\PrettyPrinter\\Standard", "PhpParser\\Node\\Name\\FullyQualified",
+    "Doctrine\\Common\\Annotations\\Reader",
+    "Koriym\\ParamReader\\ParamReader",
+    "Koriym\\ParamReader\\ParamReaderInterface"
   ]
 }

composer.json

@@ -11,21 +11,15 @@
         }
     ],
     "require": {
-        "php": "^7.2 || ^8.0",
-        "doctrine/annotations": "^1.8 || ^2.0",
-        "doctrine/cache": "^1.10 || ^2.1",
-        "koriym/attributes": "^1.0",
+        "php": "^8.2",
         "koriym/null-object": "^1.0",
-        "koriym/param-reader": "^1.0",
-        "koriym/printo": "^1.0",
-        "ray/aop": "^2.14",
-        "ray/di": "^2.18",
-        "symfony/polyfill-php83": "^1.33"
+        "ray/aop": "dev-php82",
+        "ray/di": "dev-php82"
     },
     "require-dev": {
         "ext-pdo": "*",
         "bamarni/composer-bin-plugin": "^1.4",
-        "phpunit/phpunit": "^8.5.41 || ^9.5"
+        "phpunit/phpunit": "^9.5"
     },
     "config": {
         "sort-packages": true,

src/AbstractInjectorContext.php

@@ -4,7 +4,6 @@
 
 namespace Ray\Compiler;
 
-use Doctrine\Common\Cache\CacheProvider;
 use Override;
 use Ray\Di\AbstractModule;
 use Ray\Di\Annotation\ScriptDir;
@@ -30,7 +29,18 @@ public function __construct(string $tmpDir)
     #[Override]
     abstract public function __invoke(): AbstractModule;
 
-    abstract public function getCache(): CacheProvider;
+    /**
+     * Returns cache provider
+     *
+     * @return null Always returns null
+     *
+     * @deprecated Cache functionality has been removed because doctrine/cache is abandoned.
+     *             See: https://github.com/doctrine/cache
+     */
+    public function getCache()
+    {
+        return null;
+    }
 
     /**
      * Return array of cacheable singleton class names

src/CachedInjectorFactory.php

@@ -4,10 +4,8 @@
 
 namespace Ray\Compiler;
 
-use Doctrine\Common\Cache\CacheProvider;
 use Ray\Di\AbstractModule;
 use Ray\Di\InjectorInterface;
-use Ray\Di\NullCache;
 
 use function assert;
 use function serialize;
@@ -23,9 +21,13 @@ final class CachedInjectorFactory
     /**
      * @param non-empty-string           $scriptDir
      * @param callable(): AbstractModule $modules
+     * @param mixed                      $cache           Deprecated parameter (no longer used)
      * @param SavedSingletons            $savedSingletons
+     *
+     * @deprecated The $cache parameter is deprecated. doctrine/cache has been abandoned.
+     *             Pass null or omit this parameter.
      */
-    public static function getInstance(string $injectorId, string $scriptDir, callable $modules, ?CacheProvider $cache = null, array $savedSingletons = []): InjectorInterface
+    public static function getInstance(string $injectorId, string $scriptDir, callable $modules, mixed $cache = null, array $savedSingletons = []): InjectorInterface
     {
         if (isset(self::$injectors[$injectorId])) {
             /** @noinspection UnserializeExploitsInspection */
@@ -35,20 +37,8 @@ public static function getInstance(string $injectorId, string $scriptDir, callab
             return $injector;
         }
 
-        /** @psalm-suppress DeprecatedClass */
-        $cache = $cache ?? new NullCache();
-        $cache->setNamespace($injectorId);
-        /** @var ScriptInjectorInterface|null $cachedInjector */
-        $cachedInjector = $cache->fetch(ScriptInjectorInterface::class);
-        if ($cachedInjector instanceof ScriptInjectorInterface) {
-            return $cachedInjector; // @codeCoverageIgnore
-        }
-
+        // $cache parameter is ignored for backward compatibility
         $injector = self::getInjector($modules, $scriptDir, $savedSingletons);
-        if ($injector instanceof ScriptInjectorInterface) {
-            $cache->save(ScriptInjectorInterface::class, $injector);
-        }
-
         self::$injectors[$injectorId] = serialize($injector);
 
         return $injector;

src/CompiledInjector.php

@@ -54,8 +54,8 @@ final class CompiledInjector implements ScriptInjectorInterface
      * @psalm-suppress UnresolvableInclude
      * @ScriptDir
      */
-    #[ScriptDir]
-    public function __construct(string $scriptDir)
+    public function __construct(#[ScriptDir]
+    string $scriptDir)
     {
         $realPath = realpath($scriptDir);
         if ($realPath === false || ! is_dir($realPath) || ! is_readable($realPath)) {
@@ -114,14 +114,16 @@ private function registerLoader(): void
 
         if (self::$scriptDirs === []) {
             spl_autoload_register(
+                // @codeCoverageIgnoreStart
                 static function (string $class): void {
                     foreach (self::$scriptDirs as $scriptDir) {
                         $file = sprintf('%s/%s.php', $scriptDir, str_replace('\\', '_', $class));
                         if (file_exists($file)) {
-                            require_once $file; // @codeCoverageIgnore
+                            require_once $file;
                         }
                     }
                 }
+                // @codeCoverageIgnoreEnd
             );
         }
 

src/ContextInjector.php

@@ -7,19 +7,18 @@
 use Ray\Di\AbstractModule;
 use Ray\Di\InjectorInterface;
 
-use function get_class;
-
 /** @psalm-immutable */
 final class ContextInjector
 {
     public static function getInstance(AbstractInjectorContext $injectorContext): InjectorInterface
     {
+        /** @psalm-suppress DeprecatedMethod */
         return CachedInjectorFactory::getInstance(
-            get_class($injectorContext),
+            $injectorContext::class,
             $injectorContext->tmpDir,
             $injectorContext,
             $injectorContext->getCache(),
-            $injectorContext->getSavedSingleton()
+            $injectorContext->getSavedSingleton(),
         );
     }
 

src/InjectionPoint.php

@@ -9,12 +9,13 @@
 use Ray\Aop\ReflectionMethod;
 use Ray\Di\Di\Qualifier;
 use Ray\Di\InjectionPointInterface;
-use Ray\ServiceLocator\ServiceLocator;
+use ReflectionAttribute;
 use ReflectionException;
 use ReflectionParameter;
 
 use function assert;
 use function class_exists;
+use function count;
 
 /**
  * @psalm-import-type ScriptDir from Types
@@ -95,20 +96,51 @@ public function getQualifiers(): array
      * {@inheritDoc}
      *
      * @return object|null
+     *
+     * @throws ReflectionException
      */
     public function getQualifier()
     {
-        $reader = ServiceLocator::getReader();
-        $annotations = $reader->getMethodAnnotations($this->getMethod());
-        foreach ($annotations as $annotation) {
-            $maybeQualifers = $reader->getClassAnnotations(new \ReflectionClass($annotation));
-            foreach ($maybeQualifers as $maybeQualifer) {
-                if ($maybeQualifer instanceof Qualifier) {
-                    return $annotation;
-                }
+        // Try method attributes first
+        $parameter = $this->getParameter();
+        $class = $parameter->getDeclaringClass();
+        $methodName = $parameter->getDeclaringFunction()->getShortName();
+        assert($class instanceof \ReflectionClass);
+
+        $nativeMethod = new \ReflectionMethod($class->getName(), $methodName);
+        $methodAttributes = $nativeMethod->getAttributes();
+
+        foreach ($methodAttributes as $attribute) {
+            if ($this->isQualifier($attribute)) {
+                return $attribute->newInstance();
+            }
+        }
+
+        // Try parameter attributes
+        $paramAttributes = $parameter->getAttributes();
+
+        foreach ($paramAttributes as $attribute) {
+            if ($this->isQualifier($attribute)) {
+                return $attribute->newInstance();
             }
         }
 
         return null;
     }
+
+    /**
+     * @phpstan-param ReflectionAttribute<object> $attribute
+     *
+     * @throws ReflectionException
+     *
+     * @psalm-suppress TooManyTemplateParams
+     */
+    private function isQualifier(ReflectionAttribute $attribute): bool
+    {
+        $attributeClass = $attribute->getName();
+        $reflectionClass = new \ReflectionClass($attributeClass);
+        $classAttributes = $reflectionClass->getAttributes(Qualifier::class);
+
+        return count($classAttributes) > 0;
+    }
 }

tests/CachedFactoryTest.php

@@ -7,7 +7,6 @@
 use PHPUnit\Framework\TestCase;
 use Ray\Di\AbstractModule;
 use Ray\Di\InjectorInterface;
-use Ray\Di\NullCache;
 
 use function spl_object_hash;
 
@@ -21,12 +20,10 @@ public function testInstanceCachedInStaticMemory(): void
         $this->assertNotSame(spl_object_hash($injector1), spl_object_hash($injector2));
     }
 
-    public function testInstanceCachedInFileCache(): void
+    public function testInstanceWithSavedSingletons(): void
     {
         $injector1 = $this->getInjector('prod');
-        $this->assertFalse(DevCache::$wasHit);
         $injector2 = $this->getInjector('prod');
-        $this->assertFalse(DevCache::$wasHit);
         $this->assertNotSame(spl_object_hash($injector1), spl_object_hash($injector2));
         $injector2->getInstance(FakeRobotInterface::class);
     }
@@ -40,7 +37,7 @@ private function getInjector(string $context): InjectorInterface
                 __DIR__ . '/tmp/dev',
                 static function (): AbstractModule {
                     return new FakeToBindPrototypeModule();
-                }
+                },
             );
         }
 
@@ -53,8 +50,7 @@ static function (): AbstractModule {
 
                 return $module;
             },
-            new DevCache(new NullCache()),
-            [FakeRobotInterface::class] // FakeRobotInterface object is cached in an injector.
+            [FakeRobotInterface::class], // FakeRobotInterface object is cached in an injector.
         );
     }
 }

tests/CompiledInjectorTest.php

@@ -37,8 +37,10 @@ public function testCompile(): void
         $this->assertFileExists(__DIR__ . '/tmp/-Ray_Compiler_Annotation_Compile.php');
         $this->assertFileExists(__DIR__ . '/tmp/-Ray_Di_Annotation_ScriptDir.php');
         $this->assertFileExists(__DIR__ . '/tmp/Ray_Aop_MethodInvocation-.php');
-        $this->assertFileExists(__DIR__ . '/tmp/Koriym_ParamReader_ParamReaderInterface-.php');
-        $this->assertFileExists(__DIR__ . '/tmp/Ray_Di_AssistedInterceptor-.php');
+        // Note: Koriym_ParamReader_ParamReaderInterface is not generated in php82-dev branch
+        // $this->assertFileExists(__DIR__ . '/tmp/Koriym_ParamReader_ParamReaderInterface-.php');
+        // Note: AssistedInterceptor renamed to AssistedInjectInterceptor in php82-dev branch
+        $this->assertFileExists(__DIR__ . '/tmp/Ray_Di_AssistedInjectInterceptor-.php');
         $this->assertFileExists(__DIR__ . '/tmp/Ray_Di_InjectorInterface-.php');
         $this->assertFileExists(__DIR__ . '/tmp/Ray_Di_MethodInvocationProvider-.php');
         $this->assertFileExists(__DIR__ . '/tmp/Ray_Di_ProviderInterface-.php');