Skip to content

Commit 0797a74

Browse files
committed
[Kernel] Prepare for 2.x:
- Other components fixe
1 parent 06a4488 commit 0797a74

File tree

6 files changed

+12
-33
lines changed

6 files changed

+12
-33
lines changed

Kernel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Micro\Framework\Kernel;
1313

14-
use Micro\Component\DependencyInjection\Container;
14+
use Micro\Framework\DependencyInjection\Container;
1515
use Micro\Framework\Kernel\Plugin\PluginBootLoaderInterface;
1616

1717
class Kernel implements KernelInterface

KernelBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Micro\Framework\Kernel;
1313

14-
use Micro\Component\DependencyInjection\Container;
14+
use Micro\Framework\DependencyInjection\Container;
1515
use Micro\Framework\Kernel\Plugin\PluginBootLoaderInterface;
1616
use Psr\Container\ContainerInterface;
1717

KernelInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Micro\Framework\Kernel;
1313

14-
use Micro\Component\DependencyInjection\Container;
14+
use Micro\Framework\DependencyInjection\Container;
1515
use Micro\Framework\Kernel\Plugin\PluginBootLoaderInterface;
1616

1717
/**

Tests/Unit/KernelBuilderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace Micro\Framework\Kernel\Tests\Unit;
1515

16-
use Micro\Component\DependencyInjection\Container;
16+
use Micro\Framework\DependencyInjection\Container;
1717
use Micro\Framework\Kernel\KernelBuilder;
1818
use Micro\Framework\Kernel\KernelInterface;
1919
use Micro\Framework\Kernel\Plugin\PluginBootLoaderInterface;

Tests/Unit/KernelTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace Micro\Framework\Kernel\Tests\Unit;
1515

16-
use Micro\Component\DependencyInjection\Container;
16+
use Micro\Framework\DependencyInjection\Container;
1717
use Micro\Framework\Kernel\Kernel;
1818
use Micro\Framework\Kernel\KernelInterface;
1919
use Micro\Framework\Kernel\Plugin\PluginBootLoaderInterface;

composer.json

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,45 +11,24 @@
1111
],
1212
"require": {
1313
"php": "^8.2",
14-
"micro/dependency-injection": "^1.6"
14+
"micro/dependency-injection": "^2.0"
1515
},
1616
"require-dev": {
17-
"ergebnis/composer-normalize": "^2.29",
18-
"friendsofphp/php-cs-fixer": "^3.13",
19-
"phpstan/phpstan": "^1.9",
20-
"phpunit/php-code-coverage": "^9.2",
21-
"phpunit/phpunit": "^9.5",
22-
"vimeo/psalm": "^5.2"
17+
"ergebnis/composer-normalize": "^2.34"
2318
},
2419
"autoload": {
2520
"psr-4": {
2621
"Micro\\Framework\\Kernel\\": "/"
27-
}
22+
},
23+
"exclude-from-classmap": [
24+
"/Tests/"
25+
]
2826
},
2927
"config": {
3028
"allow-plugins": {
3129
"ergebnis/composer-normalize": true
3230
},
3331
"sort-packages": true
3432
},
35-
"scripts": {
36-
"coverage": "XDEBUG_MODE=coverage ./vendor/bin/phpunit --coverage-text",
37-
"coverage-html": "XDEBUG_MODE=coverage ./vendor/bin/phpunit --coverage-html ./test-coverage-report",
38-
"php-cs-fix": "PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --verbose --using-cache=no",
39-
"php-cs-try": "PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --verbose --dry-run --using-cache=no",
40-
"phpstan": "./vendor/bin/phpstan analyze --no-progress",
41-
"phpunit": "./vendor/bin/phpunit",
42-
"psalm": "./vendor/bin/psalm --no-progress --show-info=true --no-cache",
43-
"statics": [
44-
"@phpstan",
45-
"@psalm",
46-
"@php-cs-try"
47-
],
48-
"test": [
49-
"@statics",
50-
"composer validate --strict",
51-
"composer normalize",
52-
"@coverage"
53-
]
54-
}
33+
"minimum-stability": "dev"
5534
}

0 commit comments

Comments
 (0)