Merge pull request #154 from AleksSem/master

add fix to skip ' with trailing slash
php-gettext · Jul 27, 2017 · 6c27656 · 6c27656
2 parents 010d440 + a5638b7
commit 6c27656
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/Utils/JsFunctionsScanner.php b/src/Utils/JsFunctionsScanner.php
@@ -35,6 +35,13 @@ public function getFunctions(array $constants = [])
             $next = isset($this->code[$pos + 1]) ? $this->code[$pos + 1] : null;
 
             switch ($char) {
+                case '\\':
+                    $prev = $char;
+                    $char = $next;
+                    $pos++;
+                    $next = isset($this->code[$pos]) ? $this->code[$pos] : null;
+                    break;
+
                 case "\n":
                     ++$line;
 
@@ -224,12 +231,6 @@ protected function upStatus()
     protected static function prepareArgument($argument)
     {
         if ($argument && ($argument[0] === '"' || $argument[0] === "'")) {
-            if ($argument[0] === '"') {
-                $argument = str_replace('\\"', '"', $argument);
-            } else {
-                $argument = str_replace("\\'", "'", $argument);
-            }
-
             return substr($argument, 1, -1);
         }
     }