Merge pull request #75 from thunderer/fix-falsy-parameter-value

Fixed skipping shortcodes in RegularParser

Author: thunderer

Diff for: src/Parser/RegularParser.php

@@ -200,9 +200,9 @@ private function value()
             return $this->match(self::TOKEN_DELIMITER, false) ? $value : false;
         }
 
-        if($tmp = $this->match(self::TOKEN_STRING, false)) {
+        if('' !== $tmp = $this->match(self::TOKEN_STRING, false)) {
             $value .= $tmp;
-            while($tmp = $this->match(self::TOKEN_STRING, false)) {
+            while('' !== $tmp = $this->match(self::TOKEN_STRING, false)) {
                 $value .= $tmp;
             }
 

Diff for: tests/ParserTest.php

@@ -225,6 +225,10 @@ public function provideShortcodes()
                 new ParsedShortcode(new Shortcode('y', array(), ' ] [] [ [z] [/#] [/z] [ [] ] [/] ', null), '[y] ] [] [ [z] [/#] [/z] [ [] ] [/] [/y]', 27),
                 new ParsedShortcode(new Shortcode('z', array(), ' [ [/ [/] /] ] ', null), '[z] [ [/ [/] /] ] [/z]', 70),
             )),
+            // falsy string values
+            array($s, '[a=0 b=0]0[/a]', array(
+                new ParsedShortcode(new Shortcode('a', array('b' => '0'), '0', '0'), '[a=0 b=0]0[/a]', 0),
+            )),
         );
 
         /**
@@ -239,7 +243,7 @@ public function provideShortcodes()
          *
          * Tests cases from array above with identifiers in the array below must be skipped.
          */
-        $wordpressSkip = array(3, 6, 16, 21, 22, 23, 25, 32, 33, 34, 46, 47, 49);
+        $wordpressSkip = array(3, 6, 16, 21, 22, 23, 25, 32, 33, 34, 46, 47, 49, 51);
         $result = array();
         foreach($tests as $key => $test) {
             $syntax = array_shift($test);