Skip to content

Commit

Permalink
Use yiisoft/config
Browse files Browse the repository at this point in the history
  • Loading branch information
Mister-42 committed Mar 5, 2021
1 parent 8bba669 commit 283cf7f
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 32 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1,3 +1,4 @@
/config/packages/
/nbproject/
/vendor/
/composer.lock
12 changes: 3 additions & 9 deletions composer.json
Expand Up @@ -42,9 +42,8 @@
"phpunit/phpunit": "^9.0",
"squizlabs/php_codesniffer": "^3.5",
"vimeo/psalm": "^4.1",
"yiisoft/composer-config-plugin": "^1.0",
"yiisoft/di": "^3.0",
"yiisoft/log": "^1.0"
"yiisoft/config": "^1.0",
"yiisoft/di": "^3.0"
},
"autoload": {
"psr-4": {
Expand Down Expand Up @@ -81,13 +80,8 @@
},
"config-plugin": {
"params": "config/params.php",
"common": "config/common.php",
"web": "config/web.php"
},
"config-plugin-dev": {
"web": [
"config/test.php",
"$web"
]
}
},
"config": {
Expand Down
20 changes: 20 additions & 0 deletions config/common.php
@@ -0,0 +1,20 @@
<?php

declare(strict_types=1);

use YiiRocks\SvgInline\FontAwesome\SvgInlineFontAwesome;
use YiiRocks\SvgInline\FontAwesome\SvgInlineFontAwesomeInterface;

/* @var array $params */

return [
SvgInlineFontAwesomeInterface::class => [
'__class' => SvgInlineFontAwesome::class,
'setFallbackIcon()' => [$params['yiirocks/svg-inline-fontawesome']['fallbackIcon']],
'setFill()' => [$params['yiirocks/svg-inline-fontawesome']['fill']],
'setFixedWidth()' => [$params['yiirocks/svg-inline-fontawesome']['fixedWidth']],
'setFontAwesomeIconsFolder()' => [$params['yiirocks/svg-inline-fontawesome']['fontAwesomeFolder']],
'setPrefix()' => [$params['yiirocks/svg-inline-fontawesome']['prefix']],
'setStyle()' => [$params['yiirocks/svg-inline-fontawesome']['style']],
],
];
12 changes: 0 additions & 12 deletions config/test.php

This file was deleted.

7 changes: 0 additions & 7 deletions config/web.php
Expand Up @@ -9,15 +9,8 @@

return [
SvgInlineFontAwesomeInterface::class => [
'__class' => SvgInlineFontAwesome::class,
'__construct()' => [
'registerAssets' => $params['yiirocks/svg-inline-fontawesome']['registerAssets'],
],
'setFallbackIcon()' => [$params['yiirocks/svg-inline-fontawesome']['fallbackIcon']],
'setFill()' => [$params['yiirocks/svg-inline-fontawesome']['fill']],
'setFixedWidth()' => [$params['yiirocks/svg-inline-fontawesome']['fixedWidth']],
'setFontAwesomeIconsFolder()' => [$params['yiirocks/svg-inline-fontawesome']['fontAwesomeFolder']],
'setPrefix()' => [$params['yiirocks/svg-inline-fontawesome']['prefix']],
'setStyle()' => [$params['yiirocks/svg-inline-fontawesome']['style']],
],
];
2 changes: 1 addition & 1 deletion src/SvgInlineFontAwesome.php
Expand Up @@ -41,7 +41,7 @@ public function __construct(
Aliases $aliases,
AssetManager $assetManager,
ContainerInterface $container,
bool $registerAssets
bool $registerAssets = false
) {
parent::__construct($aliases, $container);

Expand Down
6 changes: 3 additions & 3 deletions tests/TestCase.php
Expand Up @@ -7,7 +7,7 @@
use Psr\Container\ContainerInterface;
use YiiRocks\SvgInline\SvgInlineInterface;
use Yiisoft\Aliases\Aliases;
use Yiisoft\Composer\Config\Builder;
use Yiisoft\Config\Config;
use Yiisoft\Di\Container;
use Yiisoft\Files\FileHelper;

Expand All @@ -31,8 +31,8 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
protected function setUp(): void
{
parent::setUp();
$config = require Builder::path('web');
$this->container = new Container($config);
$config = new Config(dirname(__DIR__), '/config/packages');
$this->container = new Container($config->get('common'));
$this->aliases = $this->container->get(Aliases::class);
$this->aliases->set('@root', dirname(__DIR__, 1));
$this->aliases->set('@assets', '@root/tests/assets');
Expand Down

0 comments on commit 283cf7f

Please sign in to comment.