Skip to content

Commit de380aa

Browse files
committed
Update v2.x-automation-test for micro/kernel-boot-configuration
1 parent 2217d29 commit de380aa

9 files changed

+16
-59
lines changed

Boot/ConfigurationProviderBootLoader.php

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
use Micro\Framework\BootConfiguration\Plugin\ConfigurableInterface;
1919
use Micro\Framework\Kernel\Plugin\PluginBootLoaderInterface;
2020

21-
class ConfigurationProviderBootLoader implements PluginBootLoaderInterface
21+
readonly class ConfigurationProviderBootLoader implements PluginBootLoaderInterface
2222
{
23-
private readonly ApplicationConfigurationInterface $applicationConfiguration;
23+
private ApplicationConfigurationInterface $applicationConfiguration;
2424

2525
/**
2626
* @param array<string|mixed>|ApplicationConfigurationInterface|ApplicationConfigurationFactoryInterface $config
@@ -37,11 +37,8 @@ public function __construct(
3737
if ($applicationConfig instanceof ApplicationConfigurationFactoryInterface) {
3838
$applicationConfig = $applicationConfig->create();
3939
}
40-
/**
41-
* @psalm-suppress PossiblyInvalidPropertyAssignmentValue
42-
*
43-
* @phpstan-ignore-next-line
44-
*/
40+
41+
/** @var ApplicationConfigurationInterface $applicationConfig */
4542
$this->applicationConfiguration = $applicationConfig;
4643
}
4744

@@ -60,9 +57,6 @@ public function boot(object $applicationPlugin): void
6057
);
6158
}
6259

63-
/**
64-
* {@inheritDoc}
65-
*/
6660
protected function createPluginConfigurationClassResolver(): PluginConfigurationClassResolver
6761
{
6862
return new PluginConfigurationClassResolver($this->applicationConfiguration);

Configuration/DefaultApplicationConfiguration.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ public function __construct(private readonly array $configuration)
3030
{
3131
}
3232

33-
/**
34-
* {@inheritDoc}
35-
*/
3633
public function get(string $key, mixed $default = null, bool $nullable = true): mixed
3734
{
3835
if (\is_bool($default)) {

Configuration/DefaultApplicationConfigurationFactory.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111

1212
namespace Micro\Framework\BootConfiguration\Configuration;
1313

14-
class DefaultApplicationConfigurationFactory implements ApplicationConfigurationFactoryInterface
14+
readonly class DefaultApplicationConfigurationFactory implements ApplicationConfigurationFactoryInterface
1515
{
1616
/**
1717
* @param array<string, mixed> $configuration
1818
*/
19-
public function __construct(private readonly array $configuration)
20-
{
19+
public function __construct(
20+
private array $configuration
21+
) {
2122
}
2223

2324
public function create(): ApplicationConfigurationInterface

Configuration/Resolver/PluginConfigurationClassResolver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
use Micro\Framework\BootConfiguration\Configuration\PluginConfiguration;
1616
use Micro\Framework\BootConfiguration\Configuration\PluginConfigurationInterface;
1717

18-
class PluginConfigurationClassResolver
18+
readonly class PluginConfigurationClassResolver
1919
{
2020
public function __construct(
21-
private readonly ApplicationConfigurationInterface $applicationConfiguration
21+
private ApplicationConfigurationInterface $applicationConfiguration
2222
) {
2323
}
2424

Configuration/Resolver/PluginNameResolver.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313

1414
class PluginNameResolver implements PluginConfigurationClassResolverInterface
1515
{
16-
/**
17-
* {@inheritDoc}
18-
*/
1916
public function resolve(string $pluginClass): string
2017
{
2118
return $pluginClass.'Configuration';

Configuration/Resolver/PluginNameShortResolver.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313

1414
class PluginNameShortResolver implements PluginConfigurationClassResolverInterface
1515
{
16-
/**
17-
* {@inheritDoc}
18-
*/
1916
public function resolve(string $pluginClass): string
2017
{
2118
return $pluginClass.'Config';

Tests/Unit/Boot/ConfigurationProviderBootLoaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function testBoot(mixed $configuration)
3737
$this->assertEquals('OK', $plugin->getConfigRoutingKeyValue());
3838
}
3939

40-
public function dataProvider(): array
40+
public static function dataProvider(): array
4141
{
4242
$cfgArr = [
4343
'APP_ENV' => 'test',

Tests/Unit/Configuration/DefaultApplicationConfigurationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public function testExceptional(string $key, mixed $default)
9393
var_dump($this->configuration->get($key, $default, false));
9494
}
9595

96-
public function dataProviderExceptionalKeys()
96+
public static function dataProviderExceptionalKeys(): array
9797
{
9898
return [
9999
['BOOLEAN_INVALID', false],

composer.json

Lines changed: 4 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,19 @@
11
{
22
"name": "micro/kernel-boot-configuration",
33
"description": "Micro Framework: Kernel Boot loader - component to provide plugin configuration",
4-
"type": "micro-plugin",
54
"license": "MIT",
5+
"type": "library",
66
"authors": [
77
{
88
"name": "Stanislau Komar",
99
"email": "stanislau_komar@epam.com"
1010
}
1111
],
1212
"require": {
13-
"micro/kernel": "^1.6"
14-
},
15-
"require-dev": {
16-
"ergebnis/composer-normalize": "^2.29",
17-
"friendsofphp/php-cs-fixer": "^3.13",
18-
"phpstan/phpstan": "^1.9",
19-
"phpunit/php-code-coverage": "^9.2",
20-
"phpunit/phpunit": "^9.5",
21-
"vimeo/psalm": "^5.2"
13+
"php": "^8.2",
14+
"micro/kernel": "^2.0"
2215
},
16+
"minimum-stability": "dev",
2317
"autoload": {
2418
"psr-4": {
2519
"Micro\\Framework\\BootConfiguration\\": "/"
@@ -29,29 +23,6 @@
2923
]
3024
},
3125
"config": {
32-
"allow-plugins": {
33-
"ergebnis/composer-normalize": true
34-
},
3526
"sort-packages": true
36-
},
37-
"scripts": {
38-
"coverage": "XDEBUG_MODE=coverage ./vendor/bin/phpunit --coverage-text",
39-
"coverage-html": "XDEBUG_MODE=coverage ./vendor/bin/phpunit --coverage-html ./test-coverage-report",
40-
"php-cs-fix": "PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --verbose --using-cache=no",
41-
"php-cs-try": "PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --verbose --dry-run --using-cache=no",
42-
"phpstan": "./vendor/bin/phpstan analyze --no-progress",
43-
"phpunit": "./vendor/bin/phpunit",
44-
"psalm": "./vendor/bin/psalm --no-progress --show-info=true --no-cache",
45-
"statics": [
46-
"@phpstan",
47-
"@psalm",
48-
"@php-cs-try"
49-
],
50-
"test": [
51-
"@statics",
52-
"composer validate --strict",
53-
"composer normalize",
54-
"@coverage"
55-
]
5627
}
5728
}

0 commit comments

Comments
 (0)