Merge pull request #57 from battye/bugfix/array-spaces

Change regex to allow spaces in the array syntax
phpbb · Apr 13, 2019 · e3e8bcf · e3e8bcf
2 parents a9d017d + 4243ae1
commit e3e8bcf
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 39 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Phpbb/TranslationValidator/Validator/ValidatorRunner.php b/src/Phpbb/TranslationValidator/Validator/ValidatorRunner.php
@@ -267,7 +267,7 @@ protected function guessPluralRule()
 	public static function arrayParser($file)
 	{
 		// Parse language files that use new or old array formats
-		$regex = '/\$lang\s*=\s*array_merge\(\$lang,\s*(?|array\((.*?)\)|\[(.*?)\])\);/s';
+		$regex = '/\$lang\s*=\s*array_merge\s*\(\$lang,\s*(?|array\s*\((.*?)\)|\[(.*?)\])\);/s';
 		return parser::parse_regex($regex, $file);
 	}