[BUGFIX] Load AdditionalFactoryConfiguration.php again 77/58977/4
authorMathias Brodala <mbrodala@pagemachine.de>
Thu, 29 Nov 2018 09:34:22 +0000 (10:34 +0100)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Thu, 29 Nov 2018 21:59:07 +0000 (22:59 +0100)
This file is placed in "typo3conf" just like the other configuration
files and must be loaded accordingly.

Resolves: #87035
Relates: #85560
Releases: master
Change-Id: I7db72a3c1b29f79fb242f1e5da21ec7d77614bfe
Reviewed-on: https://review.typo3.org/58977
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Andreas Wolf <andreas.wolf@typo3.org>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
typo3/sysext/core/Classes/Configuration/ConfigurationManager.php
typo3/sysext/core/Tests/Unit/Configuration/ConfigurationManagerTest.php

index 18e391d..72937c3 100644 (file)
@@ -179,7 +179,7 @@ class ConfigurationManager
      */
     protected function getAdditionalFactoryConfigurationFileLocation()
     {
-        return Environment::getPublicPath() . '/' . $this->additionalFactoryConfigurationFile;
+        return Environment::getLegacyConfigPath() . '/' . $this->additionalFactoryConfigurationFile;
     }
 
     /**
index 08d3b1d..9d45913 100644 (file)
@@ -535,8 +535,8 @@ class ConfigurationManagerTest extends UnitTestCase
         $this->testFilesToDelete[] = $factoryConfigurationAbsoluteFile;
         $subject->_set('factoryConfigurationFile', $factoryConfigurationFile);
 
-        $additionalFactoryConfigurationFile = 'typo3temp/var/tests/' . $this->getUniqueId('test_') . '.php';
-        $additionalFactoryConfigurationAbsoluteFile = Environment::getPublicPath() . '/' . $additionalFactoryConfigurationFile;
+        $additionalFactoryConfigurationFile = '../typo3temp/var/tests/' . $this->getUniqueId('test_') . '.php';
+        $additionalFactoryConfigurationAbsoluteFile = Environment::getLegacyConfigPath() . '/' . $additionalFactoryConfigurationFile;
         $uniqueContentString = $this->getUniqueId('string_');
         $validAdditionalFactoryConfigurationFileContent =
             '<?php' . LF .