Merge pull request #520 from goaop/feature/modernize-php-code

feat: Modernise php code

Author: lisachenko

src/Core/AspectKernel.php

@@ -224,15 +224,15 @@ protected function normalizeOptions(array $options): array
         }
 
         $rawExcludePaths = is_array($merged['excludePaths'] ?? null) ? $merged['excludePaths'] : [];
-        $excludePaths    = array_values(array_filter($rawExcludePaths, 'is_string'));
+        $excludePaths    = array_values(array_filter($rawExcludePaths, is_string(...)));
         $excludePaths[]  = $cacheDir;
         $excludePaths[]  = __DIR__ . '/../';
 
         $appDir        = is_string($merged['appDir'] ?? null) ? $merged['appDir'] : '';
         $cacheFileMode = is_int($merged['cacheFileMode'] ?? null) ? $merged['cacheFileMode'] : (0770 & ~umask());
         $features      = is_int($merged['features'] ?? null) ? $merged['features'] : 0;
         $rawIncludePaths = is_array($merged['includePaths'] ?? null) ? $merged['includePaths'] : [];
-        $includePaths    = array_values(array_filter($rawIncludePaths, 'is_string'));
+        $includePaths    = array_values(array_filter($rawIncludePaths, is_string(...)));
         $debug         = is_bool($merged['debug'] ?? null) ? $merged['debug'] : false;
 
         $containerClass       = static::$containerClass;
@@ -256,8 +256,8 @@ protected function normalizeOptions(array $options): array
             'cacheDir'       => $resolvedCacheDir,
             'cacheFileMode'  => $cacheFileMode,
             'features'       => $features,
-            'includePaths'   => array_values(array_filter($resolvedIncludePaths, 'is_string')),
-            'excludePaths'   => array_values(array_filter($resolvedExcludePaths, 'is_string')),
+            'includePaths'   => array_values(array_filter($resolvedIncludePaths, is_string(...))),
+            'excludePaths'   => array_values(array_filter($resolvedExcludePaths, is_string(...))),
             'containerClass' => $containerClass,
         ];
     }

src/Core/IntroductionAspectExtension.php

@@ -75,20 +75,28 @@ protected function getAdvice(
         Aspect $aspect,
         ReflectionProperty $aspectProperty
     ): Advice {
-        $pointcutExpression = $interceptorAttribute->expression;
-        switch (true) {
-            case ($interceptorAttribute instanceof DeclareError):
-                $errorMessage = $aspectProperty->getDefaultValue();
-                if (!is_string($errorMessage) || $errorMessage === '') {
-                    throw new \UnexpectedValueException('DeclareError property must have a non-empty string default value');
-                }
-                return new DeclareErrorInterceptor($errorMessage, $interceptorAttribute->level, $pointcutExpression);
-
-            case ($interceptorAttribute instanceof DeclareParents):
-                return new TraitIntroductionInfo($interceptorAttribute->trait, $interceptorAttribute->interface);
+        return match (true) {
+            $interceptorAttribute instanceof DeclareError =>
+                $this->createDeclareErrorAdvice($aspectProperty, $interceptorAttribute),
+            $interceptorAttribute instanceof DeclareParents =>
+                new TraitIntroductionInfo($interceptorAttribute->trait, $interceptorAttribute->interface),
+            default =>
+                throw new UnexpectedValueException('Unsupported attribute class: ' . get_class($interceptorAttribute)),
+        };
+    }
 
-            default:
-                throw new UnexpectedValueException('Unsupported attribute class: ' . get_class($interceptorAttribute));
+    /**
+     * Creates a DeclareErrorInterceptor after validating the property's default value.
+     *
+     * @throws \UnexpectedValueException if the property default value is not a non-empty string
+     */
+    private function createDeclareErrorAdvice(ReflectionProperty $aspectProperty, DeclareError $attribute): DeclareErrorInterceptor
+    {
+        $errorMessage = $aspectProperty->getDefaultValue();
+        if (!is_string($errorMessage) || $errorMessage === '') {
+            throw new \UnexpectedValueException('DeclareError property must have a non-empty string default value');
         }
+
+        return new DeclareErrorInterceptor($errorMessage, $attribute->level, $attribute->expression);
     }
 }

src/Core/LazyAdvisorAccessor.php

@@ -25,24 +25,13 @@
 #[AllowDynamicProperties]
 class LazyAdvisorAccessor
 {
-    /**
-     * Instance of aspect container
-     */
-    protected AspectContainer $container;
-
-    /**
-     * Aspect loader instance
-     */
-    protected AspectLoader $loader;
-
     /**
      * Accessor constructor
      */
-    public function __construct(AspectContainer $container, AspectLoader $loader)
-    {
-        $this->container = $container;
-        $this->loader    = $loader;
-    }
+    public function __construct(
+        protected AspectContainer $container,
+        protected AspectLoader $loader
+    ) {}
 
     /**
      * Magic advice accessor

src/Instrument/PathResolver.php

@@ -31,9 +31,9 @@ class PathResolver
      *
      * @return ($somePath is array ? list<string|false> : string|false)
      */
-    public static function realpath($somePath, bool $shouldCheckExistence = false)
+    public static function realpath(string|array $somePath, bool $shouldCheckExistence = false): string|array|false
     {
-        // Do not resolve empty string/false/arrays into the current path
+        // Do not resolve empty string/empty arrays into the current path
         if (!$somePath) {
             return $somePath;
         }

src/Instrument/Transformer/CachingTransformer.php

@@ -31,9 +31,9 @@ class CachingTransformer extends BaseSourceTransformer
     protected int $cacheFileMode = 0770;
 
     /**
-     * @var SourceTransformer[]|callable(): SourceTransformer[]
+     * @var SourceTransformer[]|Closure(): SourceTransformer[]
      */
-    protected $transformers = [];
+    protected array|Closure $transformers = [];
 
     /**
      * Cache manager
@@ -43,9 +43,9 @@ class CachingTransformer extends BaseSourceTransformer
     /**
      * Class constructor
      *
-     * @param SourceTransformer[]|callable(): SourceTransformer[] $transformers Source transformers or callable that should return transformers
+     * @param SourceTransformer[]|Closure(): SourceTransformer[] $transformers Source transformers or closure that should return transformers
      */
-    public function __construct(AspectKernel $kernel, $transformers, CachePathManager $cacheManager)
+    public function __construct(AspectKernel $kernel, array|Closure $transformers, CachePathManager $cacheManager)
     {
         parent::__construct($kernel);
         $this->cacheManager  = $cacheManager;

src/Instrument/Transformer/StreamMetaData.php

@@ -51,10 +51,8 @@ class StreamMetaData
 
     /**
      * Wrapper-specific data attached to this stream.
-     *
-     * @var mixed
      */
-    public $wrapperData;
+    public mixed $wrapperData;
 
     /**
      * Array containing the names of any filters that have been stacked onto this stream.