Merge branch 'master' into master

Author: paramonovav

ParamonovavSpressHtmlCompress.php

@@ -3,22 +3,36 @@
 use Yosymfony\Spress\Core\Plugin\PluginInterface;
 use Yosymfony\Spress\Core\Plugin\EventSubscriber;
 use Yosymfony\Spress\Core\Plugin\Event\EnvironmentEvent;
-use Yosymfony\Spress\Core\Plugin\Event\ContentEvent;
-use Yosymfony\Spress\Core\Plugin\Event\FinishEvent;
 use Yosymfony\Spress\Core\Plugin\Event\RenderEvent;
+use Yosymfony\Spress\Core\IO\IOInterface;
 
 class ParamonovavSpressHtmlCompress implements PluginInterface
 {
-    private $io, $html_compress_exclude = ['.htaccess','robots.txt','crossdomain.xml', 'sitemap.xml', 'rss.xml'];
+    /** @var IOInterface */
+    private $io;
+
 
     private $html_compress_exclude_pattern = '/(.*)?\.(jpe?g|png|gif|ico|svg|psd|tiff|webm|mov|avi|mkv|mp4)$/i';
 
+    /** @var string[] */
+    private $html_compress_exclude = ['.htaccess','robots.txt','crossdomain.xml', 'sitemap.xml', 'rss.xml'];
+
+    /** @var bool */
+    private $htmlCompress  = true;
+
+    /**
+     * @param EventSubscriber $subscriber
+     */
+
     public function initialize(EventSubscriber $subscriber)
     {
-        $subscriber-> addEventListener('spress.start', 'onStart');
-        $subscriber-> addEventListener('spress.after_render_page', 'onAfterRenderPage');
+        $subscriber->addEventListener('spress.start', 'onStart');
+        $subscriber->addEventListener('spress.after_render_page', 'onAfterRenderPage');
     }
 
+    /**
+     * @return string[]
+     */
     public function getMetas()
     {
         return [
@@ -29,11 +43,16 @@ public function getMetas()
         ];
     }
 
+    /**
+     * @param EnvironmentEvent $event
+     */
     public function onStart(EnvironmentEvent $event)
     {
-        $this-> io = $event-> getIO();
+        $this->io = $event->getIO();
+
+        $configValues = $event->getConfigValues();
 
-        $configValues = $event-> getConfigValues();
+        $this->htmlCompress = !empty($configValues['html_compress']);
 
         if(isset($configValues['html_compress_exclude']))
         {
@@ -46,18 +65,21 @@ public function onStart(EnvironmentEvent $event)
         }
 
     }
-    
+
+    /**
+     * @param RenderEvent $event
+     */
     public function onAfterRenderPage(RenderEvent $event)
     {
-        $id = $event-> getId();
+        $id = $event->getId();
 
-        if (in_array($id, $this-> html_compress_exclude) || preg_match($this->html_compress_exclude_pattern, $id))
+        if (!$this->htmlCompress || in_array($id, $this-> html_compress_exclude) || preg_match($this->html_compress_exclude_pattern, $id))
         {
             return;
         }
 
-        $this-> io-> write('Minify/Compress html: '.$event-> getId());
+        $this->io->write('Minify/Compress html: '.$event->getId());
 
-        $event-> setContent( \WyriHaximus\HtmlCompress\Factory::construct()-> compress( $event-> getContent() ) );
+        $event->setContent( \WyriHaximus\HtmlCompress\Factory::construct()->compress( $event->getContent() ) );
     }
 }

README.md

@@ -29,3 +29,9 @@ Just run build command:
 ```bash
 spress site:build
 ```
+
+If you want to disable compression use the following config
+
+```yaml
+html_compress: false
+```