Merge remote-tracking branch 'origin/master' into singleton-interface

spiral · Jan 11, 2024 · e1fa3d2 · e1fa3d2
2 parents 5e4ada3 + fb8a19f
commit e1fa3d2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/rector.php b/rector.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
+use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodParameterRector;
 use Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector;
 use Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector;
@@ -51,6 +52,9 @@
         RemoveExtraParametersRector::class => [
             __DIR__ . '/src/Boot/src/BootloadManager/AbstractBootloadManager.php',
         ],
+        RemoveUnusedPrivateMethodParameterRector::class => [
+            __DIR__ . '/src/Core/src/Internal/Factory.php',
+        ],
     ]);
 
     $config->import(LevelSetList::UP_TO_PHP_72);

diff --git a/src/Boot/src/BootloadManager/Initializer.php b/src/Boot/src/BootloadManager/Initializer.php
@@ -40,7 +40,7 @@ public function __construct(
     /**
      * Instantiate bootloader objects and resolve dependencies
      *
-     * @param TClass[]|array<TClass, array<string,mixed>> $classes
+     * @param TClass[]|array<class-string<BootloaderInterface>, array<string,mixed>> $classes
      */
     public function init(array $classes, bool $useConfig = true): \Generator
     {

diff --git a/src/Boot/src/BootloadManager/InitializerInterface.php b/src/Boot/src/BootloadManager/InitializerInterface.php
@@ -4,6 +4,7 @@
 
 namespace Spiral\Boot\BootloadManager;
 
+use Spiral\Boot\Bootloader\BootloaderInterface;
 use Spiral\Boot\BootloadManagerInterface;
 
 /**
@@ -14,7 +15,7 @@ interface InitializerInterface
     /**
      * Instantiate bootloader objects and resolve dependencies
      *
-     * @param TClass[]|array<TClass, array<string,mixed>> $classes
+     * @param TClass[]|array<class-string<BootloaderInterface>, array<string,mixed>> $classes
      */
     public function init(array $classes): \Generator;
 

diff --git a/src/Console/src/Configurator/Attribute/Parser.php b/src/Console/src/Configurator/Attribute/Parser.php
@@ -225,7 +225,7 @@ private function getPropertyType(\ReflectionProperty $property): \ReflectionName
             }
         }
 
-        if (!$type->isBuiltin() && \enum_exists($type->getName())) {
+        if ($type instanceof \ReflectionNamedType && !$type->isBuiltin() && \enum_exists($type->getName())) {
             return $type;
         }
 

diff --git a/src/Core/src/Attribute/Proxy.php b/src/Core/src/Attribute/Proxy.php
@@ -29,8 +29,4 @@ final class Proxy implements Plugin
      * @internal
      */
     public bool $proxyOverloads = false;
-
-    public function __construct(
-    ) {
-    }
 }