MAGETWO-47439: [Github] i18n:collect-phrases -m can't find many impor…

…tant magento phrases #2630

- Updated regex that picks up php phrases.

dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/expectedPhrases.csv

@@ -9,11 +9,11 @@
 "first part of concat second part with two placeholders %1, %2","first part of concat second part with two placeholders %1, %2"
 "first part of concat second part third part with one placeholder %1","first part of concat second part third part with one placeholder %1"
 "first part of concat second part third part with two placeholders %1, %2","first part of concat second part third part with two placeholders %1, %2"
-"string with escaped 'single quotes'","string with escaped 'single quotes'"
-"string with placeholder in escaped single quotes '%1'","string with placeholder in escaped single quotes '%1'"
-"string with ""double quotes""","string with ""double quotes"""
-"string with placeholder in double quotes ""%1""","string with placeholder in double quotes ""%1"""
-"string with 'single quotes'","string with 'single quotes'"
-"string with placeholder in single quotes '%1'","string with placeholder in single quotes '%1'"
-"string with escaped ""double quotes""","string with escaped ""double quotes"""
-"string with placeholder in escaped double quotes ""%1""","string with placeholder in escaped double quotes ""%1"""
+"string with escaped \'single quotes\'","string with escaped \'single quotes\'"
+"string with placeholder in escaped single quotes \'%1\'","string with placeholder in escaped single quotes \'%1\'"
+"string with \"double quotes\"","string with \"double quotes\""
+"string with placeholder in double quotes \"%1\"","string with placeholder in double quotes \"%1\""
+"string with \'single quotes\'","string with \'single quotes\'"
+"string with placeholder in single quotes \'%1\'","string with placeholder in single quotes \'%1\'"
+"string with escaped \"double quotes\"","string with escaped \"double quotes\""
+"string with placeholder in escaped double quotes \"%1\"","string with placeholder in escaped double quotes \"%1\""

dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/phrases/TestPhrases.php

@@ -29,7 +29,8 @@ public function awesomeFunction()
         // Phrase objects
         $phraseObjects = [
             // Single concatenation
-            new Phrase('first part' . ' second part'),
+            new Phrase('first part'
+                . ' second part'),
             new Phrase('first part' . ' second part' . ' third part'),
 
             // Multiple concatenation

setup/src/Magento/Setup/Module/I18n/Dictionary/Phrase.php

@@ -270,8 +270,9 @@ private function getCompiledString($string)
     {
         $encloseQuote = $this->getQuote() == Phrase::QUOTE_DOUBLE ? Phrase::QUOTE_DOUBLE : Phrase::QUOTE_SINGLE;
         //find all occurrences of ' and ", with no \ before it.
-        preg_match_all('/[^\\\\]' . $encloseQuote . '/', $string, $matches);
+        preg_match_all('/[^\\\\][\'"]|[\'\"][^\\\\]/', $string, $matches);
         if (count($matches[0])) {
+            $string = preg_replace('/([^\\\\])' . $encloseQuote . ' ?\. ?' . $encloseQuote . '/', '$1', $string);
             $string = addslashes($string);
         }
         $evalString = 'return ' . $encloseQuote . $string . $encloseQuote . ';';