Fix #144 and tests for PHP 5.6 & 7.0.

srmklive · srmklive · commit 09b9cb44a113 · 2022-08-11T09:25:33.000+05:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -28,7 +28,7 @@ jobs:
     - name: Install Composer dependencies
       env:
         PHP_VERSION: ${{ matrix.php-versions }}
-      run: composer install --no-progress --prefer-dist --optimize-autoloader $(if [ "$PHP_VERSION" == "8.0" || "$PHP_VERSION" == "8.1" ]; then echo "--ignore-platform-reqs"; fi;)
+      run: $(if [ "$PHP_VERSION" == "5.6" || "$PHP_VERSION" == "7.0" ]; then echo "composer config --no-plugins allow-plugins.kylekatarnls/update-helper true &&"; fi;) composer install --no-progress --prefer-dist --optimize-autoloader $(if [ "$PHP_VERSION" == "8.0" || "$PHP_VERSION" == "8.1" ]; then echo "--ignore-platform-reqs"; fi;)
     - name: Run tests with code coverage
       env:
         PHP_VERSION: ${{ matrix.php-versions }}
diff --git a/src/Compilers/MinifyCompiler.php b/src/Compilers/MinifyCompiler.php
@@ -49,6 +49,7 @@ class MinifyCompiler extends BladeCompiler
      * @param string                                   $cachePath
      * @param array                                    $ignoredPaths
      * @param \Illuminate\View\Compilers\BladeCompiler $previousCompiler
+     * @param array                                    $customDirectives
      *
      * @return void
      */
@@ -57,13 +58,20 @@ public function __construct(
         Filesystem $files,
         $cachePath,
         $ignoredPaths = [],
-        $previousCompiler = null
+        $previousCompiler = null,
+        $customDirectives = []
     ) {
         parent::__construct($files, $cachePath);
         $this->blade = $blade;
         $this->ignoredPaths = $ignoredPaths;
         $this->compilers[] = 'Minify';
         $this->previousCompiler = $previousCompiler;
+
+        if (count($customDirectives)) {
+            foreach ($customDirectives as $key => $value) {
+                $this->directive($key, $value);
+            }
+        }
     }
 
     /**
diff --git a/src/HTMLMinServiceProvider.php b/src/HTMLMinServiceProvider.php
@@ -184,7 +184,7 @@ protected function registerMinifyCompiler()
             $storagePath = $app->config->get('view.compiled');
             $ignoredPaths = $app->config->get('htmlmin.ignore', []);
 
-            return new MinifyCompiler($blade, $files, $storagePath, $ignoredPaths, $this->previousCompiler);
+            return new MinifyCompiler($blade, $files, $storagePath, $ignoredPaths, $this->previousCompiler, $this->previousCompiler->getCustomDirectives());
         });
 
         $this->app->alias('htmlmin.compiler', MinifyCompiler::class);
