Behat generates proper snippets for arguments followed by non-word ch…

…aracter
Behat · Feb 11, 2014 · 932b5ca · 932b5ca
1 parent 68e56f0
commit 932b5ca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/Behat/Behat/Definition/Pattern/Policy/RegexPatternPolicy.php b/src/Behat/Behat/Definition/Pattern/Policy/RegexPatternPolicy.php
@@ -24,9 +24,9 @@ class RegexPatternPolicy implements PatternPolicy
      * @var string[string]
      */
     private static $replacePatterns = array(
-        "/(?<= |^)\\\'(?:((?!\\').)*)\\\'(?= |$)/" => "\\'([^\']*)\\'", // Single quoted strings
-        '/(?<= |^)\"(?:[^\"]*)\"(?= |$)/'          => "\"([^\"]*)\"", // Double quoted strings
-        '/(\d+)/'                                  => "(\\d+)", // Numbers
+        "/(?<=\W|^)\\\'(?:((?!\\').)*)\\\'(?=\W|$)/" => "'([^']*)'", // Single quoted strings
+        '/(?<=\W|^)\"(?:[^\"]*)\"(?=\W|$)/'          => "\"([^\"]*)\"", // Double quoted strings
+        '/(?<=\W|^)(\d+)(?=\W|$)/'                   => "(\\d+)", // Numbers
     );
 
     /**

diff --git a/src/Behat/Behat/Definition/Pattern/Policy/TurnipPatternPolicy.php b/src/Behat/Behat/Definition/Pattern/Policy/TurnipPatternPolicy.php
@@ -28,9 +28,9 @@ class TurnipPatternPolicy implements PatternPolicy
      * @var string[]
      */
     private static $placeholderPatterns = array(
-        "/(?<=\s|^)\"[^\"]+\"(?=\s|$)/",
-        "/(?<=\s|^)'[^']+'(?=\s|$)/",
-        "/(?<=\s|^)\d+/"
+        "/(?<=\W|^)\"[^\"]+\"(?=\W|$)/",
+        "/(?<=\W|^)'[^']+'(?=\W|$)/",
+        "/(?<=\W|^)\d+(?=\W|$)/"
     );
 
     /**
@@ -82,7 +82,7 @@ public function transformPatternToRegex($pattern)
             self::PLACEHOLDER_REGEXP,
             function ($match) {
                 return sprintf(
-                    "[\"']?(?P<%s>(?<=\")[^\"]+(?=\")|(?<=')[^']+(?=')|(?<=\s)\w+(?=\s|$))['\"]?",
+                    "[\"']?(?P<%s>(?<=\")[^\"]+(?=\")|(?<=')[^']+(?=')|(?<=\W)\w+(?=\W|$))['\"]?",
                     $match[1]
                 );
             },