Merge 68a27b5 into 5b94d85

zaininnari · Sep 29, 2015 · 8078430 · 8078430
2 parents 5b94d85 + 68a27b5
commit 8078430
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 37 deletions.
diff --git a/src/zz/Html/HTMLMinify.php b/src/zz/Html/HTMLMinify.php
@@ -119,6 +119,7 @@ class HTMLMinify {
         'option' => 'inline',
         'output' => 'inline',
         'p' => 'block',
+        'path' => 'none',
         'param' => 'none',
         'plaintext' => 'block',
         'pre' => 'block',
@@ -175,6 +176,7 @@ class HTMLMinify {
         'link' => 'link',
         'meta' => 'meta',
         'param' => 'param',
+        'path' => 'path',
     );
 
     /**
@@ -603,4 +605,4 @@ protected function _isConditionalComment($comment) {
         return false;
     }
 
-}
+}
diff --git a/src/zz/Html/HTMLNames.php b/src/zz/Html/HTMLNames.php
@@ -121,6 +121,7 @@ class HTMLNames {
     const optionTag = 'option';
     const outputTag = 'output';
     const pTag = 'p';
+    const pathTag = 'path';
     const paramTag = 'param';
     const plaintextTag = 'plaintext';
     const preTag = 'pre';

diff --git a/tests/zz/Html/HTMLMinifyTest.php b/tests/zz/Html/HTMLMinifyTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace zz\Html;
 use zz\Html;
 
@@ -177,46 +178,48 @@ public function testOptimizeByOptionDoctype() {
         $this->assertEquals($expect, $actual);
     }
 
-    public function testOptimizeByOptionEmptyElement() {
-        $source = '<br><br/><br />';
-        $expect = '<br /><br /><br />';
-        $option = array();
-        $actual = HTMLMinify::minify($source, $option);
-        $this->assertEquals($expect, $actual);
-
-        $source = '<br><br/><br />';
-        $expect = '<br><br><br>';
-        $option = array(
-            'emptyElementAddSlash' => false,
-            'emptyElementAddWhitespaceBeforeSlash' => false,
+    public function optimizeByOptionEmptyElementProvider()
+    {
+        $options = array(
+            'default' => array(),
+            'none' => array(
+                'emptyElementAddSlash' => false,
+                'emptyElementAddWhitespaceBeforeSlash' => false,
+            ),
+            'addWhitespace' => array(
+                'emptyElementAddSlash' => false,
+                'emptyElementAddWhitespaceBeforeSlash' => true,
+            ),
+            'addSlash' => array(
+                'emptyElementAddSlash' => true,
+                'emptyElementAddWhitespaceBeforeSlash' => false,
+            ),
+            'addWhitespaceAndSlash' => array(
+                'emptyElementAddSlash' => true,
+                'emptyElementAddWhitespaceBeforeSlash' => true,
+            )
         );
-        $actual = HTMLMinify::minify($source, $option);
-        $this->assertEquals($expect, $actual);
 
-        $source = '<br><br/><br />';
-        $expect = '<br><br><br>';
-        $option = array(
-            'emptyElementAddSlash' => false,
-            'emptyElementAddWhitespaceBeforeSlash' => true,
-        );
-        $actual = HTMLMinify::minify($source, $option);
-        $this->assertEquals($expect, $actual);
+        $pa = $pathAttribs = 'fill="currentColor" d="M347.3 418.98l4.08-40.8h-40.8v-20.4c0-12.24 4.08-20.4 20.4-20.4h20.4v-36.72h-32.64c-32.64 0-53.04 20.4-53.04 53.04v28.56h-36.72v40.8h36.72v106.08h40.8V423.06h40.8v-4.08z"';
 
-        $source = '<br><br/><br />';
-        $expect = '<br/><br/><br/>';
-        $option = array(
-            'emptyElementAddSlash' => true,
-            'emptyElementAddWhitespaceBeforeSlash' => false,
+        return array(
+            array('<br><br/><br />', '<br /><br /><br />', $options['default']),
+            array('<br><br/><br />', '<br><br><br>', $options['none']),
+            array('<br><br/><br />', '<br><br><br>', $options['addWhitespace']),
+            array('<br><br/><br />', '<br/><br/><br/>', $options['addSlash']),
+            array('<br><br/><br />', '<br /><br /><br />', $options['addWhitespaceAndSlash']),
+            array("<path {$pa}><path {$pa}/><path {$pa} />", "<path {$pa} /><path {$pa} /><path {$pa} />", $options['default']),
+            array("<path {$pa}><path {$pa}/><path {$pa} />", "<path {$pa}><path {$pa}><path {$pa}>", $options['none']),
+            array("<path {$pa}><path {$pa}/><path {$pa} />", "<path {$pa}><path {$pa}><path {$pa}>", $options['addWhitespace']),
+            array("<path {$pa}><path {$pa}/><path {$pa} />", "<path {$pa}/><path {$pa}/><path {$pa}/>", $options['addSlash']),
+            array("<path {$pa}><path {$pa}/><path {$pa} />", "<path {$pa} /><path {$pa} /><path {$pa} />", $options['addWhitespaceAndSlash']),
         );
-        $actual = HTMLMinify::minify($source, $option);
-        $this->assertEquals($expect, $actual);
+    }
 
-        $source = '<br><br/><br />';
-        $expect = '<br /><br /><br />';
-        $option = array(
-            'emptyElementAddSlash' => true,
-            'emptyElementAddWhitespaceBeforeSlash' => true,
-        );
+    /**
+     * @dataProvider  optimizeByOptionEmptyElementProvider
+     */
+    public function testOptimizeByOptionEmptyElement($source, $expect, $option) {
         $actual = HTMLMinify::minify($source, $option);
         $this->assertEquals($expect, $actual);
     }
@@ -543,4 +546,4 @@ public function testAttributeQuoted() {
         $actual = HTMLMinify::minify($source);
         $this->assertEquals($expect, $actual);
     }
-}
+}