Updating Tokenizer code with PHP 8.1 features

src/Tokenizer/src/AbstractLocator.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Tokenizer;
@@ -27,12 +20,9 @@ abstract class AbstractLocator implements InjectableInterface, LoggerAwareInterf
 
     public const INJECTOR = Tokenizer::class;
 
-    /** @var Finder */
-    protected $finder;
-
-    public function __construct(Finder $finder)
-    {
-        $this->finder = $finder;
+    public function __construct(
+        protected Finder $finder
+    ) {
     }
 
     /**
@@ -50,8 +40,8 @@ protected function availableReflections(): \Generator
             if ($reflection->hasIncludes()) {
                 // We are not analyzing files which has includes, it's not safe to require such reflections
                 $this->getLogger()->warning(
-                    sprintf('File `%s` has includes and excluded from analysis', $file),
-                    compact('file')
+                    \sprintf('File `%s` has includes and excluded from analysis', $file),
+                    ['file' => $file]
                 );
 
                 continue;
@@ -78,11 +68,11 @@ protected function classReflection(string $class): \ReflectionClass
                 return;
             }
 
-            throw new LocatorException("Class '{$class}' can not be loaded");
+            throw new LocatorException(\sprintf("Class '%s' can not be loaded", $class));
         };
 
         //To suspend class dependency exception
-        spl_autoload_register($loader);
+        \spl_autoload_register($loader);
 
         try {
             //In some cases reflection can thrown an exception if class invalid or can not be loaded,
@@ -94,7 +84,7 @@ protected function classReflection(string $class): \ReflectionClass
             }
 
             $this->getLogger()->error(
-                sprintf(
+                \sprintf(
                     '%s: %s in %s:%s',
                     $class,
                     $e->getMessage(),
@@ -106,7 +96,7 @@ protected function classReflection(string $class): \ReflectionClass
 
             throw new LocatorException($e->getMessage(), $e->getCode(), $e);
         } finally {
-            spl_autoload_unregister($loader);
+            \spl_autoload_unregister($loader);
         }
     }
 

src/Tokenizer/src/Bootloader/TokenizerBootloader.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Tokenizer\Bootloader;
@@ -19,6 +12,7 @@
 use Spiral\Core\Container\SingletonInterface;
 use Spiral\Tokenizer\ClassesInterface;
 use Spiral\Tokenizer\ClassLocator;
+use Spiral\Tokenizer\Config\TokenizerConfig;
 use Spiral\Tokenizer\InvocationLocator;
 use Spiral\Tokenizer\InvocationsInterface;
 use Spiral\Tokenizer\ScopedClassesInterface;
@@ -33,12 +27,9 @@ final class TokenizerBootloader extends Bootloader implements SingletonInterface
         InvocationsInterface::class => InvocationLocator::class,
     ];
 
-    /** @var ConfiguratorInterface */
-    private $config;
-
-    public function __construct(ConfiguratorInterface $config)
-    {
-        $this->config = $config;
+    public function __construct(
+        private readonly ConfiguratorInterface $config
+    ) {
     }
 
     public function boot(Container $container, DirectoriesInterface $dirs): void
@@ -47,7 +38,7 @@ public function boot(Container $container, DirectoriesInterface $dirs): void
         $container->bindInjector(InvocationLocator::class, Tokenizer::class);
 
         $this->config->setDefaults(
-            'tokenizer',
+            TokenizerConfig::CONFIG,
             [
                 'directories' => [$dirs->get('app')],
                 'exclude'     => [
@@ -65,6 +56,6 @@ public function boot(Container $container, DirectoriesInterface $dirs): void
      */
     public function addDirectory(string $directory): void
     {
-        $this->config->modify('tokenizer', new Append('directories', null, $directory));
+        $this->config->modify(TokenizerConfig::CONFIG, new Append('directories', null, $directory));
     }
 }

src/Tokenizer/src/ClassLocator.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Tokenizer;
@@ -18,20 +11,17 @@
  */
 final class ClassLocator extends AbstractLocator implements ClassesInterface
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getClasses($target = null): array
+    public function getClasses(object|string|null $target = null): array
     {
-        if (!empty($target) && (is_object($target) || is_string($target))) {
+        if (!empty($target) && (\is_object($target) || \is_string($target))) {
             $target = new \ReflectionClass($target);
         }
 
         $result = [];
         foreach ($this->availableClasses() as $class) {
             try {
                 $reflection = $this->classReflection($class);
-            } catch (LocatorException $e) {
+            } catch (LocatorException) {
                 //Ignoring
                 continue;
             }
@@ -54,7 +44,7 @@ protected function availableClasses(): array
         $classes = [];
 
         foreach ($this->availableReflections() as $reflection) {
-            $classes = array_merge($classes, $reflection->getClasses());
+            $classes = \array_merge($classes, $reflection->getClasses());
         }
 
         return $classes;
@@ -73,10 +63,10 @@ protected function isTargeted(\ReflectionClass $class, \ReflectionClass $target
 
         if (!$target->isTrait()) {
             //Target is interface or class
-            return $class->isSubclassOf($target) || $class->getName() == $target->getName();
+            return $class->isSubclassOf($target) || $class->getName() === $target->getName();
         }
 
         //Checking using traits
-        return in_array($target->getName(), $this->fetchTraits($class->getName()));
+        return \in_array($target->getName(), $this->fetchTraits($class->getName()));
     }
 }

src/Tokenizer/src/ClassesInterface.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Tokenizer;
@@ -26,5 +19,5 @@ interface ClassesInterface
      *                       results.
      * @return \ReflectionClass[]
      */
-    public function getClasses($target = null): array;
+    public function getClasses(object|string|null $target = null): array;
 }

src/Tokenizer/src/Config/TokenizerConfig.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license MIT
- * @author  Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Tokenizer\Config;
@@ -29,7 +22,7 @@ final class TokenizerConfig extends InjectableConfig
 
     public function getDirectories(): array
     {
-        return $this->config['directories'] ?? [getcwd()];
+        return $this->config['directories'] ?? [\getcwd()];
     }
 
     public function getExcludes(): array

src/Tokenizer/src/Exception/LocatorException.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Tokenizer\Exception;

src/Tokenizer/src/Exception/ReflectionException.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Tokenizer\Exception;

src/Tokenizer/src/Exception/TokenizerException.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Tokenizer\Exception;

src/Tokenizer/src/InvocationLocator.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Tokenizer;
@@ -22,9 +15,6 @@
  */
 final class InvocationLocator extends AbstractLocator implements InvocationsInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getInvocations(\ReflectionFunctionAbstract $function): array
     {
         $result = [];
@@ -45,12 +35,12 @@ public function getInvocations(\ReflectionFunctionAbstract $function): array
      */
     protected function availableInvocations(string $signature = ''): \Generator
     {
-        $signature = strtolower(trim($signature, '\\'));
+        $signature = \strtolower(\trim($signature, '\\'));
         foreach ($this->availableReflections() as $reflection) {
             foreach ($reflection->getInvocations() as $invocation) {
                 if (
                     !empty($signature)
-                    && strtolower(trim($invocation->getName(), '\\')) != $signature
+                    && \strtolower(\trim($invocation->getName(), '\\')) !== $signature
                 ) {
                     continue;
                 }
@@ -68,7 +58,7 @@ protected function isTargeted(ReflectionInvocation $invocation, \ReflectionFunct
 
         try {
             $reflection = $this->classReflection($invocation->getClass());
-        } catch (LocatorException $e) {
+        } catch (LocatorException) {
             return false;
         }
 
@@ -79,7 +69,7 @@ protected function isTargeted(ReflectionInvocation $invocation, \ReflectionFunct
 
         if ($target->isTrait()) {
             //Let's compare traits
-            return in_array($target->getName(), $this->fetchTraits($invocation->getClass()));
+            return \in_array($target->getName(), $this->fetchTraits($invocation->getClass()));
         }
 
         return $reflection->getName() == $target->getName() || $reflection->isSubclassOf($target);

src/Tokenizer/src/InvocationsInterface.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Tokenizer;