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

contao · Apr 18, 2017 · bf11970 · bf11970
1 parent 7594240
commit bf11970
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/system/docs/CHANGELOG.md b/system/docs/CHANGELOG.md
@@ -4,6 +4,9 @@ Contao Open Source CMS changelog
 Version 3.5.26 (2017-XX-XX)
 ---------------------------
 
+### Fixed
+Correctly handle custom namespaces when combining DCA files (see #8682).
+
 ### Fixed
 Also check the X-Forwarded-Proto header when determining HTTPS (see #8691).
 

diff --git a/system/modules/core/library/Contao/System.php b/system/modules/core/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));
 		}