Correctly handle custom namespaces when combining DCA files (see #8682).

contao · Apr 20, 2017 · 96c968a · 96c968a
1 parent 6289a8c
commit 96c968a
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/Resources/contao/library/Contao/System.php b/src/Resources/contao/library/Contao/System.php
@@ -674,6 +674,13 @@ protected static function readPhpFileWithoutTags($strName, $blnAddNamespace=fals
 
 		if ($blnAddNamespace)
 		{
+			$arrMatches = array();
+
+			if (preg_match('/^namespace ([A-Za-z0-9_\\\\]+);/m', $strCode, $arrMatches))
+			{
+				return sprintf("\nnamespace %s {%s\n\n}", $arrMatches[1], rtrim(preg_replace('/(\n|^)namespace [A-Za-z0-9_\\\\]+;\n?/m', '', $strCode)));
+			}
+
 			return sprintf("\nnamespace {%s\n\n}", rtrim($strCode));
 		}