From 0642b680b613fdd6cb774debacf65a0d0d1f08e8 Mon Sep 17 00:00:00 2001
From: Christophe Coevoet <stof@notk.org>
Date: Sun, 27 Apr 2014 13:55:27 +0200
Subject: [PATCH] Fixed the regex of the step matching url to avoid breaking
 formatters

The inner group needs to be non-capturing. Fixes #99
---
 i18n/cs.xliff                                      | 4 ++--
 i18n/da.xliff                                      | 4 ++--
 i18n/de.xliff                                      | 4 ++--
 i18n/es.xliff                                      | 4 ++--
 i18n/fr.xliff                                      | 4 ++--
 i18n/id.xliff                                      | 6 +++---
 i18n/it.xliff                                      | 4 ++--
 i18n/ja.xliff                                      | 4 ++--
 i18n/nl.xliff                                      | 6 +++---
 i18n/pl.xliff                                      | 4 ++--
 i18n/pt.xliff                                      | 4 ++--
 i18n/ru.xliff                                      | 4 ++--
 i18n/sk.xliff                                      | 4 ++--
 i18n/sv.xliff                                      | 4 ++--
 i18n/zh-CN.xliff                                   | 4 ++--
 src/Behat/MinkExtension/Context/MinkContext.php    | 2 +-
 src/Behat/MinkExtension/Context/MinkDictionary.php | 2 +-
 17 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/i18n/cs.xliff b/i18n/cs.xliff
index cb8d58c..74ec33a 100644
--- a/i18n/cs.xliff
+++ b/i18n/cs.xliff
@@ -99,8 +99,8 @@
             <target><![CDATA[/^musím být na stránce "(?P<page>[^"]+)"$/]]></target>
         </trans-unit>
         <trans-unit id="the-url-should-match">
-            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"([^"]|\\")*")$/]]></source>
-            <target><![CDATA[/^(?:url|adresa|url adresa) musí mít tvar (?P<pattern>"([^"]|\\")*")$/]]></target>
+            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"(?:[^"]|\\")*")$/]]></source>
+            <target><![CDATA[/^(?:url|adresa|url adresa) musí mít tvar (?P<pattern>"(?:[^"]|\\")*")$/]]></target>
         </trans-unit>
         <trans-unit id="the-element-should-contain">
             <source><![CDATA[/^the "(?P<element>[^"]*)" element should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
diff --git a/i18n/da.xliff b/i18n/da.xliff
index 1c9b9e1..cf584e3 100644
--- a/i18n/da.xliff
+++ b/i18n/da.xliff
@@ -136,8 +136,8 @@
             <target><![CDATA[/^(?:|skulle jeg )være på hjemmesiden$/]]></target>
         </trans-unit>
         <trans-unit id="the-url-should-match">
-            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"([^"]|\\")*")$/]]></source>
-            <target><![CDATA[/^skulle webadressen matche (?P<pattern>"([^"]|\\")*")$/]]></target>
+            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"(?:[^"]|\\")*")$/]]></source>
+            <target><![CDATA[/^skulle webadressen matche (?P<pattern>"(?:[^"]|\\")*")$/]]></target>
         </trans-unit>
         <trans-unit id="the-element-should-contain">
             <source><![CDATA[/^the "(?P<element>[^"]*)" element should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
diff --git a/i18n/de.xliff b/i18n/de.xliff
index 662c509..ed7b3b1 100644
--- a/i18n/de.xliff
+++ b/i18n/de.xliff
@@ -75,8 +75,8 @@
             <target><![CDATA[/^(?:|ich )sollte (?:|ich )auf "(?P<page>[^"]+)" sein$/]]></target>
         </trans-unit>
        <trans-unit id="the-url-should-match">
-            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"([^"]|\\")*")$/]]></source>
-            <target><![CDATA[/^(?:|sollte )die Webadresse (?:|sollte )mit (?P<pattern>"([^"]|\\")*") übereinstimmen$/]]></target>
+            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"(?:[^"]|\\")*")$/]]></source>
+            <target><![CDATA[/^(?:|sollte )die Webadresse (?:|sollte )mit (?P<pattern>"(?:[^"]|\\")*") übereinstimmen$/]]></target>
         </trans-unit>
         <trans-unit id="the-response-status-code-should-be">
             <source><![CDATA[/^the response status code should be (?P<code>\d+)$/]]></source>
diff --git a/i18n/es.xliff b/i18n/es.xliff
index db34d4e..6292f92 100644
--- a/i18n/es.xliff
+++ b/i18n/es.xliff
@@ -115,8 +115,8 @@
             <target><![CDATA[/^debo estar en "(?P<page>[^"]+)"$/]]></target>
         </trans-unit>
         <trans-unit id="the-url-should-match">
-            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"([^"]|\\")*")$/]]></source>
-            <target><![CDATA[/^la URL debe seguir el patrón (?P<pattern>"([^"]|\\")*")$/]]></target>
+            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"(?:[^"]|\\")*")$/]]></source>
+            <target><![CDATA[/^la URL debe seguir el patrón (?P<pattern>"(?:[^"]|\\")*")$/]]></target>
         </trans-unit>
         <trans-unit id="the-element-should-contain">
             <source><![CDATA[/^the "(?P<element>[^"]*)" element should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
diff --git a/i18n/fr.xliff b/i18n/fr.xliff
index 77a5450..0cf6adb 100644
--- a/i18n/fr.xliff
+++ b/i18n/fr.xliff
@@ -119,8 +119,8 @@
             <target><![CDATA[/^(?:|je )devrais être sur la page d'accueil$/]]></target>
         </trans-unit>
         <trans-unit id="the-url-should-match">
-            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"([^"]|\\")*")$/]]></source>
-            <target><![CDATA[/^l'(?i)url(?-i) devrait suivre le motif (?P<pattern>"([^"]|\\")*")$/]]></target>
+            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"(?:[^"]|\\")*")$/]]></source>
+            <target><![CDATA[/^l'(?i)url(?-i) devrait suivre le motif (?P<pattern>"(?:[^"]|\\")*")$/]]></target>
         </trans-unit>
         <trans-unit id="the-element-should-contain">
             <source><![CDATA[/^the "(?P<element>[^"]*)" element should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
diff --git a/i18n/id.xliff b/i18n/id.xliff
index 4a8eacd..8e045de 100644
--- a/i18n/id.xliff
+++ b/i18n/id.xliff
@@ -131,8 +131,8 @@
             <target><![CDATA[/^(?:|saya )harus (?:|berada )di (?:|halaman )beranda$/]]></target>
         </trans-unit>
         <trans-unit id="the-url-should-match">
-            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"([^"]|\\")*")$/]]></source>
-            <target><![CDATA[/^url (?i)url(?-i) harus cocok dengan (?:|pola )(?P<pattern>"([^"]|\\")*")$/]]></target>
+            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"(?:[^"]|\\")*")$/]]></source>
+            <target><![CDATA[/^url (?i)url(?-i) harus cocok dengan (?:|pola )(?P<pattern>"(?:[^"]|\\")*")$/]]></target>
         </trans-unit>
         <trans-unit id="the-element-should-contain">
             <source><![CDATA[/^the "(?P<element>[^"]*)" element should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
@@ -181,7 +181,7 @@
         <trans-unit id="show-last-response">
             <source><![CDATA[/^show last response$/]]></source>
             <target><![CDATA[/^tampilkan respon terakhir$/]]></target>
-        </trans-unit>        
+        </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/i18n/it.xliff b/i18n/it.xliff
index ca3a8e5..34ca281 100644
--- a/i18n/it.xliff
+++ b/i18n/it.xliff
@@ -107,8 +107,8 @@
             <target><![CDATA[/^(?:|io )dovrei essere sulla pagina "(?P<page>[^"]+)"$/]]></target>
         </trans-unit>
         <trans-unit id="the-url-should-match">
-            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"([^"]|\\")*")$/]]></source>
-            <target><![CDATA[/^l'(?i)url(?-i) dovrebbe essere (?P<pattern>"([^"]|\\")*")$/]]></target>
+            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"(?:[^"]|\\")*")$/]]></source>
+            <target><![CDATA[/^l'(?i)url(?-i) dovrebbe essere (?P<pattern>"(?:[^"]|\\")*")$/]]></target>
         </trans-unit>
         <trans-unit id="the-element-should-contain">
             <source><![CDATA[/^the "(?P<element>[^"]*)" element should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
diff --git a/i18n/ja.xliff b/i18n/ja.xliff
index 4fbefdd..cb33099 100644
--- a/i18n/ja.xliff
+++ b/i18n/ja.xliff
@@ -99,8 +99,8 @@
             <target><![CDATA[/^(?:|ユーザーが )(?P<page>[^\s]+) を表示していること$/u]]></target>
         </trans-unit>
         <trans-unit id="the-url-should-match">
-            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"([^"]|\\")*")$/]]></source>
-            <target><![CDATA[/^(?i)url(?-i)が (?P<pattern>"([^"]|\\")*") にマッチすること$/u]]></target>
+            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"(?:[^"]|\\")*")$/]]></source>
+            <target><![CDATA[/^(?i)url(?-i)が (?P<pattern>"(?:[^"]|\\")*") にマッチすること$/u]]></target>
         </trans-unit>
         <trans-unit id="the-element-should-contain">
             <source><![CDATA[/^the "(?P<element>[^"]*)" element should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
diff --git a/i18n/nl.xliff b/i18n/nl.xliff
index 8c566fb..0719f30 100644
--- a/i18n/nl.xliff
+++ b/i18n/nl.xliff
@@ -115,8 +115,8 @@
             <target><![CDATA[/^moet (?:|ik )op "(?P<page>[^"]+)" zijn$/]]></target>
         </trans-unit>
         <trans-unit id="the-url-should-match">
-            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"([^"]|\\")*")$/]]></source>
-            <target><![CDATA[/^moet de url overeenkomen met (?P<pattern>"([^"]|\\")*")$/]]></target>
+            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"(?:[^"]|\\")*")$/]]></source>
+            <target><![CDATA[/^moet de url overeenkomen met (?P<pattern>"(?:[^"]|\\")*")$/]]></target>
         </trans-unit>
         <trans-unit id="the-element-should-contain">
             <source><![CDATA[/^the "(?P<element>[^"]*)" element should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
@@ -164,4 +164,4 @@
         </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/i18n/pl.xliff b/i18n/pl.xliff
index 38b3332..8ba30cc 100644
--- a/i18n/pl.xliff
+++ b/i18n/pl.xliff
@@ -99,8 +99,8 @@
             <target><![CDATA[/^(?:|że )powinienem być na stronie "(?P<page>[^"]+)"$/]]></target>
         </trans-unit>
         <trans-unit id="the-url-should-match">
-            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"([^"]|\\")*")$/]]></source>
-            <target><![CDATA[/^(?:url|adres) powinien odpowiadać (?P<pattern>"([^"]|\\")*")$/]]></target>
+            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"(?:[^"]|\\")*")$/]]></source>
+            <target><![CDATA[/^(?:url|adres) powinien odpowiadać (?P<pattern>"(?:[^"]|\\")*")$/]]></target>
         </trans-unit>
         <trans-unit id="the-element-should-contain">
             <source><![CDATA[/^the "(?P<element>[^"]*)" element should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
diff --git a/i18n/pt.xliff b/i18n/pt.xliff
index 849801a..054db63 100644
--- a/i18n/pt.xliff
+++ b/i18n/pt.xliff
@@ -115,8 +115,8 @@
             <target><![CDATA[/^(?:|Eu )estar em "(?P<page>[^"]+)"$/]]></target>
         </trans-unit>
         <trans-unit id="the-url-should-match">
-            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"([^"]|\\")*")$/]]></source>
-            <target><![CDATA[/^a (?i)url(?-i) deve coincidir com (?P<pattern>"([^"]|\\")*")$/]]></target>
+            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"(?:[^"]|\\")*")$/]]></source>
+            <target><![CDATA[/^a (?i)url(?-i) deve coincidir com (?P<pattern>"(?:[^"]|\\")*")$/]]></target>
         </trans-unit>
         <trans-unit id="the-element-should-contain">
             <source><![CDATA[/^the "(?P<element>[^"]*)" element should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
diff --git a/i18n/ru.xliff b/i18n/ru.xliff
index 6cbfa6e..edab76e 100644
--- a/i18n/ru.xliff
+++ b/i18n/ru.xliff
@@ -131,8 +131,8 @@
             <target><![CDATA[/^(?:|я )должен быть на главной странице/]]></target>
         </trans-unit>
         <trans-unit id="the-url-should-match">
-            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"([^"]|\\")*")$/]]></source>
-            <target><![CDATA[/^(?:url|адрес) должен соответствовать (?P<pattern>"([^"]|\\")*")$/]]></target>
+            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"(?:[^"]|\\")*")$/]]></source>
+            <target><![CDATA[/^(?:url|адрес) должен соответствовать (?P<pattern>"(?:[^"]|\\")*")$/]]></target>
         </trans-unit>
         <trans-unit id="the-element-should-contain">
             <source><![CDATA[/^the "(?P<element>[^"]*)" element should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
diff --git a/i18n/sk.xliff b/i18n/sk.xliff
index cd8fe6c..8d06b23 100644
--- a/i18n/sk.xliff
+++ b/i18n/sk.xliff
@@ -107,8 +107,8 @@
             <target><![CDATA[/^(?:mal(?:|a) by som byť|by som mal(?:|a) byť|som|musím byť) na(?:| stránke) "(?P<page>[^"]+)"$/]]></target>
         </trans-unit>
         <trans-unit id="the-url-should-match">
-            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"([^"]|\\")*")$/]]></source>
-            <target><![CDATA[/^(?:url|adresa|link) (?:by mal(?:|a)|mal(?:|a) by|musí) zodpovedať(?:| vzoru) (?P<pattern>"([^"]|\\")*")$/]]></target>
+            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"(?:[^"]|\\")*")$/]]></source>
+            <target><![CDATA[/^(?:url|adresa|link) (?:by mal(?:|a)|mal(?:|a) by|musí) zodpovedať(?:| vzoru) (?P<pattern>"(?:[^"]|\\")*")$/]]></target>
         </trans-unit>
         <trans-unit id="the-element-should-contain">
             <source><![CDATA[/^the "(?P<element>[^"]*)" element should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
diff --git a/i18n/sv.xliff b/i18n/sv.xliff
index d73bc53..d3c60b8 100644
--- a/i18n/sv.xliff
+++ b/i18n/sv.xliff
@@ -95,8 +95,8 @@
             <target><![CDATA[/^(?:|jag )skulle vara på "(?P<page>[^"]+)"$/]]></target>
         </trans-unit>
         <trans-unit id="the-url-should-match">
-            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"([^"]|\\")*")$/]]></source>
-            <target><![CDATA[/^webbadressen skulle matcha (?P<pattern>"([^"]|\\")*")$/]]></target>
+            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"(?:[^"]|\\")*")$/]]></source>
+            <target><![CDATA[/^webbadressen skulle matcha (?P<pattern>"(?:[^"]|\\")*")$/]]></target>
         </trans-unit>
         <trans-unit id="the-element-should-contain">
             <source><![CDATA[/^the "(?P<element>[^"]*)" element should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
diff --git a/i18n/zh-CN.xliff b/i18n/zh-CN.xliff
index 57c0947..99136cb 100644
--- a/i18n/zh-CN.xliff
+++ b/i18n/zh-CN.xliff
@@ -100,8 +100,8 @@
             <target><![CDATA[/^(?:|我)应该到了“(?P<page>[^\s]+)”$/]]></target>
         </trans-unit>
         <trans-unit id="the-url-should-match">
-            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"([^"]|\\")*")$/]]></source>
-            <target><![CDATA[/^(?i)url(?-i) 应该匹配“(?P<pattern>"([^"]|\\")*")”$/]]></target>
+            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"(?:[^"]|\\")*")$/]]></source>
+            <target><![CDATA[/^(?i)url(?-i) 应该匹配“(?P<pattern>"(?:[^"]|\\")*")”$/]]></target>
         </trans-unit>
         <trans-unit id="the-element-should-contain">
             <source><![CDATA[/^the "(?P<element>[^"]*)" element should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
diff --git a/src/Behat/MinkExtension/Context/MinkContext.php b/src/Behat/MinkExtension/Context/MinkContext.php
index 3c729dd..a4060c4 100644
--- a/src/Behat/MinkExtension/Context/MinkContext.php
+++ b/src/Behat/MinkExtension/Context/MinkContext.php
@@ -211,7 +211,7 @@ class MinkContext extends RawMinkContext implements TranslatedContextInterface
     /**
      * Checks, that current page PATH matches regular expression.
      *
-     * @Then /^the (?i)url(?-i) should match (?P<pattern>"([^"]|\\")*")$/
+     * @Then /^the (?i)url(?-i) should match (?P<pattern>"(?:[^"]|\\")*")$/
      */
     public function assertUrlRegExp($pattern)
     {
diff --git a/src/Behat/MinkExtension/Context/MinkDictionary.php b/src/Behat/MinkExtension/Context/MinkDictionary.php
index 908298a..525c7e1 100644
--- a/src/Behat/MinkExtension/Context/MinkDictionary.php
+++ b/src/Behat/MinkExtension/Context/MinkDictionary.php
@@ -302,7 +302,7 @@ trait MinkDictionary
     /**
      * Checks, that current page PATH matches regular expression.
      *
-     * @Then /^the (?i)url(?-i) should match (?P<pattern>"([^"]|\\")*")$/
+     * @Then /^the (?i)url(?-i) should match (?P<pattern>"(?:[^"]|\\")*")$/
      */
     public function assertUrlRegExp($pattern)
     {