X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/blobdiff_plain/a24bfae49eb5348a3de1a9e01987de33614d4f99..82a24fa0b7c469cd5659f9d5540b57b6004a47c1:/typo3/sysext/core/Tests/FunctionalTestCaseBootstrapUtility.php

diff --git a/typo3/sysext/core/Tests/FunctionalTestCaseBootstrapUtility.php b/typo3/sysext/core/Tests/FunctionalTestCaseBootstrapUtility.php
index 2bf209387058..11457951a313 100644
--- a/typo3/sysext/core/Tests/FunctionalTestCaseBootstrapUtility.php
+++ b/typo3/sysext/core/Tests/FunctionalTestCaseBootstrapUtility.php
@@ -204,8 +204,6 @@ class FunctionalTestCaseBootstrapUtility {
 	/**
 	 * Create LocalConfiguration.php file in the test instance
 	 *
-	 * @param array $coreExtensionsToLoad Additional core extensions to load
-	 * @param array $testExtensionPaths Paths to extensions relative to document root
 	 * @throws Exception
 	 * @return void
 	 */
@@ -257,6 +255,27 @@ class FunctionalTestCaseBootstrapUtility {
 		$packageStates = require ORIGINAL_ROOT . 'typo3conf/PackageStates.php';
 		$packageStates['packages']['phpunit']['packagePath'] = '../../' . $packageStates['packages']['phpunit']['packagePath'];
 
+		// Activate core extensions if currently inactive
+		foreach ($coreExtensionsToLoad as $extensionName) {
+			if (!empty($packageStates['packages'][$extensionName]['state']) && $packageStates['packages'][$extensionName]['state'] !== 'active') {
+				$packageStates['packages'][$extensionName]['state'] = 'active';
+			}
+		}
+
+		// Clean and activate test extensions that have been symlinked before
+		foreach ($testExtensionPaths as $extensionPath) {
+			$extensionName = basename($extensionPath);
+			if (!empty($packageStates['packages'][$extensionName])) {
+				unset($packageStates['packages'][$extensionName]);
+			}
+
+			$packageStates['packages'][$extensionName] = array(
+				'state' => 'active',
+				'packagePath' => 'typo3conf/ext/' . $extensionName . '/',
+				'classesPath' => 'Classes/',
+			);
+		}
+
 		$result = $this->writeFile(
 			$this->instancePath . '/typo3conf/PackageStates.php',
 			'<?php' . chr(10) .