[Kernel] Prepare for 2.x:

- Other components fixe
Micro-PHP · Aug 4, 2023 · 0797a74 · 0797a74
1 parent 06a4488
commit 0797a74
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 33 deletions.
diff --git a/Kernel.php b/Kernel.php
@@ -11,7 +11,7 @@
 
 namespace Micro\Framework\Kernel;
 
-use Micro\Component\DependencyInjection\Container;
+use Micro\Framework\DependencyInjection\Container;
 use Micro\Framework\Kernel\Plugin\PluginBootLoaderInterface;
 
 class Kernel implements KernelInterface

diff --git a/KernelBuilder.php b/KernelBuilder.php
@@ -11,7 +11,7 @@
 
 namespace Micro\Framework\Kernel;
 
-use Micro\Component\DependencyInjection\Container;
+use Micro\Framework\DependencyInjection\Container;
 use Micro\Framework\Kernel\Plugin\PluginBootLoaderInterface;
 use Psr\Container\ContainerInterface;
 

diff --git a/KernelInterface.php b/KernelInterface.php
@@ -11,7 +11,7 @@
 
 namespace Micro\Framework\Kernel;
 
-use Micro\Component\DependencyInjection\Container;
+use Micro\Framework\DependencyInjection\Container;
 use Micro\Framework\Kernel\Plugin\PluginBootLoaderInterface;
 
 /**

diff --git a/Tests/Unit/KernelBuilderTest.php b/Tests/Unit/KernelBuilderTest.php
@@ -13,7 +13,7 @@
 
 namespace Micro\Framework\Kernel\Tests\Unit;
 
-use Micro\Component\DependencyInjection\Container;
+use Micro\Framework\DependencyInjection\Container;
 use Micro\Framework\Kernel\KernelBuilder;
 use Micro\Framework\Kernel\KernelInterface;
 use Micro\Framework\Kernel\Plugin\PluginBootLoaderInterface;

diff --git a/Tests/Unit/KernelTest.php b/Tests/Unit/KernelTest.php
@@ -13,7 +13,7 @@
 
 namespace Micro\Framework\Kernel\Tests\Unit;
 
-use Micro\Component\DependencyInjection\Container;
+use Micro\Framework\DependencyInjection\Container;
 use Micro\Framework\Kernel\Kernel;
 use Micro\Framework\Kernel\KernelInterface;
 use Micro\Framework\Kernel\Plugin\PluginBootLoaderInterface;

diff --git a/composer.json b/composer.json
@@ -11,45 +11,24 @@
     ],
     "require": {
         "php": "^8.2",
-        "micro/dependency-injection": "^1.6"
+        "micro/dependency-injection": "^2.0"
     },
     "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"
+        "ergebnis/composer-normalize": "^2.34"
     },
     "autoload": {
         "psr-4": {
             "Micro\\Framework\\Kernel\\": "/"
-        }
+        },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
     },
     "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"
-        ]
-    }
+    "minimum-stability": "dev"
 }