Merge branch 'phpstan-fix' into 'master'

phpstan fix

See merge request head.trackingsoft/micro-kernel!3

Author: Asisyas

src/Configuration/ApplicationConfigurationInterface.php

@@ -5,10 +5,9 @@
 interface ApplicationConfigurationInterface
 {
     /**
-     * @param string $key
-     * @param $default
-     * @param bool $nullable
+     * @param  string $key
+     * @param  mixed $default
      * @return mixed
      */
-    public function get(string $key, $default = null, bool $nullable = true): mixed;
+    public function get(string $key, mixed $default = null): mixed;
 }

src/Configuration/DefaultApplicationConfigurationFactory.php

@@ -2,8 +2,6 @@
 
 namespace Micro\Framework\Kernel\Configuration;
 
-use JetBrains\PhpStorm\Pure;
-
 class DefaultApplicationConfigurationFactory implements ApplicationConfigurationFactoryInterface
 {
     /**
@@ -16,7 +14,7 @@ public function __construct(private array $configuration)
     /**
      * @return ApplicationConfigurationInterface
      */
-    #[Pure] public function create(): ApplicationConfigurationInterface
+    public function create(): ApplicationConfigurationInterface
     {
         return new DefaultApplicationConfiguration($this->configuration);
     }

src/Configuration/PluginConfiguration.php

@@ -16,8 +16,12 @@ public function __construct(protected ApplicationConfigurationInterface $configu
      * @param  string $separator
      * @return array
      */
-    protected function explodeStringToArray(string $list, string $separator=','): array
+    protected function explodeStringToArray(string $list, string $separator = ','): array
     {
+        if($separator === '') {
+            return [$list];
+        }
+
         $itemsColl = explode($separator, $list);
 
         return array_map('trim', $itemsColl);

src/Configuration/PluginRoutingKeyConfiguration.php

@@ -26,12 +26,12 @@ protected function cfg(string $key): string
     }
 
     /**
-     * @param string $key
-     * @param $default
+     * @param  string $key
+     * @param  mixed $default
      * @param bool $nullable
      * @return mixed
      */
-    protected function get(string $key, $default = null, bool $nullable = true): mixed
+    protected function get(string $key, mixed $default = null, bool $nullable = true): mixed
     {
         return $this->configuration->get(
             $this->cfg($key),

src/Configuration/Resolver/PluginConfigurationClassResolver.php

@@ -4,14 +4,10 @@
 
 use Micro\Framework\Kernel\Configuration\ApplicationConfigurationInterface;
 use Micro\Framework\Kernel\Configuration\PluginConfiguration;
+use Micro\Framework\Kernel\Configuration\PluginConfigurationInterface;
 
 class PluginConfigurationClassResolver
 {
-    /**
-     * @var PluginConfigurationClassResolverInterface[]
-     */
-    private array $resolvers;
-
     /**
      * @param string                            $pluginClass
      * @param ApplicationConfigurationInterface $applicationConfiguration
@@ -21,18 +17,17 @@ public function __construct(
     private ApplicationConfigurationInterface $applicationConfiguration
     )
     {
-        $this->resolvers = $this->getPluginClassResolvers();
     }
 
     /**
-     * @return PluginConfiguration
+     * @return PluginConfigurationInterface
      */
-    public function resolve(): PluginConfiguration
+    public function resolve(): PluginConfigurationInterface
     {
         $configClassDefault = PluginConfiguration::class;
         $configClasses      = [];
 
-        foreach ($this->resolvers as $resolver) {
+        foreach ($this->getPluginClassResolvers() as $resolver) {
             $configClass = $resolver->resolve($this->pluginClass);
 
             if(!class_exists($configClass)) {
@@ -51,14 +46,14 @@ public function resolve(): PluginConfiguration
                 )
             );
         }
-
+        /** @var class-string<PluginConfigurationInterface> $configClass */
         $configClass = $configClasses[0] ?? $configClassDefault;
 
         return new $configClass($this->applicationConfiguration);
     }
 
     /**
-     * @return PluginConfigurationClassResolver[]
+     * @return PluginConfigurationClassResolverInterface[]
      */
     protected function getPluginClassResolvers(): array
     {

src/Kernel.php

@@ -5,6 +5,7 @@
 use Micro\Component\DependencyInjection\Container;
 use Micro\Framework\Kernel\Configuration\ApplicationConfigurationInterface;
 use Micro\Framework\Kernel\Configuration\PluginConfiguration;
+use Micro\Framework\Kernel\Configuration\PluginConfigurationInterface;
 use Micro\Framework\Kernel\Configuration\Resolver\PluginConfigurationClassResolver;
 use Micro\Framework\Kernel\Plugin\ApplicationPluginInterface;
 use Micro\Framework\Kernel\Plugin\PluginBootLoaderInterface;
@@ -79,18 +80,13 @@ public function container(): Container
     }
 
     /**
-     * @template    T of \Micro\Framework\Kernel\Plugin\ApplicationPluginInterface
-     * @psalm-param class-string<T>
-     *
      * @param  string $applicationPluginClass
      * @return void
      */
     protected function loadPlugin(string $applicationPluginClass): void
     {
         $pluginConfiguration = $this->resolvePluginConfiguration($applicationPluginClass);
-        /***
- * @var ApplicationPluginInterface $plugin 
-*/
+        /** @var ApplicationPluginInterface $plugin */
         $plugin = new $applicationPluginClass($pluginConfiguration);
 
         foreach ($this->pluginBootLoaderCollection as $bootLoader) {
@@ -118,13 +114,10 @@ protected function createPluginConfigurationResolver(string $applicationPluginCl
     }
 
     /**
-     * @template    T of \Micro\Framework\Kernel\Plugin\ApplicationPluginInterface
-     * @psalm-param class-string<T>
-     *
      * @param  string $applicationPluginClass
-     * @return void
+     * @return PluginConfigurationInterface
      */
-    protected function resolvePluginConfiguration(string $applicationPluginClass): PluginConfiguration
+    protected function resolvePluginConfiguration(string $applicationPluginClass): PluginConfigurationInterface
     {
         return $this->createPluginConfigurationResolver($applicationPluginClass)->resolve();
     }

src/KernelBuilder.php

@@ -17,24 +17,26 @@ class KernelBuilder
     private array $pluginCollection;
 
     /**
-     * @var ApplicationConfigurationInterface
+     * @var ApplicationConfigurationInterface|null
      */
-    private ApplicationConfigurationInterface $configuration;
+    private ?ApplicationConfigurationInterface $configuration;
 
     /**
      * @var PluginBootLoaderInterface[]
      */
     private array $bootLoaderPluginCollection;
 
     /**
-     * @var Container
+     * @var Container|null
      */
-    private Container $container;
+    private ?Container $container;
 
     public function __construct()
     {
         $this->pluginCollection           = [];
         $this->bootLoaderPluginCollection = [];
+        $this->configuration              = null;
+        $this->container                  = null;
     }
 
     /**