diff --git a/.github/workflows/coding-standard.yml b/.github/workflows/coding-standard.yml index 53ff3ac35..8072a8eea 100644 --- a/.github/workflows/coding-standard.yml +++ b/.github/workflows/coding-standard.yml @@ -26,7 +26,7 @@ jobs: extensions: mbstring, xml, ctype, iconv, zip, dom, fileinfo tools: composer, composer-prefetcher, cs2pr - - name: "Install Narrowspark coding standard and Annotate a Github Pull Request" + - name: "Install Narrowspark coding standard" run: composer global require narrowspark/coding-standard:3.4.0 --no-interaction --no-progress --profile --no-suggest --optimize-autoloader - name: "lint php code" diff --git a/.mergify.yml b/.mergify.yml deleted file mode 100644 index 85407e48c..000000000 --- a/.mergify.yml +++ /dev/null @@ -1,8 +0,0 @@ -pull_request_rules: - - name: automatic merge for Dependabot pull requests - conditions: - - author=dependabot[bot] - - status-success=concourse-ci/concourse - actions: - merge: - method: merge diff --git a/src/Viserio/Component/Config/.changelog b/src/Viserio/Component/Config/.changelog index 66acb3069..2dfcf57ad 100644 --- a/src/Viserio/Component/Config/.changelog +++ b/src/Viserio/Component/Config/.changelog @@ -8,6 +8,6 @@ return [ 'narrowspark', 'framework', 'v' . \Viserio\Component\Foundation\AbstractKernel::VERSION, - ['Component: Options Resolver'] + ['Component: Config'] ) ]; diff --git a/src/Viserio/Component/Config/Command/ConfigDumpCommand.php b/src/Viserio/Component/Config/Command/ConfigDumpCommand.php index b8a9af0b5..0ccd704dc 100644 --- a/src/Viserio/Component/Config/Command/ConfigDumpCommand.php +++ b/src/Viserio/Component/Config/Command/ConfigDumpCommand.php @@ -154,26 +154,26 @@ public function __construct(ConfigDumpCommand $command) } /** - * Read the mandatory options and ask for the value. + * Read the mandatory config and ask for the value. * * @param string $className * @param array $dimensions - * @param array $mandatoryOptions + * @param array $mandatoryConfig * * @return array */ - protected function readMandatoryOption(string $className, array $dimensions, array $mandatoryOptions): array + protected function readMandatoryOption(string $className, array $dimensions, array $mandatoryConfig): array { - $options = []; + $config = []; - foreach ($mandatoryOptions as $key => $mandatoryOption) { + foreach ($mandatoryConfig as $key => $mandatoryOption) { if (! \is_scalar($mandatoryOption)) { - $options[$key] = $this->readMandatoryOption($className, $dimensions, $mandatoryOptions[$key]); + $config[$key] = $this->readMandatoryOption($className, $dimensions, $mandatoryConfig[$key]); continue; } - $options[$mandatoryOption] = $this->command->ask( + $config[$mandatoryOption] = $this->command->ask( \sprintf( '%s: Please enter the following mandatory value for [%s]', $className, @@ -182,7 +182,7 @@ protected function readMandatoryOption(string $className, array $dimensions, arr ); } - return $options; + return $config; } }; } diff --git a/src/Viserio/Component/Config/Command/ConfigReader.php b/src/Viserio/Component/Config/Command/ConfigReader.php index 3d41cb440..5e55136ca 100644 --- a/src/Viserio/Component/Config/Command/ConfigReader.php +++ b/src/Viserio/Component/Config/Command/ConfigReader.php @@ -32,7 +32,7 @@ public function readConfig(ReflectionClass $reflectionClass): array if (isset($interfaces[RequiresConfigContract::class])) { $dimensions = []; - $defaultOptions = []; + $defaultConfig = []; $key = null; $class = $reflectionClass->getName(); @@ -42,16 +42,16 @@ public function readConfig(ReflectionClass $reflectionClass): array } if (isset($interfaces[ProvidesDefaultConfigContract::class])) { - $defaultOptions = $class::getDefaultConfig(); + $defaultConfig = $class::getDefaultConfig(); } if (isset($interfaces[RequiresMandatoryConfigContract::class])) { $config = \array_merge_recursive( - $defaultOptions, + $defaultConfig, $this->readMandatoryOption($class, $dimensions, $class::getMandatoryConfig()) ); } else { - $config = $defaultOptions; + $config = $defaultConfig; } if (\count($dimensions) !== 0) { @@ -69,29 +69,29 @@ public function readConfig(ReflectionClass $reflectionClass): array } /** - * Read the mandatory options. + * Read the mandatory config. * * @param string $className * @param array $dimensions - * @param array $mandatoryOptions + * @param array $mandatoryConfig * * @return array */ - protected function readMandatoryOption(string $className, array $dimensions, array $mandatoryOptions): array + protected function readMandatoryOption(string $className, array $dimensions, array $mandatoryConfig): array { - $options = []; + $config = []; - foreach ($mandatoryOptions as $key => $mandatoryOption) { + foreach ($mandatoryConfig as $key => $mandatoryOption) { if (! \is_scalar($mandatoryOption)) { - $options[$key] = $this->readMandatoryOption($className, $dimensions, $mandatoryOptions[$key]); + $config[$key] = $this->readMandatoryOption($className, $dimensions, $mandatoryConfig[$key]); continue; } - $options[$mandatoryOption] = null; + $config[$mandatoryOption] = null; } - return $options; + return $config; } /** diff --git a/src/Viserio/Component/Config/Command/ConfigReaderCommand.php b/src/Viserio/Component/Config/Command/ConfigReaderCommand.php index e838b9091..51e205a55 100644 --- a/src/Viserio/Component/Config/Command/ConfigReaderCommand.php +++ b/src/Viserio/Component/Config/Command/ConfigReaderCommand.php @@ -35,7 +35,7 @@ class ConfigReaderCommand extends AbstractCommand /** * {@inheritdoc} */ - protected $description = 'Reads the provided configuration file and displays options for the provided class name.'; + protected $description = 'Reads the provided configuration file and displays config for the provided class name.'; /** * {@inheritdoc} diff --git a/src/Viserio/Component/Config/README.md b/src/Viserio/Component/Config/README.md index 870f80b1f..e4b200118 100644 --- a/src/Viserio/Component/Config/README.md +++ b/src/Viserio/Component/Config/README.md @@ -1,4 +1,4 @@ -
diff --git a/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigMandatoryContainedIdWithDeprecationKeyConfiguration.php b/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigMandatoryContainedIdWithDeprecationKeyConfiguration.php
index 6aa054d3f..732a18be9 100644
--- a/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigMandatoryContainedIdWithDeprecationKeyConfiguration.php
+++ b/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigMandatoryContainedIdWithDeprecationKeyConfiguration.php
@@ -13,12 +13,12 @@
namespace Viserio\Component\Config\Tests\Fixture;
-use Viserio\Contract\Config\DeprecatedConfig as DeprecatedOptionsContract;
+use Viserio\Contract\Config\DeprecatedConfig as DeprecatedConfigContract;
use Viserio\Contract\Config\ProvidesDefaultConfig as ProvidesDefaultConfigContract;
use Viserio\Contract\Config\RequiresComponentConfigId as RequiresComponentConfigIdContract;
use Viserio\Contract\Config\RequiresMandatoryConfig as RequiresMandatoryConfigContract;
-class ConnectionComponentDefaultConfigMandatoryContainedIdWithDeprecationKeyConfiguration implements DeprecatedOptionsContract, ProvidesDefaultConfigContract, RequiresComponentConfigIdContract, RequiresMandatoryConfigContract
+class ConnectionComponentDefaultConfigMandatoryContainedIdWithDeprecationKeyConfiguration implements DeprecatedConfigContract, ProvidesDefaultConfigContract, RequiresComponentConfigIdContract, RequiresMandatoryConfigContract
{
/**
* {@inheritdoc}.
diff --git a/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigWithDeprecationKeyAndEmptyMessageConfiguration.php b/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigWithDeprecationKeyAndEmptyMessageConfiguration.php
index 947caf117..4f6afbc18 100644
--- a/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigWithDeprecationKeyAndEmptyMessageConfiguration.php
+++ b/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigWithDeprecationKeyAndEmptyMessageConfiguration.php
@@ -13,11 +13,11 @@
namespace Viserio\Component\Config\Tests\Fixture;
-use Viserio\Contract\Config\DeprecatedConfig as DeprecatedOptionsContract;
+use Viserio\Contract\Config\DeprecatedConfig as DeprecatedConfigContract;
use Viserio\Contract\Config\ProvidesDefaultConfig as ProvidesDefaultConfigContract;
use Viserio\Contract\Config\RequiresComponentConfig as RequiresComponentConfigContract;
-class ConnectionComponentDefaultConfigWithDeprecationKeyAndEmptyMessageConfiguration implements DeprecatedOptionsContract, ProvidesDefaultConfigContract, RequiresComponentConfigContract
+class ConnectionComponentDefaultConfigWithDeprecationKeyAndEmptyMessageConfiguration implements DeprecatedConfigContract, ProvidesDefaultConfigContract, RequiresComponentConfigContract
{
/**
* {@inheritdoc}.
diff --git a/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigWithDeprecationKeyAndInvalidMessageConfiguration.php b/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigWithDeprecationKeyAndInvalidMessageConfiguration.php
index 57c515b37..3f23e8c37 100644
--- a/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigWithDeprecationKeyAndInvalidMessageConfiguration.php
+++ b/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigWithDeprecationKeyAndInvalidMessageConfiguration.php
@@ -13,11 +13,11 @@
namespace Viserio\Component\Config\Tests\Fixture;
-use Viserio\Contract\Config\DeprecatedConfig as DeprecatedOptionsContract;
+use Viserio\Contract\Config\DeprecatedConfig as DeprecatedConfigContract;
use Viserio\Contract\Config\ProvidesDefaultConfig as ProvidesDefaultConfigContract;
use Viserio\Contract\Config\RequiresComponentConfig as RequiresComponentConfigContract;
-class ConnectionComponentDefaultConfigWithDeprecationKeyAndInvalidMessageConfiguration implements DeprecatedOptionsContract, ProvidesDefaultConfigContract, RequiresComponentConfigContract
+class ConnectionComponentDefaultConfigWithDeprecationKeyAndInvalidMessageConfiguration implements DeprecatedConfigContract, ProvidesDefaultConfigContract, RequiresComponentConfigContract
{
/**
* {@inheritdoc}.
diff --git a/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigWithDeprecationKeyAndMessageConfiguration.php b/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigWithDeprecationKeyAndMessageConfiguration.php
index 4e7e96571..4fbb094d2 100644
--- a/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigWithDeprecationKeyAndMessageConfiguration.php
+++ b/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigWithDeprecationKeyAndMessageConfiguration.php
@@ -13,11 +13,11 @@
namespace Viserio\Component\Config\Tests\Fixture;
-use Viserio\Contract\Config\DeprecatedConfig as DeprecatedOptionsContract;
+use Viserio\Contract\Config\DeprecatedConfig as DeprecatedConfigContract;
use Viserio\Contract\Config\ProvidesDefaultConfig as ProvidesDefaultConfigContract;
use Viserio\Contract\Config\RequiresComponentConfig as RequiresComponentConfigContract;
-class ConnectionComponentDefaultConfigWithDeprecationKeyAndMessageConfiguration implements DeprecatedOptionsContract, ProvidesDefaultConfigContract, RequiresComponentConfigContract
+class ConnectionComponentDefaultConfigWithDeprecationKeyAndMessageConfiguration implements DeprecatedConfigContract, ProvidesDefaultConfigContract, RequiresComponentConfigContract
{
/**
* {@inheritdoc}.
diff --git a/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigWithDeprecationKeyConfiguration.php b/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigWithDeprecationKeyConfiguration.php
index a0ee532cb..34e29514b 100644
--- a/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigWithDeprecationKeyConfiguration.php
+++ b/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigWithDeprecationKeyConfiguration.php
@@ -13,11 +13,11 @@
namespace Viserio\Component\Config\Tests\Fixture;
-use Viserio\Contract\Config\DeprecatedConfig as DeprecatedOptionsContract;
+use Viserio\Contract\Config\DeprecatedConfig as DeprecatedConfigContract;
use Viserio\Contract\Config\ProvidesDefaultConfig as ProvidesDefaultConfigContract;
use Viserio\Contract\Config\RequiresComponentConfig as RequiresComponentConfigContract;
-class ConnectionComponentDefaultConfigWithDeprecationKeyConfiguration implements DeprecatedOptionsContract, ProvidesDefaultConfigContract, RequiresComponentConfigContract
+class ConnectionComponentDefaultConfigWithDeprecationKeyConfiguration implements DeprecatedConfigContract, ProvidesDefaultConfigContract, RequiresComponentConfigContract
{
/**
* {@inheritdoc}.
diff --git a/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultOptionsWithMandatoryConfigurationAndStringValidator.php b/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigWithMandatoryConfigurationAndStringValidator.php
similarity index 91%
rename from src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultOptionsWithMandatoryConfigurationAndStringValidator.php
rename to src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigWithMandatoryConfigurationAndStringValidator.php
index 6fd64776d..dfed11eed 100644
--- a/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultOptionsWithMandatoryConfigurationAndStringValidator.php
+++ b/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigWithMandatoryConfigurationAndStringValidator.php
@@ -18,7 +18,7 @@
use Viserio\Contract\Config\RequiresMandatoryConfig as RequiresMandatoryConfigContract;
use Viserio\Contract\Config\RequiresValidatedConfig as RequiresValidatedConfigContract;
-class ConnectionComponentDefaultOptionsWithMandatoryConfigurationAndStringValidator implements ProvidesDefaultConfigContract,
+class ConnectionComponentDefaultConfigWithMandatoryConfigurationAndStringValidator implements ProvidesDefaultConfigContract,
RequiresComponentConfigContract,
RequiresMandatoryConfigContract,
RequiresValidatedConfigContract
diff --git a/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigWithMultiDimensionalDeprecationKeyConfiguration.php b/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigWithMultiDimensionalDeprecationKeyConfiguration.php
index b2b275ec3..b436b667c 100644
--- a/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigWithMultiDimensionalDeprecationKeyConfiguration.php
+++ b/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentDefaultConfigWithMultiDimensionalDeprecationKeyConfiguration.php
@@ -13,11 +13,11 @@
namespace Viserio\Component\Config\Tests\Fixture;
-use Viserio\Contract\Config\DeprecatedConfig as DeprecatedOptionsContract;
+use Viserio\Contract\Config\DeprecatedConfig as DeprecatedConfigContract;
use Viserio\Contract\Config\ProvidesDefaultConfig as ProvidesDefaultConfigContract;
use Viserio\Contract\Config\RequiresComponentConfig as RequiresComponentConfigContract;
-class ConnectionComponentDefaultConfigWithMultiDimensionalDeprecationKeyConfiguration implements DeprecatedOptionsContract, ProvidesDefaultConfigContract, RequiresComponentConfigContract
+class ConnectionComponentDefaultConfigWithMultiDimensionalDeprecationKeyConfiguration implements DeprecatedConfigContract, ProvidesDefaultConfigContract, RequiresComponentConfigContract
{
/**
* {@inheritdoc}.
diff --git a/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentWithNotFoundDeprecationKeyConfiguration.php b/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentWithNotFoundDeprecationKeyConfiguration.php
index 9a94f967d..fd4942ab5 100644
--- a/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentWithNotFoundDeprecationKeyConfiguration.php
+++ b/src/Viserio/Component/Config/Tests/Fixture/ConnectionComponentWithNotFoundDeprecationKeyConfiguration.php
@@ -13,10 +13,10 @@
namespace Viserio\Component\Config\Tests\Fixture;
-use Viserio\Contract\Config\DeprecatedConfig as DeprecatedOptionsContract;
+use Viserio\Contract\Config\DeprecatedConfig as DeprecatedConfigContract;
use Viserio\Contract\Config\RequiresComponentConfig as RequiresComponentConfigContract;
-class ConnectionComponentWithNotFoundDeprecationKeyConfiguration implements DeprecatedOptionsContract, RequiresComponentConfigContract
+class ConnectionComponentWithNotFoundDeprecationKeyConfiguration implements DeprecatedConfigContract, RequiresComponentConfigContract
{
/**
* {@inheritdoc}.
diff --git a/src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultOptionsWithMandatoryConfigurationAndStringValidator.php b/src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultConfigWithMandatoryConfigurationAndStringValidator.php
similarity index 91%
rename from src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultOptionsWithMandatoryConfigurationAndStringValidator.php
rename to src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultConfigWithMandatoryConfigurationAndStringValidator.php
index ff5d1c466..daca78b72 100644
--- a/src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultOptionsWithMandatoryConfigurationAndStringValidator.php
+++ b/src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultConfigWithMandatoryConfigurationAndStringValidator.php
@@ -18,7 +18,7 @@
use Viserio\Contract\Config\RequiresMandatoryConfig as RequiresMandatoryConfigContract;
use Viserio\Contract\Config\RequiresValidatedConfig as RequiresValidatedConfigContract;
-class ConnectionDefaultOptionsWithMandatoryConfigurationAndStringValidator implements ProvidesDefaultConfigContract,
+class ConnectionDefaultConfigWithMandatoryConfigurationAndStringValidator implements ProvidesDefaultConfigContract,
RequiresConfigContract,
RequiresMandatoryConfigContract,
RequiresValidatedConfigContract
diff --git a/src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultOptionsWithMandatoryConfigurationAndTwoLevelArrayAndTwoValidator.php b/src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultConfigWithMandatoryConfigurationAndTwoLevelArrayAndTwoValidator.php
similarity index 93%
rename from src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultOptionsWithMandatoryConfigurationAndTwoLevelArrayAndTwoValidator.php
rename to src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultConfigWithMandatoryConfigurationAndTwoLevelArrayAndTwoValidator.php
index 9200e677b..ab16e9e25 100644
--- a/src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultOptionsWithMandatoryConfigurationAndTwoLevelArrayAndTwoValidator.php
+++ b/src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultConfigWithMandatoryConfigurationAndTwoLevelArrayAndTwoValidator.php
@@ -19,7 +19,7 @@
use Viserio\Contract\Config\RequiresMandatoryConfig as RequiresMandatoryConfigContract;
use Viserio\Contract\Config\RequiresValidatedConfig as RequiresValidatedConfigContract;
-class ConnectionDefaultOptionsWithMandatoryConfigurationAndTwoLevelArrayAndTwoValidator implements ProvidesDefaultConfigContract,
+class ConnectionDefaultConfigWithMandatoryConfigurationAndTwoLevelArrayAndTwoValidator implements ProvidesDefaultConfigContract,
RequiresConfigContract,
RequiresMandatoryConfigContract,
RequiresValidatedConfigContract
diff --git a/src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultOptionsWithMandatoryConfigurationAndTwoLevelArrayValidator.php b/src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultConfigWithMandatoryConfigurationAndTwoLevelArrayValidator.php
similarity index 92%
rename from src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultOptionsWithMandatoryConfigurationAndTwoLevelArrayValidator.php
rename to src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultConfigWithMandatoryConfigurationAndTwoLevelArrayValidator.php
index c483647b7..c02941e2e 100644
--- a/src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultOptionsWithMandatoryConfigurationAndTwoLevelArrayValidator.php
+++ b/src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultConfigWithMandatoryConfigurationAndTwoLevelArrayValidator.php
@@ -19,7 +19,7 @@
use Viserio\Contract\Config\RequiresMandatoryConfig as RequiresMandatoryConfigContract;
use Viserio\Contract\Config\RequiresValidatedConfig as RequiresValidatedConfigContract;
-class ConnectionDefaultOptionsWithMandatoryConfigurationAndTwoLevelArrayValidator implements ProvidesDefaultConfigContract,
+class ConnectionDefaultConfigWithMandatoryConfigurationAndTwoLevelArrayValidator implements ProvidesDefaultConfigContract,
RequiresConfigContract,
RequiresMandatoryConfigContract,
RequiresValidatedConfigContract
diff --git a/src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultOptionsWithMandatoryConfigurationAndTwoValidator.php b/src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultConfigWithMandatoryConfigurationAndTwoValidator.php
similarity index 93%
rename from src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultOptionsWithMandatoryConfigurationAndTwoValidator.php
rename to src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultConfigWithMandatoryConfigurationAndTwoValidator.php
index 012c09821..854c8e05f 100644
--- a/src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultOptionsWithMandatoryConfigurationAndTwoValidator.php
+++ b/src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultConfigWithMandatoryConfigurationAndTwoValidator.php
@@ -19,7 +19,7 @@
use Viserio\Contract\Config\RequiresMandatoryConfig as RequiresMandatoryConfigContract;
use Viserio\Contract\Config\RequiresValidatedConfig as RequiresValidatedConfigContract;
-class ConnectionDefaultOptionsWithMandatoryConfigurationAndTwoValidator implements ProvidesDefaultConfigContract,
+class ConnectionDefaultConfigWithMandatoryConfigurationAndTwoValidator implements ProvidesDefaultConfigContract,
RequiresConfigContract,
RequiresMandatoryConfigContract,
RequiresValidatedConfigContract
diff --git a/src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultOptionsWithMandatoryConfigurationAndValidator.php b/src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultConfigWithMandatoryConfigurationAndValidator.php
similarity index 92%
rename from src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultOptionsWithMandatoryConfigurationAndValidator.php
rename to src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultConfigWithMandatoryConfigurationAndValidator.php
index 64f3914fe..f1746410f 100644
--- a/src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultOptionsWithMandatoryConfigurationAndValidator.php
+++ b/src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultConfigWithMandatoryConfigurationAndValidator.php
@@ -19,7 +19,7 @@
use Viserio\Contract\Config\RequiresMandatoryConfig as RequiresMandatoryConfigContract;
use Viserio\Contract\Config\RequiresValidatedConfig as RequiresValidatedConfigContract;
-class ConnectionDefaultOptionsWithMandatoryConfigurationAndValidator implements ProvidesDefaultConfigContract,
+class ConnectionDefaultConfigWithMandatoryConfigurationAndValidator implements ProvidesDefaultConfigContract,
RequiresConfigContract,
RequiresMandatoryConfigContract,
RequiresValidatedConfigContract
diff --git a/src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultOptionsWithMandatoryNullValueConfigurationAndStringValidator.php b/src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultConfigWithMandatoryNullValueConfigurationAndStringValidator.php
similarity index 87%
rename from src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultOptionsWithMandatoryNullValueConfigurationAndStringValidator.php
rename to src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultConfigWithMandatoryNullValueConfigurationAndStringValidator.php
index 532fcef47..79c40f133 100644
--- a/src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultOptionsWithMandatoryNullValueConfigurationAndStringValidator.php
+++ b/src/Viserio/Component/Config/Tests/Fixture/ConnectionDefaultConfigWithMandatoryNullValueConfigurationAndStringValidator.php
@@ -17,7 +17,7 @@
use Viserio\Contract\Config\RequiresMandatoryConfig as RequiresMandatoryConfigContract;
use Viserio\Contract\Config\RequiresValidatedConfig as RequiresValidatedConfigContract;
-class ConnectionDefaultOptionsWithMandatoryNullValueConfigurationAndStringValidator implements RequiresConfigContract,
+class ConnectionDefaultConfigWithMandatoryNullValueConfigurationAndStringValidator implements RequiresConfigContract,
RequiresMandatoryConfigContract,
RequiresValidatedConfigContract
{
diff --git a/src/Viserio/Component/Config/Tests/Fixture/UniversalContainerIdComponentConfiguration.php b/src/Viserio/Component/Config/Tests/Fixture/UniversalContainerIdComponentConfiguration.php
index 36540f29f..17c3e7fe9 100644
--- a/src/Viserio/Component/Config/Tests/Fixture/UniversalContainerIdComponentConfiguration.php
+++ b/src/Viserio/Component/Config/Tests/Fixture/UniversalContainerIdComponentConfiguration.php
@@ -26,13 +26,13 @@ class UniversalContainerIdComponentConfiguration implements ProvidesDefaultConfi
];
/** @var array */
- private static $getMandatoryOptions = [
+ private static $getMandatoryConfig = [
'params' => ['user', 'dbname'],
'driverClass',
];
/** @var array */
- private static $getDefaultOptions = [
+ private static $getDefaultConfig = [
'params' => [
'host' => 'awesomehost',
'port' => '4444',
@@ -46,12 +46,12 @@ public static function getDimensions(): iterable
public static function getMandatoryConfig(): iterable
{
- return self::getData('getMandatoryOptions');
+ return self::getData('getMandatoryConfig');
}
public static function getDefaultConfig(): iterable
{
- return self::getData('getDefaultOptions');
+ return self::getData('getDefaultConfig');
}
private static function getData($name)
diff --git a/src/Viserio/Component/Config/Tests/Unit/Command/ConfigReaderCommandTest.php b/src/Viserio/Component/Config/Tests/Unit/Command/ConfigReaderCommandTest.php
index 2b7dc4d62..3b187cada 100644
--- a/src/Viserio/Component/Config/Tests/Unit/Command/ConfigReaderCommandTest.php
+++ b/src/Viserio/Component/Config/Tests/Unit/Command/ConfigReaderCommandTest.php
@@ -19,7 +19,7 @@
use Viserio\Component\Config\Tests\Fixture\ConnectionComponentDefaultConfigConfiguration;
use Viserio\Component\Config\Tests\Fixture\ConnectionComponentDefaultConfigMandatoryContainedIdConfiguration;
use Viserio\Component\Config\Tests\Fixture\ConnectionDefaultConfigConfiguration;
-use Viserio\Component\Config\Tests\Fixture\ConnectionDefaultOptionsWithMandatoryConfigurationAndTwoLevelArrayValidator;
+use Viserio\Component\Config\Tests\Fixture\ConnectionDefaultConfigWithMandatoryConfigurationAndTwoLevelArrayValidator;
use Viserio\Component\Console\Tester\CommandTestCase;
/**
@@ -101,7 +101,7 @@ public static function provideReadCases(): iterable
[],
],
[
- ConnectionDefaultOptionsWithMandatoryConfigurationAndTwoLevelArrayValidator::class,
+ ConnectionDefaultConfigWithMandatoryConfigurationAndTwoLevelArrayValidator::class,
[
'params' => [
'host' => 'awesomehost',
diff --git a/src/Viserio/Component/Config/Tests/Unit/Traits/ConfigurationMandatoryIteratorTestTrait.php b/src/Viserio/Component/Config/Tests/Unit/Traits/ConfigurationMandatoryIteratorTestTrait.php
index f78c14c4a..686fab539 100644
--- a/src/Viserio/Component/Config/Tests/Unit/Traits/ConfigurationMandatoryIteratorTestTrait.php
+++ b/src/Viserio/Component/Config/Tests/Unit/Traits/ConfigurationMandatoryIteratorTestTrait.php
@@ -168,7 +168,7 @@ public function testMandatoryConfigResolvingShouldSupportMoreThanOneMandatoryCon
*/
public function testMandatoryConfigResolvingShouldReturnDataWithProvidedDefaultConfigPart1($config): void
{
- $defaultOptions = ConnectionComponentDefaultConfigMandatoryContainedIdConfiguration::getDefaultConfig();
+ $defaultConfig = ConnectionComponentDefaultConfigMandatoryContainedIdConfiguration::getDefaultConfig();
unset($config['doctrine']['connection']['orm_default']['params']['host'], $config['doctrine']['connection']['orm_default']['params']['port']);
@@ -182,8 +182,8 @@ public function testMandatoryConfigResolvingShouldReturnDataWithProvidedDefaultC
self::assertCount(2, $array);
self::assertArrayHasKey('params', $array);
- self::assertSame($array['params']['host'], $defaultOptions['params']['host']);
- self::assertSame($array['params']['port'], $defaultOptions['params']['port']);
+ self::assertSame($array['params']['host'], $defaultConfig['params']['host']);
+ self::assertSame($array['params']['port'], $defaultConfig['params']['port']);
self::assertSame(
$array['params']['user'],
$config['doctrine']['connection']['orm_default']['params']['user']
@@ -197,7 +197,7 @@ public function testMandatoryConfigResolvingShouldReturnDataWithProvidedDefaultC
*/
public function testMandatoryConfigResolvingShouldReturnDataWithProvidedDefaultConfigPart2($config): void
{
- $defaultOptions = ConnectionComponentDefaultConfigMandatoryContainedIdConfiguration::getDefaultConfig();
+ $defaultConfig = ConnectionComponentDefaultConfigMandatoryContainedIdConfiguration::getDefaultConfig();
// remove main index key
unset($config['doctrine']['connection']['orm_default']['params']);
@@ -212,8 +212,8 @@ public function testMandatoryConfigResolvingShouldReturnDataWithProvidedDefaultC
self::assertCount(2, $array);
self::assertArrayHasKey('params', $array);
- self::assertSame($array['params']['host'], $defaultOptions['params']['host']);
- self::assertSame($array['params']['port'], $defaultOptions['params']['port']);
+ self::assertSame($array['params']['host'], $defaultConfig['params']['host']);
+ self::assertSame($array['params']['port'], $defaultConfig['params']['port']);
}
/**
diff --git a/src/Viserio/Component/Config/Tests/Unit/Traits/ConfigurationValidatorIteratorTestTrait.php b/src/Viserio/Component/Config/Tests/Unit/Traits/ConfigurationValidatorIteratorTestTrait.php
index 7ba74cb81..fea14652b 100644
--- a/src/Viserio/Component/Config/Tests/Unit/Traits/ConfigurationValidatorIteratorTestTrait.php
+++ b/src/Viserio/Component/Config/Tests/Unit/Traits/ConfigurationValidatorIteratorTestTrait.php
@@ -17,13 +17,13 @@
use Exception;
use IteratorIterator;
use RuntimeException;
-use Viserio\Component\Config\Tests\Fixture\ConnectionComponentDefaultOptionsWithMandatoryConfigurationAndStringValidator;
-use Viserio\Component\Config\Tests\Fixture\ConnectionDefaultOptionsWithMandatoryConfigurationAndStringValidator;
-use Viserio\Component\Config\Tests\Fixture\ConnectionDefaultOptionsWithMandatoryConfigurationAndTwoLevelArrayAndTwoValidator;
-use Viserio\Component\Config\Tests\Fixture\ConnectionDefaultOptionsWithMandatoryConfigurationAndTwoLevelArrayValidator;
-use Viserio\Component\Config\Tests\Fixture\ConnectionDefaultOptionsWithMandatoryConfigurationAndTwoValidator;
-use Viserio\Component\Config\Tests\Fixture\ConnectionDefaultOptionsWithMandatoryConfigurationAndValidator;
-use Viserio\Component\Config\Tests\Fixture\ConnectionDefaultOptionsWithMandatoryNullValueConfigurationAndStringValidator;
+use Viserio\Component\Config\Tests\Fixture\ConnectionComponentDefaultConfigWithMandatoryConfigurationAndStringValidator;
+use Viserio\Component\Config\Tests\Fixture\ConnectionDefaultConfigWithMandatoryConfigurationAndStringValidator;
+use Viserio\Component\Config\Tests\Fixture\ConnectionDefaultConfigWithMandatoryConfigurationAndTwoLevelArrayAndTwoValidator;
+use Viserio\Component\Config\Tests\Fixture\ConnectionDefaultConfigWithMandatoryConfigurationAndTwoLevelArrayValidator;
+use Viserio\Component\Config\Tests\Fixture\ConnectionDefaultConfigWithMandatoryConfigurationAndTwoValidator;
+use Viserio\Component\Config\Tests\Fixture\ConnectionDefaultConfigWithMandatoryConfigurationAndValidator;
+use Viserio\Component\Config\Tests\Fixture\ConnectionDefaultConfigWithMandatoryNullValueConfigurationAndStringValidator;
use Viserio\Component\Config\Tests\Fixture\DontValidatedDefaultConfigurationFixture;
use Viserio\Component\Config\Tests\Fixture\InvalidValidatedComponentConfigurationFixture;
use Viserio\Component\Config\Tests\Fixture\ValidatedComponentConfigurationFixture;
@@ -64,7 +64,7 @@ public function testValidatorResolvingShouldCallGivenValidator(): void
$this->expectExceptionMessage('need to be a string');
$this->getConfigurationIterator(
- ConnectionDefaultOptionsWithMandatoryConfigurationAndValidator::class,
+ ConnectionDefaultConfigWithMandatoryConfigurationAndValidator::class,
new ArrayIterator(['driverClass' => 1])
);
}
@@ -75,7 +75,7 @@ public function testValidatorResolvingShouldSupportMoreThanOneValidator(): void
$this->expectExceptionMessage('need to be a string');
$this->getConfigurationIterator(
- ConnectionDefaultOptionsWithMandatoryConfigurationAndTwoValidator::class,
+ ConnectionDefaultConfigWithMandatoryConfigurationAndTwoValidator::class,
new ArrayIterator(['driverClass' => 'foo', 'test1' => 9000])
);
}
@@ -86,7 +86,7 @@ public function testValidatorResolvingShouldSupportNestedArrayValidating(): void
$this->expectExceptionMessage('need to be a string');
$this->getConfigurationIterator(
- ConnectionDefaultOptionsWithMandatoryConfigurationAndTwoLevelArrayValidator::class,
+ ConnectionDefaultConfigWithMandatoryConfigurationAndTwoLevelArrayValidator::class,
new ArrayIterator(['driverClass' => ['connection' => 1]])
);
}
@@ -97,7 +97,7 @@ public function testValidatorResolvingShouldSupportNestedArrayValidatingWithMore
$this->expectExceptionMessage('need to be a string');
$this->getConfigurationIterator(
- ConnectionDefaultOptionsWithMandatoryConfigurationAndTwoLevelArrayAndTwoValidator::class,
+ ConnectionDefaultConfigWithMandatoryConfigurationAndTwoLevelArrayAndTwoValidator::class,
new ArrayIterator([
'driverClass' => [
'connection' => 'foo',
@@ -112,10 +112,10 @@ public function testValidatorResolvingShouldSupportNestedArrayValidatingWithMore
public function testValidatorResolvingShouldCallDefaultStringValidator(): void
{
$this->expectException(InvalidArgumentException::class);
- $this->expectExceptionMessage('Invalid configuration value provided for [driverClass]; Expected [string], but got [integer], in [' . ConnectionDefaultOptionsWithMandatoryConfigurationAndStringValidator::class . '].');
+ $this->expectExceptionMessage('Invalid configuration value provided for [driverClass]; Expected [string], but got [integer], in [' . ConnectionDefaultConfigWithMandatoryConfigurationAndStringValidator::class . '].');
$this->getConfigurationIterator(
- ConnectionDefaultOptionsWithMandatoryConfigurationAndStringValidator::class,
+ ConnectionDefaultConfigWithMandatoryConfigurationAndStringValidator::class,
new ArrayIterator(['driverClass' => 1])
);
}
@@ -140,10 +140,10 @@ public function testValidatorResolvingShouldSkipValidationOnDefaultConfiguration
public function testValidatorResolvingShouldCallStringValidatorWithSupportedDefaultConfigurationAndMandatoryConfiguration(): void
{
$this->expectException(InvalidArgumentException::class);
- $this->expectExceptionMessage('Invalid configuration value provided for [driverClass]; Expected [string], but got [integer], in [Viserio\Component\Config\Tests\Fixture\ConnectionComponentDefaultOptionsWithMandatoryConfigurationAndStringValidator].');
+ $this->expectExceptionMessage('Invalid configuration value provided for [driverClass]; Expected [string], but got [integer], in [Viserio\Component\Config\Tests\Fixture\ConnectionComponentDefaultConfigWithMandatoryConfigurationAndStringValidator].');
$this->getConfigurationIterator(
- ConnectionComponentDefaultOptionsWithMandatoryConfigurationAndStringValidator::class,
+ ConnectionComponentDefaultConfigWithMandatoryConfigurationAndStringValidator::class,
new ArrayIterator([
'vendor' => [
'package' => [
@@ -289,10 +289,10 @@ public function testValidatorResolvingShouldThrowValidationExceptionOnOverwritte
public function testValidatorResolvingShouldThrowExceptionOnNullValueIfStringIsRequired(): void
{
$this->expectException(Exception::class);
- $this->expectExceptionMessage('Invalid configuration value provided for [driverClass]; Expected [string], but got [NULL], in [Viserio\Component\Config\Tests\Fixture\ConnectionDefaultOptionsWithMandatoryNullValueConfigurationAndStringValidator].');
+ $this->expectExceptionMessage('Invalid configuration value provided for [driverClass]; Expected [string], but got [NULL], in [Viserio\Component\Config\Tests\Fixture\ConnectionDefaultConfigWithMandatoryNullValueConfigurationAndStringValidator].');
$this->getConfigurationIterator(
- ConnectionDefaultOptionsWithMandatoryNullValueConfigurationAndStringValidator::class,
+ ConnectionDefaultConfigWithMandatoryNullValueConfigurationAndStringValidator::class,
new ArrayIterator([
'driverClass' => null,
])
diff --git a/src/Viserio/Component/Config/composer.json b/src/Viserio/Component/Config/composer.json
index 7e330af6d..513dd8cb8 100644
--- a/src/Viserio/Component/Config/composer.json
+++ b/src/Viserio/Component/Config/composer.json
@@ -1,12 +1,11 @@
{
"name": "viserio/config",
"type": "library",
- "description": "The Viserio Options Resolver package.",
+ "description": "The Viserio Config package.",
"keywords": [
"narrowspark",
"viserio",
- "options",
- "option",
+ "config",
"component",
"resolver",
"configuration"
diff --git a/src/Viserio/Component/Parser/Parser/IniParser.php b/src/Viserio/Component/Parser/Parser/IniParser.php
index 2a52c285a..9ee95100c 100644
--- a/src/Viserio/Component/Parser/Parser/IniParser.php
+++ b/src/Viserio/Component/Parser/Parser/IniParser.php
@@ -36,34 +36,6 @@ class IniParser implements ParserContract
*/
private $nestSeparator = '.';
- /**
- * Get nest separator.
- *
- * @return string
- */
- public function getNestSeparator(): string
- {
- return $this->nestSeparator;
- }
-
- /**
- * Set nest separator.
- *
- * @param string $separator
- *
- * @return self
- */
- public function setNestSeparator(string $separator): self
- {
- if ($separator === '') {
- throw new InvalidArgumentException('A empty string cant be set as a separator.');
- }
-
- $this->nestSeparator = $separator;
-
- return $this;
- }
-
/**
* Get if sections should be processed
* When sections are not processed,section names are stripped and section
@@ -96,6 +68,34 @@ public function setProcessSections(bool $processSections): self
return $this;
}
+ /**
+ * Get nest separator.
+ *
+ * @return string
+ */
+ public function getNestSeparator(): string
+ {
+ return $this->nestSeparator;
+ }
+
+ /**
+ * Set nest separator.
+ *
+ * @param string $separator
+ *
+ * @return self
+ */
+ public function setNestSeparator(string $separator): self
+ {
+ if ($separator === '') {
+ throw new InvalidArgumentException('A empty string cant be set as a separator.');
+ }
+
+ $this->nestSeparator = $separator;
+
+ return $this;
+ }
+
/**
* {@inheritdoc}
*/