simple parameter value enclosed in quotes is now properly matched, added support for escaping parameter values

Author: thunderer

src/Syntax.php

@@ -37,7 +37,7 @@ public function getArgumentsRegex()
         $equals = $this->quote($this->getParameterValueSeparator());
         $string = $this->quote($this->getParameterValueDelimiter());
 
-        return '~(?:\s+(\w+(?:(?=\s|$)|'.$equals.'\w+|'.$equals.$string.'.+'.$string.')))~us';
+        return '~(?:\s+(\w+(?:(?=\s|$)|'.$equals.'\w+|'.$equals.$string.'([^'.$string.'\\\\]*(?:\\\\.[^'.$string.'\\\\]*)*?)'.$string.')))~us';
         }
 
     private function createShortcodeRegex()

tests/ParserTest.php

@@ -33,6 +33,8 @@ public function provideShortcodes()
             array('[sc x="multi'."\n".'line"]', 'sc', array('x' => 'multi'."\n".'line'), null),
             array('[sc noval x="val" y]content[/sc]', 'sc', array('noval'=> null, 'x' => 'val', 'y' => null), 'content'),
             array('[sc x="{..}"]', 'sc', array('x' => '{..}'), null),
+            array('[sc a="x y" b="x" c=""]', 'sc', array('a' => 'x y', 'b' => 'x', 'c' => ''), null),
+            array('[sc a="a \"\" b"]', 'sc', array('a' => 'a \"\" b'), null),
             );
         }
 
@@ -53,4 +55,14 @@ public function testWithDifferentSyntax()
         $this->assertSame('val oth', $shortcode->getParameter('arg'));
         $this->assertSame('cont', $shortcode->getContent());
         }
+
+    public function testDifferentSyntaxEscapedQuotes()
+        {
+        $parser = new Parser(new Syntax('^', '$', '&', '!!!', '@@'));
+        $shortcode = $parser->parse('^code a!!!@@\"\"@@ b!!!@@x\"y@@ c$cnt^&code$');
+
+        $this->assertSame('code', $shortcode->getName());
+        $this->assertSame(array('a' => '\\"\\"', 'b' => 'x\"y', 'c' => null), $shortcode->getParameters());
+        $this->assertSame('cnt', $shortcode->getContent());
+        }
     }