[TASK] Move global functions file out of Classes folder

Releases: master
Resolves: #68159
Change-Id: Ic69f454cdb17c16d82aea5d2495b9ae795d600f6
Reviewed-on: http://review.typo3.org/41270


Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez <typo3@scripting-base.de>

composer.json

@@ -173,6 +173,9 @@
 		},
 		"classmap": [
 			"typo3/sysext/core/Resources/PHP/"
+		],
+		"files": [
+			"typo3/sysext/core/Resources/PHP/GlobalDebugFunctions.php"
 		]
 	},
 	"autoload-dev": {

typo3/sysext/core/Classes/Core/Bootstrap.php

@@ -369,7 +369,6 @@ class Bootstrap {
 			->setDefaultTimezone()
 			->initializeL10nLocales()
 			->convertPageNotFoundHandlingToBoolean()
-			->registerGlobalDebugFunctions()
 			->setMemoryLimit()
 			->defineTypo3RequestTypes();
 		if ($allowCaching) {
@@ -638,19 +637,6 @@ class Bootstrap {
 		return $this;
 	}
 
-	/**
-	 * Register xdebug(), debug(), debugBegin() and debugEnd() as global functions
-	 *
-	 * Note: Yes, this is possible in php! xdebug() is then a global function, even
-	 * if registerGlobalDebugFunctions() is encapsulated in class scope.
-	 *
-	 * @return Bootstrap
-	 */
-	protected function registerGlobalDebugFunctions() {
-		require_once('GlobalDebugFunctions.php');
-		return $this;
-	}
-
 	/**
 	 * Configure and set up exception and error handling
 	 *

typo3/sysext/core/composer.json

@@ -25,7 +25,8 @@
 		"psr-4": {
 			"TYPO3\\CMS\\Core\\": "Classes/"
 		},
-		"classmap": ["Resources/PHP/"]
+		"classmap": ["Resources/PHP/"],
+		"files": ["typo3/sysext/core/Resources/PHP/GlobalDebugFunctions.php"]
 	},
 	"autoload-dev": {
 		"psr-4": {