Skip to content

Commit

Permalink
Revert "Adapt configuration group names to Yii conventions (#552)" (#553
Browse files Browse the repository at this point in the history
)

This reverts commit 26fde74.
  • Loading branch information
arogachev authored Feb 11, 2023
1 parent 26fde74 commit 4ba8b0d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"source-directory": "config"
},
"config-plugin": {
"di": "di.php",
"common": "common.php",
"params": "params.php"
}
},
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions tests/BaseConfigTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ abstract class BaseConfigTest extends TestCase
{
final protected function createContainer(array|null $params = null): Container
{
$config = ContainerConfig::create()->withDefinitions($this->getContainerDefinitions($params));
$config = ContainerConfig::create()->withDefinitions($this->getCommonDefinitions($params));

return new Container($config);
}

final protected function getContainerDefinitions(array|null $params): array
final protected function getCommonDefinitions(array|null $params): array
{
if ($params === null) {
$params = $this->getParams();
}

return require dirname(__DIR__) . '/config/di.php';
return require dirname(__DIR__) . '/config/common.php';
}

final protected function getParams(): array
Expand Down

0 comments on commit 4ba8b0d

Please sign in to comment.