Simplify code. (#10)

yii3-extensions · Jan 19, 2024 · 0bb6571 · 0bb6571
1 parent 77983de
commit 0bb6571
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 26 deletions.
diff --git a/src/BootstrapAsset.php b/src/BootstrapAsset.php
@@ -7,7 +7,7 @@
 use Yiisoft\Assets\AssetBundle;
 use Yiisoft\Files\PathMatcher\PathMatcher;
 
-use function array_merge;
+use function defined;
 
 /**
  * Twitter Bootstrap 5 CSS bundle.
@@ -20,13 +20,12 @@ final class BootstrapAsset extends AssetBundle
 
     public function __construct()
     {
-        $filesPattern = YII_ENV === 'prod' ? ['**/css/bootstrap.min.css'] : ['**/css/bootstrap.css'];
-        $filesMap = YII_ENV === 'prod' ? ['**/css/bootstrap.min.css.map'] : ['**/css/bootstrap.css.map'];
-        $files = array_merge($filesPattern, $filesMap);
-
         $pathMatcher = new PathMatcher();
 
-        $this->css = [YII_ENV === 'prod' ? 'bootstrap.min.css' : 'bootstrap.css'];
-        $this->publishOptions = ['filter' => $pathMatcher->only(...$files)];
+        $environment = defined('YII_ENV') ? YII_ENV : 'prod';
+        $cssFiles = $environment === 'prod' ? 'bootstrap.min.css' : 'bootstrap.css';
+
+        $this->css = [$cssFiles];
+        $this->publishOptions = ['filter' => $pathMatcher->only("**/css/{$cssFiles}", "**/css/{$cssFiles}.map")];
     }
 }
diff --git a/src/BootstrapPluginAsset.php b/src/BootstrapPluginAsset.php
@@ -7,7 +7,7 @@
 use Yiisoft\Assets\AssetBundle;
 use Yiisoft\Files\PathMatcher\PathMatcher;
 
-use function array_merge;
+use function defined;
 
 /**
  * Twitter Bootstrap 5 JavaScript bundle.
@@ -21,13 +21,12 @@ final class BootstrapPluginAsset extends AssetBundle
 
     public function __construct()
     {
-        $filesPattern = YII_ENV === 'prod' ? ['**/js/bootstrap.bundle.min.js'] : ['**/js/bootstrap.bundle.js'];
-        $filesMap = YII_ENV === 'prod' ? ['**/js/bootstrap.bundle.min.js.map'] : ['**/js/bootstrap.bundle.js.map'];
-        $files = array_merge($filesPattern, $filesMap);
-
         $pathMatcher = new PathMatcher();
 
-        $this->js = [YII_ENV === 'prod' ? 'bootstrap.bundle.min.js' : 'bootstrap.bundle.js'];
-        $this->publishOptions = ['filter' => $pathMatcher->only(...$files)];
+        $environment = defined('YII_ENV') ? YII_ENV : 'prod';
+        $jsFiles = $environment === 'prod' ? 'bootstrap.bundle.min.js' : 'bootstrap.bundle.js';
+
+        $this->js = [$jsFiles];
+        $this->publishOptions = ['filter' => $pathMatcher->only("**/js/{$jsFiles}", "**/js/{$jsFiles}.map")];
     }
 }
diff --git a/tests/AssetTest.php b/tests/AssetTest.php
@@ -107,12 +107,6 @@ public function testBootstrapPluginCdnAssetRegister(): void
         );
     }
 
-    /**
-     * @depends testBootstrapAssetRegister
-     * @depends testBootstrapCdnAssetRegister
-     * @depends testBootstrapPluginAssetRegister
-     * @depends testBootstrapPluginCdnAssetRegister
-     */
     #[RequiresPhp('8.1')]
     public function testProdBootstrapAssetRegister(): void
     {
@@ -129,17 +123,15 @@ public function testProdBootstrapAssetRegister(): void
         );
         $this->assertFileExists(__DIR__ . '/Support/runtime/55145ba9/bootstrap.min.css');
         $this->assertFileExists(__DIR__ . '/Support/runtime/55145ba9/bootstrap.min.css.map');
+
+        @runkit_constant_redefine('YII_ENV', 'test');
     }
 
-    /**
-     * @depends testBootstrapAssetRegister
-     * @depends testBootstrapCdnAssetRegister
-     * @depends testBootstrapPluginAssetRegister
-     * @depends testBootstrapPluginCdnAssetRegister
-     */
     #[RequiresPhp('8.1')]
     public function testProdBootstrapPluginAssetRegister(): void
     {
+        @runkit_constant_redefine('YII_ENV', 'prod');
+
         $this->assertFalse($this->assetManager->isRegisteredBundle(BootstrapPluginAsset::class));
 
         $this->assetManager->register(BootstrapPluginAsset::class);
@@ -156,5 +148,7 @@ public function testProdBootstrapPluginAssetRegister(): void
         );
         $this->assertFileExists(__DIR__ . '/Support/runtime/16b8de20/bootstrap.bundle.min.js');
         $this->assertFileExists(__DIR__ . '/Support/runtime/16b8de20/bootstrap.bundle.min.js.map');
+
+        @runkit_constant_redefine('YII_ENV', 'test');
     }
 }