Improve regex

MrEssex · Jan 24, 2024 · 7647fd5 · 7647fd5
1 parent 6826af7
commit 7647fd5
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Cli/GenerateTPL.php b/src/Cli/GenerateTPL.php
@@ -40,10 +40,10 @@ protected function _processFile($file)
   {
     $contents = file_get_contents($file->getPathname());
     $regex = [
-      '/\$this->_\((?:\W?)*[\'"](.*)[\'"],(?:\W)*[\'"](.*)[\'"](?:,(?:[\W\w])*\])?(?:\W)*\)/' => '_processDefault',
-      '/\$this->_t\((?:\W?)*[\'"](.*)[\'"](?:,(?:[\W\w])*\])?(?:\W)*\)/'                      => '_processMD5',
-      '/\$this->_p\((?:\W?)*[\'"](.*)[\'"],(?:\W?)*(.*)[\'"],(?:\W\w)(?:\W\w?)*\)/'           => '_processPlural',
-      '/\$this->_sp\((?:\W?)*[\'"](.*)[\'"],(?:\W\w)(?:\W\w?)*\)/'                            => '_processSimplePlural',
+      '/\$this->_\((?:\W?)*[\'"]([^\'"]*)[\'"],(?:[\W])*[\'"](.*)[\'"](?:,(?:[\W\w])*\])?(?:\W)*\)/' => '_processDefault',
+      '/\$this->_t\((?:\W?)*[\'"](.*)[\'"](?:,(?:[\W\w])*\])?(?:\W)*\)/'                             => '_processMD5',
+      '/\$this->_p\((?:\W?)*[\'"](.*)[\'"],(?:\W?)*(.*)[\'"],(?:\W\w)(?:\W\w?)*\)/'                  => '_processPlural',
+      '/\$this->_sp\((?:\W?)*[\'"](.*)[\'"],(?:\W\w)(?:\W\w?)*\)/'                                   => '_processSimplePlural',
 
     ];