Update v2.x-automation-test for micro/kernel-boot-configuration

Micro-PHP · Jul 6, 2024 · de380aa · de380aa
1 parent 2217d29
commit de380aa
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 59 deletions.
diff --git a/Boot/ConfigurationProviderBootLoader.php b/Boot/ConfigurationProviderBootLoader.php
@@ -18,9 +18,9 @@
 use Micro\Framework\BootConfiguration\Plugin\ConfigurableInterface;
 use Micro\Framework\Kernel\Plugin\PluginBootLoaderInterface;
 
-class ConfigurationProviderBootLoader implements PluginBootLoaderInterface
+readonly class ConfigurationProviderBootLoader implements PluginBootLoaderInterface
 {
-    private readonly ApplicationConfigurationInterface $applicationConfiguration;
+    private ApplicationConfigurationInterface $applicationConfiguration;
 
     /**
      * @param array<string|mixed>|ApplicationConfigurationInterface|ApplicationConfigurationFactoryInterface $config
@@ -37,11 +37,8 @@ public function __construct(
         if ($applicationConfig instanceof ApplicationConfigurationFactoryInterface) {
             $applicationConfig = $applicationConfig->create();
         }
-        /**
-         * @psalm-suppress PossiblyInvalidPropertyAssignmentValue
-         *
-         * @phpstan-ignore-next-line
-         */
+
+        /** @var ApplicationConfigurationInterface $applicationConfig */
         $this->applicationConfiguration = $applicationConfig;
     }
 
@@ -60,9 +57,6 @@ public function boot(object $applicationPlugin): void
         );
     }
 
-    /**
-     * {@inheritDoc}
-     */
     protected function createPluginConfigurationClassResolver(): PluginConfigurationClassResolver
     {
         return new PluginConfigurationClassResolver($this->applicationConfiguration);

diff --git a/Configuration/DefaultApplicationConfiguration.php b/Configuration/DefaultApplicationConfiguration.php
@@ -30,9 +30,6 @@ public function __construct(private readonly array $configuration)
     {
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function get(string $key, mixed $default = null, bool $nullable = true): mixed
     {
         if (\is_bool($default)) {

diff --git a/Configuration/DefaultApplicationConfigurationFactory.php b/Configuration/DefaultApplicationConfigurationFactory.php
@@ -11,13 +11,14 @@
 
 namespace Micro\Framework\BootConfiguration\Configuration;
 
-class DefaultApplicationConfigurationFactory implements ApplicationConfigurationFactoryInterface
+readonly class DefaultApplicationConfigurationFactory implements ApplicationConfigurationFactoryInterface
 {
     /**
      * @param array<string, mixed> $configuration
      */
-    public function __construct(private readonly array $configuration)
-    {
+    public function __construct(
+        private array $configuration
+    ) {
     }
 
     public function create(): ApplicationConfigurationInterface

diff --git a/Configuration/Resolver/PluginConfigurationClassResolver.php b/Configuration/Resolver/PluginConfigurationClassResolver.php
@@ -15,10 +15,10 @@
 use Micro\Framework\BootConfiguration\Configuration\PluginConfiguration;
 use Micro\Framework\BootConfiguration\Configuration\PluginConfigurationInterface;
 
-class PluginConfigurationClassResolver
+readonly class PluginConfigurationClassResolver
 {
     public function __construct(
-        private readonly ApplicationConfigurationInterface $applicationConfiguration
+        private ApplicationConfigurationInterface $applicationConfiguration
     ) {
     }
 

diff --git a/Configuration/Resolver/PluginNameResolver.php b/Configuration/Resolver/PluginNameResolver.php
@@ -13,9 +13,6 @@
 
 class PluginNameResolver implements PluginConfigurationClassResolverInterface
 {
-    /**
-     * {@inheritDoc}
-     */
     public function resolve(string $pluginClass): string
     {
         return $pluginClass.'Configuration';

diff --git a/Configuration/Resolver/PluginNameShortResolver.php b/Configuration/Resolver/PluginNameShortResolver.php
@@ -13,9 +13,6 @@
 
 class PluginNameShortResolver implements PluginConfigurationClassResolverInterface
 {
-    /**
-     * {@inheritDoc}
-     */
     public function resolve(string $pluginClass): string
     {
         return $pluginClass.'Config';

diff --git a/Tests/Unit/Boot/ConfigurationProviderBootLoaderTest.php b/Tests/Unit/Boot/ConfigurationProviderBootLoaderTest.php
@@ -37,7 +37,7 @@ public function testBoot(mixed $configuration)
         $this->assertEquals('OK', $plugin->getConfigRoutingKeyValue());
     }
 
-    public function dataProvider(): array
+    public static function dataProvider(): array
     {
         $cfgArr = [
             'APP_ENV' => 'test',

diff --git a/Tests/Unit/Configuration/DefaultApplicationConfigurationTest.php b/Tests/Unit/Configuration/DefaultApplicationConfigurationTest.php
@@ -93,7 +93,7 @@ public function testExceptional(string $key, mixed $default)
         var_dump($this->configuration->get($key, $default, false));
     }
 
-    public function dataProviderExceptionalKeys()
+    public static function dataProviderExceptionalKeys(): array
     {
         return [
             ['BOOLEAN_INVALID', false],

diff --git a/composer.json b/composer.json
@@ -1,25 +1,19 @@
 {
     "name": "micro/kernel-boot-configuration",
     "description": "Micro Framework: Kernel Boot loader - component to provide plugin configuration",
-    "type": "micro-plugin",
     "license": "MIT",
+    "type": "library",
     "authors": [
         {
             "name": "Stanislau Komar",
             "email": "[email protected]"
         }
     ],
     "require": {
-        "micro/kernel": "^1.6"
-    },
-    "require-dev": {
-        "ergebnis/composer-normalize": "^2.29",
-        "friendsofphp/php-cs-fixer": "^3.13",
-        "phpstan/phpstan": "^1.9",
-        "phpunit/php-code-coverage": "^9.2",
-        "phpunit/phpunit": "^9.5",
-        "vimeo/psalm": "^5.2"
+        "php": "^8.2",
+        "micro/kernel": "^2.0"
     },
+    "minimum-stability": "dev",
     "autoload": {
         "psr-4": {
             "Micro\\Framework\\BootConfiguration\\": "/"
@@ -29,29 +23,6 @@
         ]
     },
     "config": {
-        "allow-plugins": {
-            "ergebnis/composer-normalize": true
-        },
         "sort-packages": true
-    },
-    "scripts": {
-        "coverage": "XDEBUG_MODE=coverage ./vendor/bin/phpunit --coverage-text",
-        "coverage-html": "XDEBUG_MODE=coverage ./vendor/bin/phpunit --coverage-html ./test-coverage-report",
-        "php-cs-fix": "PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --verbose --using-cache=no",
-        "php-cs-try": "PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --verbose --dry-run --using-cache=no",
-        "phpstan": "./vendor/bin/phpstan analyze --no-progress",
-        "phpunit": "./vendor/bin/phpunit",
-        "psalm": "./vendor/bin/psalm --no-progress --show-info=true --no-cache",
-        "statics": [
-            "@phpstan",
-            "@psalm",
-            "@php-cs-try"
-        ],
-        "test": [
-            "@statics",
-            "composer validate --strict",
-            "composer normalize",
-            "@coverage"
-        ]
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
         {
         }
-        /**
-         * {@inheritDoc}
-         */
         public function get(string $key, mixed $default = null, bool $nullable = true): mixed
         {
             if (\is_bool($default)) {
@@ Expand Down @@