From 7be6b7d8d470adc06af29799cc022142df9fcaac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9?= Date: Mon, 15 Jan 2024 17:01:59 +0300 Subject: [PATCH 1/8] Move config to di instead of di-web --- .github/workflows/bc.yml | 2 +- .github/workflows/build.yml | 2 +- .github/workflows/composer-require-checker.yml | 2 +- .github/workflows/mutation.yml | 2 +- .github/workflows/static.yml | 2 +- config/{di-web.php => di.php} | 7 ++++++- config/params.php | 2 ++ tests/ConfigTest.php | 2 +- 8 files changed, 14 insertions(+), 7 deletions(-) rename config/{di-web.php => di.php} (89%) diff --git a/.github/workflows/bc.yml b/.github/workflows/bc.yml index ba3e9ef..35810e7 100644 --- a/.github/workflows/bc.yml +++ b/.github/workflows/bc.yml @@ -11,4 +11,4 @@ jobs: os: >- ['ubuntu-latest'] php: >- - ['8.0'] + ['8.1', '8.2', '8.3'] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8506ea1..719d5a9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,4 +28,4 @@ jobs: os: >- ['ubuntu-latest', 'windows-latest'] php: >- - ['8.0', '8.1'] + ['8.1', '8.2', '8.3'] diff --git a/.github/workflows/composer-require-checker.yml b/.github/workflows/composer-require-checker.yml index 6cb4099..2c99e34 100644 --- a/.github/workflows/composer-require-checker.yml +++ b/.github/workflows/composer-require-checker.yml @@ -30,4 +30,4 @@ jobs: os: >- ['ubuntu-latest'] php: >- - ['8.0'] + ['8.1', '8.2', '8.3'] diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml index c1aca98..075dfe5 100644 --- a/.github/workflows/mutation.yml +++ b/.github/workflows/mutation.yml @@ -26,6 +26,6 @@ jobs: os: >- ['ubuntu-latest'] php: >- - ['8.1'] + ['8.1', '8.2', '8.3'] secrets: STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }} diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index fb7fc77..abebcd1 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -28,4 +28,4 @@ jobs: os: >- ['ubuntu-latest'] php: >- - ['8.0', '8.1', '8.2'] + ['8.1', '8.2', '8.3'] diff --git a/config/di-web.php b/config/di.php similarity index 89% rename from config/di-web.php rename to config/di.php index e370ad4..8d5440b 100644 --- a/config/di-web.php +++ b/config/di.php @@ -57,9 +57,14 @@ $assetManager = $assetManager ->withConverter($container->get(AssetConverterInterface::class)) - ->withPublisher($container->get(AssetPublisherInterface::class)) ; + if ($params['yiisoft/assets']['assetManager']['publisher'] !== null) { + $assetManager = $assetManager->withPublisher( + $container->get($params['yiisoft/assets']['assetManager']['publisher']) + ); + }; + $assetManager->registerMany($params['yiisoft/assets']['assetManager']['register']); return $assetManager; }, diff --git a/config/params.php b/config/params.php index fed5ce8..d8b7c7d 100644 --- a/config/params.php +++ b/config/params.php @@ -3,6 +3,7 @@ declare(strict_types=1); use Yiisoft\Assets\AssetLoaderInterface; +use Yiisoft\Assets\AssetPublisherInterface; use Yiisoft\Assets\Debug\AssetCollector; use Yiisoft\Assets\Debug\AssetLoaderInterfaceProxy; @@ -28,6 +29,7 @@ 'allowedBundleNames' => [], 'customizedBundles' => [], 'register' => [], + 'publisher' => AssetPublisherInterface::class, ], ], diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php index c547c6d..e225420 100644 --- a/tests/ConfigTest.php +++ b/tests/ConfigTest.php @@ -50,7 +50,7 @@ private function getDiConfig(?array $params = null): array if ($params === null) { $params = $this->getParams(); } - return require dirname(__DIR__) . '/config/di-web.php'; + return require dirname(__DIR__) . '/config/di.php'; } private function getParams(): array From e7c18c2b91fad43f2b06db213c49fd8ead38fc5e Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Sat, 20 Jan 2024 13:48:07 +0300 Subject: [PATCH 2/8] Update .github/workflows/bc.yml --- .github/workflows/bc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bc.yml b/.github/workflows/bc.yml index 35810e7..ba3e9ef 100644 --- a/.github/workflows/bc.yml +++ b/.github/workflows/bc.yml @@ -11,4 +11,4 @@ jobs: os: >- ['ubuntu-latest'] php: >- - ['8.1', '8.2', '8.3'] + ['8.0'] From 012b8fa4fcbfb27a88f83ad3eb0daf3ddf4ab577 Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Sat, 20 Jan 2024 13:48:12 +0300 Subject: [PATCH 3/8] Update .github/workflows/build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 719d5a9..8708e8a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,4 +28,4 @@ jobs: os: >- ['ubuntu-latest', 'windows-latest'] php: >- - ['8.1', '8.2', '8.3'] + ['8.0', '8.1', '8.2', '8.3'] From 04dc9096712d8d3d9ac20acfb2c08afd8d72d954 Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Sat, 20 Jan 2024 13:48:18 +0300 Subject: [PATCH 4/8] Update .github/workflows/composer-require-checker.yml --- .github/workflows/composer-require-checker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/composer-require-checker.yml b/.github/workflows/composer-require-checker.yml index 2c99e34..863e5fc 100644 --- a/.github/workflows/composer-require-checker.yml +++ b/.github/workflows/composer-require-checker.yml @@ -30,4 +30,4 @@ jobs: os: >- ['ubuntu-latest'] php: >- - ['8.1', '8.2', '8.3'] + ['8.0', '8.1', '8.2', '8.3'] From 45af9789ce6051f0dba8a18d3704e5ee88a4e4a0 Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Sat, 20 Jan 2024 13:48:23 +0300 Subject: [PATCH 5/8] Update .github/workflows/mutation.yml --- .github/workflows/mutation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml index 075dfe5..842c6ae 100644 --- a/.github/workflows/mutation.yml +++ b/.github/workflows/mutation.yml @@ -26,6 +26,6 @@ jobs: os: >- ['ubuntu-latest'] php: >- - ['8.1', '8.2', '8.3'] + ['8.3'] secrets: STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }} From 1a02828164b1d2fd4e645603455189d0f4722b78 Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Sat, 20 Jan 2024 13:48:29 +0300 Subject: [PATCH 6/8] Update .github/workflows/static.yml --- .github/workflows/static.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index abebcd1..b7d3200 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -28,4 +28,4 @@ jobs: os: >- ['ubuntu-latest'] php: >- - ['8.1', '8.2', '8.3'] + ['8.0', '8.1', '8.2', '8.3'] From 523ee0c2a48991645671a5bbedbc9943bb129444 Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Sat, 20 Jan 2024 14:01:37 +0300 Subject: [PATCH 7/8] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 05ae3d7..9564e80 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "vimeo/psalm": "^4.30|^5.8", "yiisoft/di": "^1.2", "yiisoft/test-support": "^3.0", - "yiisoft/yii-debug": "dev-master" + "yiisoft/yii-debug": "dev-master|dev-php80" }, "autoload": { "psr-4": { From e64dcf77ee5273e1affdfc6653522828ed811b59 Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Mon, 22 Jan 2024 13:50:40 +0300 Subject: [PATCH 8/8] fix --- CHANGELOG.md | 4 ++-- composer.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6bc7282..5850f9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ # Yii Assets Change Log -## 4.1.0 under development +## 5.0.0 under development -- Bug #132: `AssetManager` doesn't work in `CLI` mode (@Gerych1984) +- Chg #132: Move `di-web` configuration to `di` and allow to set publisher via parameters (@Gerych1984) - Bug #123: `AssetManager` load empty `AssetBundle` when register wrong namespace bundle (@terabytesoftw) - Enh #119, #129: Add debug collector for `yiisoft/yii-debug` (@xepozz, @vjik) diff --git a/composer.json b/composer.json index baa7f72..687d769 100644 --- a/composer.json +++ b/composer.json @@ -52,7 +52,7 @@ }, "config-plugin": { "params": "params.php", - "di-web": "di-web.php" + "di": "di.php" } }, "config": {