Fixed potsky#33: multi-line regex

Max13 · Aug 21, 2016 · 681733d · 681733d
1 parent 6c92ea6
commit 681733d
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 29 deletions.
diff --git a/src/config/config-laravel5.php b/src/config/config-laravel5.php
@@ -60,30 +60,30 @@
 	*/
 	'trans_methods'       => array(
 		'trans'        => array(
-			'@trans\(\s*(\'.*\')\s*(,.*)*\)@U' ,
-			'@trans\(\s*(".*")\s*(,.*)*\)@U' ,
+			'@trans\(\s*(\'.*\')\s*(,\s*.*)*\)@U' ,
+			'@trans\(\s*(".*")\s*(,\s*.*)*\)@U' ,
 		) ,
 		'Lang::Get'    => array(
-			'@Lang::Get\(\s*(\'.*\')\s*(,.*)*\)@U' ,
-			'@Lang::Get\(\s*(".*")\s*(,.*)*\)@U' ,
-			'@Lang::get\(\s*(\'.*\')\s*(,.*)*\)@U' ,
-			'@Lang::get\(\s*(".*")\s*(,.*)*\)@U' ,
+			'@Lang::Get\(\s*(\'.*\')\s*(,\s*.*)*\)@U' ,
+			'@Lang::Get\(\s*(".*")\s*(,\s*.*)*\)@U' ,
+			'@Lang::get\(\s*(\'.*\')\s*(,\s*.*)*\)@U' ,
+			'@Lang::get\(\s*(".*")\s*(,\s*.*)*\)@U' ,
 		) ,
 		'trans_choice' => array(
-			'@trans_choice\(\s*(\'.*\')\s*,.*\)@U' ,
-			'@trans_choice\(\s*(".*")\s*,.*\)@U' ,
+			'@trans_choice\(\s*(\'.*\')\s*,\s*.*\)@U' ,
+			'@trans_choice\(\s*(".*")\s*,\s*.*\)@U' ,
 		) ,
 		'Lang::choice' => array(
-			'@Lang::choice\(\s*(\'.*\')\s*,.*\)@U' ,
-			'@Lang::choice\(\s*(".*")\s*,.*\)@U' ,
+			'@Lang::choice\(\s*(\'.*\')\s*,\s*.*\)@U' ,
+			'@Lang::choice\(\s*(".*")\s*,\s*.*\)@U' ,
 		) ,
 		'@lang'        => array(
-			'@\@lang\(\s*(\'.*\')\s*(,.*)*\)@U' ,
-			'@\@lang\(\s*(".*")\s*(,.*)*\)@U' ,
+			'@\@lang\(\s*(\'.*\')\s*(,\s*.*)*\)@U' ,
+			'@\@lang\(\s*(".*")\s*(,\s*.*)*\)@U' ,
 		) ,
 		'@choice'      => array(
-			'@\@choice\(\s*(\'.*\')\s*,.*\)@U' ,
-			'@\@choice\(\s*(".*")\s*,.*\)@U' ,
+			'@\@choice\(\s*(\'.*\')\s*,\s*.*\)@U' ,
+			'@\@choice\(\s*(".*")\s*,\s*.*\)@U' ,
 		) ,
 	) ,
 

diff --git a/src/config/config.php b/src/config/config.php
@@ -59,32 +59,32 @@
 	| Several regular expressions can be used for a single method or function.
 	|
 	*/
-	'trans_methods' => array(
+	'trans_methods'       => array(
 		'trans'        => array(
-			'@trans\(\s*(\'.*\')\s*(,.*)*\)@U' ,
-			'@trans\(\s*(".*")\s*(,.*)*\)@U' ,
+			'@trans\(\s*(\'.*\')\s*(,\s*.*)*\)@U' ,
+			'@trans\(\s*(".*")\s*(,\s*.*)*\)@U' ,
 		) ,
 		'Lang::Get'    => array(
-			'@Lang::Get\(\s*(\'.*\')\s*(,.*)*\)@U' ,
-			'@Lang::Get\(\s*(".*")\s*(,.*)*\)@U' ,
-			'@Lang::get\(\s*(\'.*\')\s*(,.*)*\)@U' ,
-			'@Lang::get\(\s*(".*")\s*(,.*)*\)@U' ,
+			'@Lang::Get\(\s*(\'.*\')\s*(,\s*.*)*\)@U' ,
+			'@Lang::Get\(\s*(".*")\s*(,\s*.*)*\)@U' ,
+			'@Lang::get\(\s*(\'.*\')\s*(,\s*.*)*\)@U' ,
+			'@Lang::get\(\s*(".*")\s*(,\s*.*)*\)@U' ,
 		) ,
 		'trans_choice' => array(
-			'@trans_choice\(\s*(\'.*\')\s*,.*\)@U' ,
-			'@trans_choice\(\s*(".*")\s*,.*\)@U' ,
+			'@trans_choice\(\s*(\'.*\')\s*,\s*.*\)@U' ,
+			'@trans_choice\(\s*(".*")\s*,\s*.*\)@U' ,
 		) ,
 		'Lang::choice' => array(
-			'@Lang::choice\(\s*(\'.*\')\s*,.*\)@U' ,
-			'@Lang::choice\(\s*(".*")\s*,.*\)@U' ,
+			'@Lang::choice\(\s*(\'.*\')\s*,\s*.*\)@U' ,
+			'@Lang::choice\(\s*(".*")\s*,\s*.*\)@U' ,
 		) ,
 		'@lang'        => array(
-			'@\@lang\(\s*(\'.*\')\s*(,.*)*\)@U' ,
-			'@\@lang\(\s*(".*")\s*(,.*)*\)@U' ,
+			'@\@lang\(\s*(\'.*\')\s*(,\s*.*)*\)@U' ,
+			'@\@lang\(\s*(".*")\s*(,\s*.*)*\)@U' ,
 		) ,
 		'@choice'      => array(
-			'@\@choice\(\s*(\'.*\')\s*,.*\)@U' ,
-			'@\@choice\(\s*(".*")\s*,.*\)@U' ,
+			'@\@choice\(\s*(\'.*\')\s*,\s*.*\)@U' ,
+			'@\@choice\(\s*(".*")\s*,\s*.*\)@U' ,
 		) ,
 	) ,