Only wrap config and DCA files in namespaces blocks (see #8635).

contao · Mar 20, 2017 · 31f43d9 · 31f43d9
1 parent 8e2b5b7
commit 31f43d9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/system/modules/core/library/Contao/Automator.php b/system/modules/core/library/Contao/Automator.php
@@ -494,7 +494,7 @@ public function generateConfigCache()
 
 			if (file_exists(TL_ROOT . '/' . $strFile))
 			{
-				$objCacheFile->append(static::readPhpFileWithoutTags($strFile));
+				$objCacheFile->append(static::readPhpFileWithoutTags($strFile, true));
 			}
 		}
 
@@ -521,7 +521,7 @@ public function generateConfigCache()
 
 			if (file_exists(TL_ROOT . '/' . $strFile))
 			{
-				$objCacheFile->append(static::readPhpFileWithoutTags($strFile));
+				$objCacheFile->append(static::readPhpFileWithoutTags($strFile, true));
 			}
 		}
 
@@ -599,7 +599,7 @@ public function generateDcaCache()
 
 				if (file_exists(TL_ROOT . '/' . $strFile))
 				{
-					$objCacheFile->append(static::readPhpFileWithoutTags($strFile));
+					$objCacheFile->append(static::readPhpFileWithoutTags($strFile, true));
 				}
 			}
 

diff --git a/system/modules/core/library/Contao/System.php b/system/modules/core/library/Contao/System.php
@@ -645,11 +645,12 @@ public static function anonymizeIp($strIp)
 	/**
 	 * Read the contents of a PHP file, stripping the opening and closing PHP tags
 	 *
-	 * @param string $strName The name of the PHP file
+	 * @param string  $strName         The name of the PHP file
+	 * @param boolean $blnAddNamespace Wrap the content into a namespace declaration
 	 *
 	 * @return string The PHP code without the PHP tags
 	 */
-	protected static function readPhpFileWithoutTags($strName)
+	protected static function readPhpFileWithoutTags($strName, $blnAddNamespace=false)
 	{
 		$strCode = rtrim(file_get_contents(TL_ROOT . '/' . $strName));
 
@@ -671,7 +672,12 @@ protected static function readPhpFileWithoutTags($strName)
 			$strCode = substr($strCode, 0, -2);
 		}
 
-		return sprintf("\nnamespace {%s\n\n}", rtrim($strCode));
+		if ($blnAddNamespace)
+		{
+			return sprintf("\nnamespace {%s\n\n}", rtrim($strCode));
+		}
+
+		return rtrim($strCode)."\n";
 	}