Merge pull request #53 from joelcuevas/master

fix #52 for regex not matching @lang/@choice when enclosed on html tags
themsaid · Sep 3, 2016 · 0abd7ce · 0abd7ce
2 parents bedbe70 + 819c31c
commit 0abd7ce
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/Manager.php b/src/Manager.php
@@ -309,8 +309,9 @@ public function getAllViewFilesWithTranslations()
         $functions = ['trans', 'trans_choice', 'Lang::get', 'Lang::choice', 'Lang::trans', 'Lang::transChoice', '@lang', '@choice'];
 
         $pattern =
-            // See https://regex101.com/r/jS5fX0/2
-            '[^\w|>]'. // Must not start with any alphanum or _ or >
+            // See https://regex101.com/r/jS5fX0/3
+            '[^\w]'. // Must not start with any alphanum or _
+            '(?<!->)'. // Must not start with ->
             '('.implode('|', $functions).')'.// Must start with one of the functions
             "\(".// Match opening parentheses
             "[\'\"]".// Match " or '