[BUGFIX] Move all typo3temp files below typo3temp/var or assets 96/46096/14
authorHelmut Hummel <info@helhum.io>
Tue, 19 Jan 2016 22:34:41 +0000 (23:34 +0100)
committerBenni Mack <benni@typo3.org>
Thu, 28 Jan 2016 06:35:16 +0000 (07:35 +0100)
The introduction of typo3temp/var and typo3temp/assets missed
essential changes.

* Files generated by tests
* Install Tool cleared wrong directory
* Some paths were only changed partially
* Some paths were changed to the public dir, but should in fact be private
* Some paths have been completely forgotten to be changed

Besides that, the introduction of new subfolder in typo3temp, we need
to allow arbitrary number of subfolders and remove the limitation of two
in GeneralUtility::writeFileToTypo3tempDir

Resolves: #72822
Related: #72479
Releases: master
Change-Id: Iedcfeb15376b041531e6f414e84e6445ad12c222
Reviewed-on: https://review.typo3.org/46096
Reviewed-by: Frank Naegler <frank.naegler@typo3.org>
Tested-by: Frank Naegler <frank.naegler@typo3.org>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
44 files changed:
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectItemsTest.php
typo3/sysext/core/Build/AcceptanceTests.yml
typo3/sysext/core/Build/FunctionalTestsBootstrap.php
typo3/sysext/core/Build/UnitTestsBootstrap.php
typo3/sysext/core/Classes/Compatibility/LoadedExtensionArrayElement.php
typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
typo3/sysext/core/Classes/Resource/OnlineMedia/Helpers/AbstractOnlineMediaHelper.php
typo3/sysext/core/Classes/Resource/OnlineMedia/Processing/PreviewProcessing.php
typo3/sysext/core/Classes/Utility/GeneralUtility.php
typo3/sysext/core/Tests/FunctionalTestCaseBootstrapUtility.php
typo3/sysext/core/Tests/Unit/Configuration/ConfigurationManagerTest.php
typo3/sysext/core/Tests/Unit/Http/StreamTest.php
typo3/sysext/core/Tests/Unit/Localization/LocalizationFactoryTest.php
typo3/sysext/core/Tests/Unit/Resource/Driver/LocalDriverTest.php
typo3/sysext/core/Tests/Unit/Resource/ResourceFactoryTest.php
typo3/sysext/core/Tests/Unit/Utility/ExtensionManagementUtilityTest.php
typo3/sysext/core/Tests/Unit/Utility/Fixtures/DeprecationUtilityFixture.php
typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
typo3/sysext/core/Tests/UnitTestCase.php
typo3/sysext/extensionmanager/Classes/Controller/ActionController.php
typo3/sysext/extensionmanager/Classes/Utility/FileHandlingUtility.php
typo3/sysext/extensionmanager/Tests/Unit/Utility/FileHandlingUtilityTest.php
typo3/sysext/extensionmanager/Tests/Unit/Utility/InstallUtilityTest.php
typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
typo3/sysext/frontend/Tests/Unit/Controller/Fixtures/renderedPage.html
typo3/sysext/impexp/Classes/ImportExport.php
typo3/sysext/indexed_search/Tests/Unit/IndexerTest.php
typo3/sysext/install/Classes/Controller/Action/Ajax/ExtensionCompatibilityTester.php
typo3/sysext/install/Classes/Controller/Action/Tool/CleanUp.php
typo3/sysext/install/Classes/Controller/Action/Tool/ImportantActions.php
typo3/sysext/install/Classes/Controller/Action/Tool/LoadExtensions.php
typo3/sysext/install/Classes/Controller/Action/Tool/TestSetup.php
typo3/sysext/install/Classes/FolderStructure/DefaultFactory.php
typo3/sysext/install/Classes/Report/InstallStatusReport.php
typo3/sysext/install/Classes/Service/ClearCacheService.php
typo3/sysext/install/Tests/Unit/Controller/Action/Ajax/ExtensionCompatibilityTesterTest.php
typo3/sysext/install/Tests/Unit/FolderStructure/AbstractNodeTest.php
typo3/sysext/install/Tests/Unit/FolderStructure/DirectoryNodeTest.php
typo3/sysext/install/Tests/Unit/FolderStructure/FileNodeTest.php
typo3/sysext/install/Tests/Unit/FolderStructure/LinkNodeTest.php
typo3/sysext/install/Tests/Unit/FolderStructure/RootNodeTest.php
typo3/sysext/install/Tests/Unit/FolderStructureTestCase.php
typo3/sysext/rsaauth/Classes/Backend/CommandLineBackend.php
typo3/sysext/t3editor/Resources/Private/tsref.xml

index 8bc4ce2..9c7c1e8 100644 (file)
@@ -1103,7 +1103,7 @@ class TcaSelectItemsTest extends UnitTestCase
      */
     public function addDataAddsFileItemsWithConfiguredFileFolder()
     {
-        $directory = $this->getUniqueId('typo3temp/test-') . '/';
+        $directory = $this->getUniqueId('typo3temp/var/tests/test-') . '/';
         $input = [
             'tableName' => 'aTable',
             'databaseRow' => [],
index 7c573cd..7627c82 100644 (file)
@@ -1,7 +1,7 @@
 actor: Tester
 paths:
     tests: Configuration/Acceptance
-    log: ../../../../typo3temp/codeception
+    log: ../../../../typo3temp/var/logs/codeception
     data: ''
     support: Configuration/Acceptance/Support
 settings:
index 23fa53c..d52ada0 100644 (file)
@@ -96,7 +96,8 @@ class FunctionalTestsBootstrap
      */
     protected function createNecessaryDirectoriesInDocumentRoot()
     {
-        $this->createDirectory(ORIGINAL_ROOT . 'typo3temp');
+        $this->createDirectory(ORIGINAL_ROOT . 'typo3temp/var/tests');
+        $this->createDirectory(ORIGINAL_ROOT . 'typo3temp/var/transient');
 
         return $this;
     }
index d41d734..32bdf12 100644 (file)
@@ -148,7 +148,8 @@ class UnitTestsBootstrap
     protected function createNecessaryDirectoriesInDocumentRoot()
     {
         $this->createDirectory(PATH_site . 'uploads');
-        $this->createDirectory(PATH_site . 'typo3temp');
+        $this->createDirectory(PATH_site . 'typo3temp/var/tests');
+        $this->createDirectory(PATH_site . 'typo3temp/var/transient');
         $this->createDirectory(PATH_site . 'typo3conf/ext');
 
         return $this;
index d70c2f6..08fcc62 100644 (file)
@@ -91,9 +91,9 @@ class LoadedExtensionArrayElement implements \IteratorAggregate, \ArrayAccess, \
                     $packageType = 'S';
                     $relativePackagePathToPathTypo3 = 'sysext/' . implode('/', array_slice($relativePackagePathToPathSiteSegments, 2));
                     break;
-                case 'typo3temp/test_ext':
+                case 'typo3temp/var/tests/test_ext':
                     $packageType = 'T';
-                    $relativePackagePathToPathTypo3 = '../typo3temp/test_ext/' . implode('/', array_slice($relativePackagePathToPathSiteSegments, 2));
+                    $relativePackagePathToPathTypo3 = '../typo3temp/var/tests/test_ext/' . implode('/', array_slice($relativePackagePathToPathSiteSegments, 2));
                     break;
             }
             if ($packageType !== null && $relativePackagePathToPathSite !== null && $relativePackagePathToPathTypo3 !== null) {
index 0649b37..3bcc909 100644 (file)
@@ -2036,8 +2036,8 @@ class GraphicalFunctions
      */
     public function randomName()
     {
-        $this->createTempSubDir('transient/');
-        return $this->tempPath . 'transient/' . md5(uniqid('', true));
+        $this->createTempSubDir('var/transient/');
+        return $this->tempPath . 'var/transient/' . md5(uniqid('', true));
     }
 
     /**
@@ -2250,8 +2250,8 @@ class GraphicalFunctions
             $this->imageMagickConvert_forceFileNameBody = '';
         }
         // Making the temporary filename:
-        $this->createTempSubDir('images/');
-        $output = $this->absPrefix . $this->tempPath . 'images/' . $this->filenamePrefix . $theOutputName . '.' . $newExt;
+        $this->createTempSubDir('assets/images/');
+        $output = $this->absPrefix . $this->tempPath . 'assets/images/' . $this->filenamePrefix . $theOutputName . '.' . $newExt;
         if ($this->dontCheckForExistingTempFile || !file_exists($output)) {
             $this->imageMagickExec($imagefile, $output, $command, $frame);
         }
@@ -2723,7 +2723,7 @@ class GraphicalFunctions
             $tmpPath = PATH_site . $this->tempPath;
         }
         // Making the temporary filename:
-        if (!@is_dir(($tmpPath . $dirName))) {
+        if (!@is_dir($tmpPath . $dirName)) {
             GeneralUtility::mkdir_deep($tmpPath . $dirName);
             return @is_dir($tmpPath . $dirName);
         }
index 0c80b0c..1961b60 100644 (file)
@@ -14,6 +14,7 @@ namespace TYPO3\CMS\Core\Resource\OnlineMedia\Helpers;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Core\Resource\DuplicationBehavior;
 use TYPO3\CMS\Core\Resource\File;
 use TYPO3\CMS\Core\Resource\Folder;
 use TYPO3\CMS\Core\Resource\Index\FileIndexRepository;
@@ -103,9 +104,25 @@ abstract class AbstractOnlineMediaHelper implements OnlineMediaHelperInterface
      */
     protected function createNewFile(Folder $targetFolder, $fileName, $onlineMediaId)
     {
-        $temporaryFile = PATH_site . 'typo3temp/assets/transient/' . GeneralUtility::tempnam('online_media');
+        $temporaryFile = GeneralUtility::tempnam('online_media');
         GeneralUtility::writeFileToTypo3tempDir($temporaryFile, $onlineMediaId);
-        return $targetFolder->addFile($temporaryFile, $fileName, 'changeName');
+        $file = $targetFolder->addFile($temporaryFile, $fileName, DuplicationBehavior::RENAME);
+        GeneralUtility::unlink_tempfile($temporaryFile);
+        return $file;
+    }
+
+    /**
+     * Get temporary folder path to save preview images
+     *
+     * @return string
+     */
+    protected function getTempFolderPath()
+    {
+        $path = PATH_site . 'typo3temp/var/transient/';
+        if (!is_dir($path)) {
+            GeneralUtility::mkdir_deep($path);
+        }
+        return $path;
     }
 
     /**
index 8096e70..de20415 100644 (file)
@@ -78,7 +78,7 @@ class PreviewProcessing
         if (empty($temporaryFileName) || !file_exists($temporaryFileName)) {
             return;
         }
-        $temporaryFileNameForResizedThumb = uniqid(PATH_site . 'typo3temp/assets/transient/online_media_' . $file->getHashedIdentifier()) . '.jpg';
+        $temporaryFileNameForResizedThumb = uniqid(PATH_site . 'typo3temp/var/transient/online_media_' . $file->getHashedIdentifier()) . '.jpg';
         switch ($taskType) {
             case 'Image.Preview':
                 // Merge custom configuration with default configuration
@@ -92,6 +92,7 @@ class PreviewProcessing
                 $this->cropScaleImage($temporaryFileName, $temporaryFileNameForResizedThumb, $configuration);
                 break;
         }
+        GeneralUtility::unlink_tempfile($temporaryFileName);
         if (is_file($temporaryFileNameForResizedThumb)) {
             $processedFile->setName($this->getTargetFileName($processedFile));
             list($width, $height) = getimagesize($temporaryFileNameForResizedThumb);
@@ -104,6 +105,7 @@ class PreviewProcessing
                 )
             );
             $processedFile->updateWithLocalFile($temporaryFileNameForResizedThumb);
+            GeneralUtility::unlink_tempfile($temporaryFileNameForResizedThumb);
 
             /** @var ProcessedFileRepository $processedFileRepository */
             $processedFileRepository = GeneralUtility::makeInstance(ProcessedFileRepository::class);
index 0ddaf9c..b203a23 100755 (executable)
@@ -2448,13 +2448,13 @@ class GeneralUtility
         // Checking if the "subdir" is found:
         $subdir = substr($fI['dirname'], strlen($dirName));
         if ($subdir) {
-            if (preg_match('/^[[:alnum:]_]+\\/$/', $subdir) || preg_match('/^[[:alnum:]_]+\\/[[:alnum:]_]+\\/$/', $subdir)) {
+            if (preg_match('#^(?:[[:alnum:]_]+/)+$#', $subdir)) {
                 $dirName .= $subdir;
                 if (!@is_dir($dirName)) {
                     static::mkdir_deep(PATH_site . 'typo3temp/', $subdir);
                 }
             } else {
-                return 'Subdir, "' . $subdir . '", was NOT on the form "[[:alnum:]_]/" or  "[[:alnum:]_]/[[:alnum:]_]/"';
+                return 'Subdir, "' . $subdir . '", was NOT on the form "[[:alnum:]_]/+"';
             }
         }
         // Checking dir-name again (sub-dir might have been created):
@@ -3725,7 +3725,7 @@ class GeneralUtility
      */
     public static function tempnam($filePrefix, $fileSuffix = '')
     {
-        $temporaryPath = PATH_site . 'typo3temp/';
+        $temporaryPath = PATH_site . 'typo3temp/var/transient/';
         if ($fileSuffix === '') {
             $tempFileName = static::fixWindowsFilePath(tempnam($temporaryPath, $filePrefix));
         } else {
index acac233..e885024 100644 (file)
@@ -58,6 +58,9 @@ class FunctionalTestCaseBootstrapUtility
         '',
         '/fileadmin',
         '/typo3temp',
+        '/typo3temp/var',
+        '/typo3temp/var/transient',
+        '/typo3temp/assets',
         '/typo3conf',
         '/typo3conf/ext',
         '/uploads'
@@ -84,7 +87,7 @@ class FunctionalTestCaseBootstrapUtility
      */
     public static function getInstancePath($testCaseClassName)
     {
-        return ORIGINAL_ROOT . 'typo3temp/functional-' . static::getInstanceIdentifier($testCaseClassName);
+        return ORIGINAL_ROOT . 'typo3temp/var/tests/functional-' . static::getInstanceIdentifier($testCaseClassName);
     }
 
     /**
index 06890c6..f9c5cc3 100644 (file)
@@ -51,7 +51,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getDefaultConfigurationExecutesDefinedDefaultConfigurationFile()
     {
-        $defaultConfigurationFile = PATH_site . 'typo3temp/' . $this->getUniqueId('defaultConfiguration');
+        $defaultConfigurationFile = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('defaultConfiguration');
         file_put_contents(
             $defaultConfigurationFile,
             '<?php throw new \RuntimeException(\'foo\', 1310203814); ?>'
@@ -71,7 +71,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getLocalConfigurationExecutesDefinedConfigurationFile()
     {
-        $configurationFile = PATH_site . 'typo3temp/' . $this->getUniqueId('localConfiguration');
+        $configurationFile = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('localConfiguration');
         file_put_contents(
             $configurationFile,
             '<?php throw new \RuntimeException(\'foo\', 1310203815); ?>'
@@ -370,7 +370,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('dummy'));
 
-        $directory = 'typo3temp/' . $this->getUniqueId('test_');
+        $directory = 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         $absoluteDirectory = PATH_site . $directory;
         mkdir($absoluteDirectory);
         chmod($absoluteDirectory, 0544);
@@ -399,7 +399,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('dummy'));
 
-        $file = 'typo3temp/' . $this->getUniqueId('test_');
+        $file = 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         $absoluteFile = PATH_site . $file;
         touch($absoluteFile);
         $this->testFilesToDelete[] = $absoluteFile;
@@ -423,18 +423,18 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('dummy'));
 
-        $directory = 'typo3temp/' . $this->getUniqueId('test_');
+        $directory = 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         $absoluteDirectory = PATH_site . $directory;
         mkdir($absoluteDirectory);
         $subject->_set('pathTypo3Conf', $absoluteDirectory);
 
-        $file1 = 'typo3temp/' . $this->getUniqueId('test_');
+        $file1 = 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         $absoluteFile1 = PATH_site . $file1;
         touch($absoluteFile1);
         $this->testFilesToDelete[] = $absoluteFile1;
         $subject->_set('localConfigurationFile', $absoluteFile1);
 
-        $file2 = 'typo3temp/' . $this->getUniqueId('test_');
+        $file2 = 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         $absoluteFile2 = PATH_site . $file2;
         touch($absoluteFile2);
         $this->testFilesToDelete[] = $absoluteFile2;
@@ -453,7 +453,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function writeLocalConfigurationWritesSortedContentToConfigurationFile()
     {
-        $configurationFile = PATH_site . 'typo3temp/' . $this->getUniqueId('localConfiguration');
+        $configurationFile = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('localConfiguration');
         if (!is_file($configurationFile)) {
             if (!$fh = fopen($configurationFile, 'wb')) {
                 $this->markTestSkipped('Can not create file ' . $configurationFile . '. Please check your write permissions.');
@@ -495,7 +495,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('dummy'));
 
-        $file = 'typo3temp/' . $this->getUniqueId('test_');
+        $file = 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         $absoluteFile = PATH_site . $file;
         touch($absoluteFile);
         $this->testFilesToDelete[] = $absoluteFile;
@@ -511,9 +511,9 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('writeLocalConfiguration'));
-        $subject->_set('localConfigurationFile', 'typo3temp/' . $this->getUniqueId('dummy_'));
+        $subject->_set('localConfigurationFile', 'typo3temp/var/tests/' . $this->getUniqueId('dummy_'));
 
-        $factoryConfigurationFile = 'typo3temp/' . $this->getUniqueId('test_') . '.php';
+        $factoryConfigurationFile = 'typo3temp/var/tests/' . $this->getUniqueId('test_') . '.php';
         $factoryConfigurationAbsoluteFile = PATH_site . $factoryConfigurationFile;
         $uniqueContentString = $this->getUniqueId('string_');
         $validFactoryConfigurationFileContent =
@@ -543,9 +543,9 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('writeLocalConfiguration'));
-        $subject->_set('localConfigurationFile', 'typo3temp/' . $this->getUniqueId('dummy_'));
+        $subject->_set('localConfigurationFile', 'typo3temp/var/tests/' . $this->getUniqueId('dummy_'));
 
-        $factoryConfigurationFile = 'typo3temp/' . $this->getUniqueId('test_') . '.php';
+        $factoryConfigurationFile = 'typo3temp/var/tests/' . $this->getUniqueId('test_') . '.php';
         $factoryConfigurationAbsoluteFile = PATH_site . $factoryConfigurationFile;
         $validFactoryConfigurationFileContent =
             '<?php' . LF .
@@ -557,7 +557,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->testFilesToDelete[] = $factoryConfigurationAbsoluteFile;
         $subject->_set('factoryConfigurationFile', $factoryConfigurationFile);
 
-        $additionalFactoryConfigurationFile = 'typo3temp/' . $this->getUniqueId('test_') . '.php';
+        $additionalFactoryConfigurationFile = 'typo3temp/var/tests/' . $this->getUniqueId('test_') . '.php';
         $additionalFactoryConfigurationAbsoluteFile = PATH_site . $additionalFactoryConfigurationFile;
         $uniqueContentString = $this->getUniqueId('string_');
         $validAdditionalFactoryConfigurationFileContent =
index 0577fff..1a5de80 100644 (file)
@@ -56,7 +56,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function isReadableReturnsFalseIfStreamIsNotReadable()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         touch($fileName);
         $this->testFilesToDelete[] = $fileName;
         $stream = new Stream($fileName, 'w');
@@ -106,7 +106,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function toStringSerializationReturnsEmptyStringWhenStreamIsNotReadable()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         touch($fileName);
         $this->testFilesToDelete[] = $fileName;
         file_put_contents($fileName, 'FOO BAR');
@@ -120,7 +120,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function closeClosesResource()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         touch($fileName);
         $this->testFilesToDelete[] = $fileName;
         $resource = fopen($fileName, 'wb+');
@@ -134,7 +134,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function closeUnsetsResource()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         touch($fileName);
         $this->testFilesToDelete[] = $fileName;
         $resource = fopen($fileName, 'wb+');
@@ -149,7 +149,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function closeDoesNothingAfterDetach()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         touch($fileName);
         $this->testFilesToDelete[] = $fileName;
         $resource = fopen($fileName, 'wb+');
@@ -175,7 +175,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function tellReportsCurrentPositionInResource()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         $this->testFilesToDelete[] = $fileName;
         file_put_contents($fileName, 'FOO BAR');
         $resource = fopen($fileName, 'wb+');
@@ -191,7 +191,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function tellRaisesExceptionIfResourceIsDetached()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         $this->testFilesToDelete[] = $fileName;
         file_put_contents($fileName, 'FOO BAR');
         $resource = fopen($fileName, 'wb+');
@@ -208,7 +208,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function eofReportsFalseWhenNotAtEndOfStream()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         $this->testFilesToDelete[] = $fileName;
         file_put_contents($fileName, 'FOO BAR');
         $resource = fopen($fileName, 'wb+');
@@ -223,7 +223,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function eofReportsTrueWhenAtEndOfStream()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         $this->testFilesToDelete[] = $fileName;
         file_put_contents($fileName, 'FOO BAR');
         $resource = fopen($fileName, 'wb+');
@@ -240,7 +240,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function eofReportsTrueWhenStreamIsDetached()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         $this->testFilesToDelete[] = $fileName;
         file_put_contents($fileName, 'FOO BAR');
         $resource = fopen($fileName, 'wb+');
@@ -256,7 +256,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function isSeekableReturnsTrueForReadableStreams()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         $this->testFilesToDelete[] = $fileName;
         file_put_contents($fileName, 'FOO BAR');
         $resource = fopen($fileName, 'wb+');
@@ -269,7 +269,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function isSeekableReturnsFalseForDetachedStreams()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         $this->testFilesToDelete[] = $fileName;
         file_put_contents($fileName, 'FOO BAR');
         $resource = fopen($fileName, 'wb+');
@@ -283,7 +283,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function seekAdvancesToGivenOffsetOfStream()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         $this->testFilesToDelete[] = $fileName;
         file_put_contents($fileName, 'FOO BAR');
         $resource = fopen($fileName, 'wb+');
@@ -297,7 +297,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function rewindResetsToStartOfStream()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         $this->testFilesToDelete[] = $fileName;
         file_put_contents($fileName, 'FOO BAR');
         $resource = fopen($fileName, 'wb+');
@@ -312,7 +312,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function seekRaisesExceptionWhenStreamIsDetached()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         $this->testFilesToDelete[] = $fileName;
         file_put_contents($fileName, 'FOO BAR');
         $resource = fopen($fileName, 'wb+');
@@ -327,7 +327,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function isWritableReturnsFalseWhenStreamIsDetached()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         $this->testFilesToDelete[] = $fileName;
         file_put_contents($fileName, 'FOO BAR');
         $resource = fopen($fileName, 'wb+');
@@ -341,7 +341,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function writeRaisesExceptionWhenStreamIsDetached()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         $this->testFilesToDelete[] = $fileName;
         file_put_contents($fileName, 'FOO BAR');
         $resource = fopen($fileName, 'wb+');
@@ -356,7 +356,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function isReadableReturnsFalseWhenStreamIsDetached()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         $this->testFilesToDelete[] = $fileName;
         file_put_contents($fileName, 'FOO BAR');
         $resource = fopen($fileName, 'wb+');
@@ -370,7 +370,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function readRaisesExceptionWhenStreamIsDetached()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         $this->testFilesToDelete[] = $fileName;
         file_put_contents($fileName, 'FOO BAR');
         $resource = fopen($fileName, 'r');
@@ -385,7 +385,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function readReturnsEmptyStringWhenAtEndOfFile()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         $this->testFilesToDelete[] = $fileName;
         file_put_contents($fileName, 'FOO BAR');
         $resource = fopen($fileName, 'r');
@@ -401,7 +401,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getContentsReturnsEmptyStringIfStreamIsNotReadable()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         $this->testFilesToDelete[] = $fileName;
         file_put_contents($fileName, 'FOO BAR');
         $resource = fopen($fileName, 'w');
@@ -444,7 +444,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function attachWithResourceAttachesResource()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         touch($fileName);
         $this->testFilesToDelete[] = $fileName;
         $resource = fopen($fileName, 'r+');
@@ -461,7 +461,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function attachWithStringRepresentingResourceCreatesAndAttachesResource()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         touch($fileName);
         $this->testFilesToDelete[] = $fileName;
         $this->stream->attach($fileName);
@@ -479,7 +479,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getContentsShouldGetFullStreamContents()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         touch($fileName);
         $this->testFilesToDelete[] = $fileName;
         $resource = fopen($fileName, 'r+');
@@ -498,7 +498,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getContentsShouldReturnStreamContentsFromCurrentPointer()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         touch($fileName);
         $this->testFilesToDelete[] = $fileName;
         $resource = fopen($fileName, 'r+');
@@ -517,7 +517,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getMetadataReturnsAllMetadataWhenNoKeyPresent()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         touch($fileName);
         $this->testFilesToDelete[] = $fileName;
         $resource = fopen($fileName, 'r+');
@@ -534,7 +534,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getMetadataReturnsDataForSpecifiedKey()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         touch($fileName);
         $this->testFilesToDelete[] = $fileName;
         $resource = fopen($fileName, 'r+');
@@ -553,7 +553,7 @@ class StreamTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getMetadataReturnsNullIfNoDataExistsForKey()
     {
-        $fileName = PATH_site . 'typo3temp/' . $this->getUniqueId('test_');
+        $fileName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         touch($fileName);
         $this->testFilesToDelete[] = $fileName;
         $resource = fopen($fileName, 'r+');
index 5efe62b..4587ee1 100644 (file)
@@ -39,7 +39,7 @@ class LocalizationFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                                        </languageKey>
                                </data>
                        </T3locallang>';
-        $file = PATH_site . 'typo3temp/' . $unique . '.xml';
+        $file = PATH_site . 'typo3temp/var/tests/' . $unique . '.xml';
         GeneralUtility::writeFileToTypo3tempDir($file, $xml);
         // Make sure there is no cached version of the label
         GeneralUtility::makeInstance(\TYPO3\CMS\Core\Cache\CacheManager::class)->getCache('l10n')->flush();
index a51c366..2fceb28 100644 (file)
@@ -76,7 +76,7 @@ class LocalDriverTest extends \TYPO3\CMS\Core\Tests\Unit\Resource\BaseTestCase
      */
     protected function createRealTestdir()
     {
-        $basedir = PATH_site . 'typo3temp/' . $this->getUniqueId('fal-test-');
+        $basedir = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('fal-test-');
         mkdir($basedir);
         $this->testDirs[] = $basedir;
         return $basedir;
@@ -138,7 +138,7 @@ class LocalDriverTest extends \TYPO3\CMS\Core\Tests\Unit\Resource\BaseTestCase
         // This would cause problems if you fill "/fileadmin/" into the base path field of a sys_file_storage record and select "relative" as path type
         $relativeDriverConfiguration = array(
             'pathType' => 'relative',
-            'basePath' => '/typo3temp/',
+            'basePath' => '/typo3temp/var/tests/',
         );
         $basePath = $subject->_call('calculateBasePath', $relativeDriverConfiguration);
 
@@ -154,7 +154,7 @@ class LocalDriverTest extends \TYPO3\CMS\Core\Tests\Unit\Resource\BaseTestCase
 
         // This test checks if "/../" are properly filtered out (i.e. from "Base path" field of sys_file_storage)
         $relativeDriverConfiguration = array(
-            'basePath' => PATH_site . 'typo3temp/../typo3temp/',
+            'basePath' => PATH_site . 'typo3temp/var/tests/../../../typo3temp/var/tests/',
         );
         $basePath = $subject->_call('calculateBasePath', $relativeDriverConfiguration);
 
@@ -944,7 +944,7 @@ class LocalDriverTest extends \TYPO3\CMS\Core\Tests\Unit\Resource\BaseTestCase
         $subject = $this->createDriver();
         $filePath = GeneralUtility::fixWindowsFilePath($subject->_call('copyFileToTemporaryPath', '/someDir/someFile'));
         $this->testFilesToDelete[] = $filePath;
-        $this->assertContains('/typo3temp/', $filePath);
+        $this->assertContains('/typo3temp/var/transient/', $filePath);
         $this->assertEquals($fileContents, file_get_contents($filePath));
     }
 
index bfd108c..0369a49 100644 (file)
@@ -135,7 +135,7 @@ class ResourceFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function retrieveFileOrFolderObjectReturnsFileIfPathIsGiven()
     {
         $this->subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Resource\ResourceFactory::class, array('getFileObjectFromCombinedIdentifier'), array(), '', false);
-        $filename = 'typo3temp/4711.txt';
+        $filename = 'typo3temp/var/tests/4711.txt';
         $this->subject->expects($this->once())
             ->method('getFileObjectFromCombinedIdentifier')
             ->with($filename);
index af70225..dc5f207 100644 (file)
@@ -65,7 +65,7 @@ class ExtensionManagementUtilityTest extends UnitTestCase
      */
     protected function createMockPackageManagerWithMockPackage($packageKey, $packageMethods = array('getPackagePath', 'getPackageKey'))
     {
-        $packagePath = PATH_site . 'typo3temp/' . $packageKey . '/';
+        $packagePath = PATH_site . 'typo3temp/var/tests/' . $packageKey . '/';
         GeneralUtility::mkdir_deep($packagePath);
         $this->testFilesToDelete[] = $packagePath;
         $package = $this->getMockBuilder(Package::class)
@@ -1571,7 +1571,7 @@ class ExtensionManagementUtilityTest extends UnitTestCase
     public function createExtTablesCacheEntryWritesCacheEntryWithContentOfLoadedExtensionExtTables()
     {
         $extensionName = $this->getUniqueId('foo');
-        $extTablesLocation = PATH_site . 'typo3temp/' . $this->getUniqueId('test_ext_tables') . '.php';
+        $extTablesLocation = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_ext_tables') . '.php';
         $this->testFilesToDelete[] = $extTablesLocation;
         $uniqueStringInTables = $this->getUniqueId('foo');
         file_put_contents($extTablesLocation, "<?php\n\n$uniqueStringInTables\n\n?>");
index a74047c..f316a2f 100644 (file)
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Utility\DeprecationUtility;
  */
 class DeprecationUtilityFixture extends DeprecationUtility
 {
-    const DEPRECATION_LOG_PATH = 'typo3temp/test_deprecation/test.log';
+    const DEPRECATION_LOG_PATH = 'typo3temp/var/tests/test_deprecation/test.log';
 
 
     /**
index 9598dbf..51832d8 100644 (file)
@@ -79,7 +79,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function getVirtualTestDir($prefix = 'root_')
     {
         $root = vfsStream::setup();
-        $path = $root->url() . '/typo3temp/' . $this->getUniqueId($prefix);
+        $path = $root->url() . '/typo3temp/var/tests/' . $this->getUniqueId($prefix);
         GeneralUtility::mkdir_deep($path);
         return $path;
     }
@@ -2219,7 +2219,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function unlink_tempfileRemovesValidFileInTypo3temp()
     {
         $fixtureFile = __DIR__ . '/Fixtures/clear.gif';
-        $testFilename = PATH_site . 'typo3temp/' . $this->getUniqueId('test_') . '.gif';
+        $testFilename = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_') . '.gif';
         @copy($fixtureFile, $testFilename);
         GeneralUtility::unlink_tempfile($testFilename);
         $fileExists = file_exists($testFilename);
@@ -2232,7 +2232,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function unlink_tempfileRemovesHiddenFile()
     {
         $fixtureFile = __DIR__ . '/Fixtures/clear.gif';
-        $testFilename = PATH_site . 'typo3temp/' . $this->getUniqueId('.test_') . '.gif';
+        $testFilename = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('.test_') . '.gif';
         @copy($fixtureFile, $testFilename);
         GeneralUtility::unlink_tempfile($testFilename);
         $fileExists = file_exists($testFilename);
@@ -2245,7 +2245,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function unlink_tempfileReturnsTrueIfFileWasRemoved()
     {
         $fixtureFile = __DIR__ . '/Fixtures/clear.gif';
-        $testFilename = PATH_site . 'typo3temp/' . $this->getUniqueId('test_') . '.gif';
+        $testFilename = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_') . '.gif';
         @copy($fixtureFile, $testFilename);
         $returnValue = GeneralUtility::unlink_tempfile($testFilename);
         $this->assertTrue($returnValue);
@@ -2256,7 +2256,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function unlink_tempfileReturnsNullIfFileDoesNotExist()
     {
-        $returnValue = GeneralUtility::unlink_tempfile(PATH_site . 'typo3temp/' . $this->getUniqueId('i_do_not_exist'));
+        $returnValue = GeneralUtility::unlink_tempfile(PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('i_do_not_exist'));
         $this->assertNull($returnValue);
     }
 
@@ -2896,7 +2896,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             $this->markTestSkipped('fixPermissions() tests not available on Windows');
         }
         // Create and prepare test file
-        $filename = PATH_site . 'typo3temp/../typo3temp/' . $this->getUniqueId('test_');
+        $filename = PATH_site . 'typo3temp/var/tests/../../../typo3temp/var/tests/' . $this->getUniqueId('test_');
         // Set target permissions and run method
         $GLOBALS['TYPO3_CONF_VARS']['SYS']['fileCreateMask'] = '0660';
         $fixPermissionsResult = GeneralUtility::fixPermissions($filename);
@@ -2911,7 +2911,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         if (TYPO3_OS === 'WIN') {
             $this->markTestSkipped('fixPermissions() tests not available on Windows');
         }
-        $filename = 'typo3temp/' . $this->getUniqueId('test_');
+        $filename = 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         GeneralUtility::writeFileToTypo3tempDir(PATH_site . $filename, '42');
         $this->testFilesToDelete[] = PATH_site . $filename;
         chmod(PATH_site . $filename, 482);
@@ -3087,7 +3087,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function mkdirDeepCreatesSubdirectoriesRecursive()
     {
-        $directory = $this->getVirtualTestDir() . '/typo3temp/' . $this->getUniqueId('test_');
+        $directory = $this->getVirtualTestDir() . 'typo3temp/var/tests/' . $this->getUniqueId('test_');
         $subDirectory = $directory . '/foo';
         GeneralUtility::mkdir_deep($subDirectory);
         $this->assertTrue(is_dir($subDirectory));
@@ -3131,11 +3131,11 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $directory = $this->getUniqueId('mkdirdeeptest_');
         $oldUmask = umask(19);
         $GLOBALS['TYPO3_CONF_VARS']['SYS']['folderCreateMask'] = '0777';
-        GeneralUtility::mkdir_deep(PATH_site . 'typo3temp/', $directory);
-        $this->testFilesToDelete[] = PATH_site . 'typo3temp/' . $directory;
+        GeneralUtility::mkdir_deep(PATH_site . 'typo3temp/var/tests/', $directory);
+        $this->testFilesToDelete[] = PATH_site . 'typo3temp/var/tests/' . $directory;
         clearstatcache();
         umask($oldUmask);
-        $this->assertEquals('777', substr(decoct(fileperms(PATH_site . 'typo3temp/' . $directory)), -3, 3));
+        $this->assertEquals('777', substr(decoct(fileperms(PATH_site . 'typo3temp/var/tests/' . $directory)), -3, 3));
     }
 
     /**
@@ -3150,11 +3150,11 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $subDirectory = $directory . '/bar';
         $GLOBALS['TYPO3_CONF_VARS']['SYS']['folderCreateMask'] = '0777';
         $oldUmask = umask(19);
-        GeneralUtility::mkdir_deep(PATH_site . 'typo3temp/', $subDirectory);
-        $this->testFilesToDelete[] = PATH_site . 'typo3temp/' . $directory;
+        GeneralUtility::mkdir_deep(PATH_site . 'typo3temp/var/tests/', $subDirectory);
+        $this->testFilesToDelete[] = PATH_site . 'typo3temp/var/tests/' . $directory;
         clearstatcache();
         umask($oldUmask);
-        $this->assertEquals('777', substr(decoct(fileperms(PATH_site . 'typo3temp/' . $directory)), -3, 3));
+        $this->assertEquals('777', substr(decoct(fileperms(PATH_site . 'typo3temp/var/tests/' . $directory)), -3, 3));
     }
 
     /**
@@ -3165,7 +3165,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         if (TYPO3_OS === 'WIN') {
             $this->markTestSkipped('mkdirDeepDoesNotChangePermissionsOfExistingSubDirectories() test not available on Windows.');
         }
-        $baseDirectory = PATH_site . 'typo3temp/';
+        $baseDirectory = PATH_site . 'typo3temp/var/tests/';
         $existingDirectory = $this->getUniqueId('test_existing_') . '/';
         $newSubDirectory = $this->getUniqueId('test_new_');
         @mkdir(($baseDirectory . $existingDirectory));
@@ -3184,10 +3184,10 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         if ($swapGroup !== false) {
             $GLOBALS['TYPO3_CONF_VARS']['SYS']['createGroup'] = $swapGroup;
             $directory = $this->getUniqueId('mkdirdeeptest_');
-            GeneralUtility::mkdir_deep(PATH_site . 'typo3temp/', $directory);
-            $this->testFilesToDelete[] = PATH_site . 'typo3temp/' . $directory;
+            GeneralUtility::mkdir_deep(PATH_site . 'typo3temp/var/tests/', $directory);
+            $this->testFilesToDelete[] = PATH_site . 'typo3temp/var/tests/' . $directory;
             clearstatcache();
-            $resultDirectoryGroup = filegroup(PATH_site . 'typo3temp/' . $directory);
+            $resultDirectoryGroup = filegroup(PATH_site . 'typo3temp/var/tests/' . $directory);
             $this->assertEquals($resultDirectoryGroup, $swapGroup);
         }
     }
@@ -3202,10 +3202,10 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             $GLOBALS['TYPO3_CONF_VARS']['SYS']['createGroup'] = $swapGroup;
             $directory = $this->getUniqueId('mkdirdeeptest_');
             $subDirectory = $directory . '/bar';
-            GeneralUtility::mkdir_deep(PATH_site . 'typo3temp/', $subDirectory);
-            $this->testFilesToDelete[] = PATH_site . 'typo3temp/' . $directory;
+            GeneralUtility::mkdir_deep(PATH_site . 'typo3temp/var/tests/', $subDirectory);
+            $this->testFilesToDelete[] = PATH_site . 'typo3temp/var/tests/' . $directory;
             clearstatcache();
-            $resultDirectoryGroup = filegroup(PATH_site . 'typo3temp/' . $directory);
+            $resultDirectoryGroup = filegroup(PATH_site . 'typo3temp/var/tests/' . $directory);
             $this->assertEquals($resultDirectoryGroup, $swapGroup);
         }
     }
@@ -3220,10 +3220,10 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             $GLOBALS['TYPO3_CONF_VARS']['SYS']['createGroup'] = $swapGroup;
             $directory = $this->getUniqueId('mkdirdeeptest_');
             $subDirectory = $directory . '/bar';
-            GeneralUtility::mkdir_deep(PATH_site . 'typo3temp/', $subDirectory);
-            $this->testFilesToDelete[] = PATH_site . 'typo3temp/' . $directory;
+            GeneralUtility::mkdir_deep(PATH_site . 'typo3temp/var/tests/', $subDirectory);
+            $this->testFilesToDelete[] = PATH_site . 'typo3temp/var/tests/' . $directory;
             clearstatcache();
-            $resultDirectoryGroup = filegroup(PATH_site . 'typo3temp/' . $directory);
+            $resultDirectoryGroup = filegroup(PATH_site . 'typo3temp/var/tests/' . $directory);
             $this->assertEquals($resultDirectoryGroup, $swapGroup);
         }
     }
@@ -3279,7 +3279,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function rmdirRemovesFile()
     {
-        $file = PATH_site . 'typo3temp/' . $this->getUniqueId('file_');
+        $file = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('file_');
         touch($file);
         GeneralUtility::rmdir($file);
         $this->assertFalse(file_exists($file));
@@ -3290,7 +3290,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function rmdirReturnTrueIfFileWasRemoved()
     {
-        $file = PATH_site . 'typo3temp/' . $this->getUniqueId('file_');
+        $file = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('file_');
         touch($file);
         $this->assertTrue(GeneralUtility::rmdir($file));
     }
@@ -3300,7 +3300,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function rmdirReturnFalseIfNoFileWasRemoved()
     {
-        $file = PATH_site . 'typo3temp/' . $this->getUniqueId('file_');
+        $file = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('file_');
         $this->assertFalse(GeneralUtility::rmdir($file));
     }
 
@@ -3309,7 +3309,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function rmdirRemovesDirectory()
     {
-        $directory = PATH_site . 'typo3temp/' . $this->getUniqueId('directory_');
+        $directory = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('directory_');
         mkdir($directory);
         GeneralUtility::rmdir($directory);
         $this->assertFalse(file_exists($directory));
@@ -3320,7 +3320,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function rmdirRemovesDirectoryWithTrailingSlash()
     {
-        $directory = PATH_site . 'typo3temp/' . $this->getUniqueId('directory_') . '/';
+        $directory = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('directory_') . '/';
         mkdir($directory);
         GeneralUtility::rmdir($directory);
         $this->assertFalse(file_exists($directory));
@@ -3331,7 +3331,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function rmdirDoesNotRemoveDirectoryWithFilesAndReturnsFalseIfRecursiveDeletionIsOff()
     {
-        $directory = PATH_site . 'typo3temp/' . $this->getUniqueId('directory_') . '/';
+        $directory = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('directory_') . '/';
         mkdir($directory);
         $file = $this->getUniqueId('file_');
         touch($directory . $file);
@@ -3347,7 +3347,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function rmdirRemovesDirectoriesRecursiveAndReturnsTrue()
     {
-        $directory = PATH_site . 'typo3temp/' . $this->getUniqueId('directory_') . '/';
+        $directory = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('directory_') . '/';
         mkdir($directory);
         mkdir($directory . 'sub/');
         touch($directory . 'sub/file');
@@ -3364,10 +3364,10 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         if (TYPO3_OS === 'WIN') {
             $this->markTestSkipped('Test not available on Windows OS.');
         }
-        $existingDirectory = PATH_site . 'typo3temp/' . $this->getUniqueId('notExists_') . '/';
+        $existingDirectory = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('notExists_') . '/';
         mkdir($existingDirectory);
         $this->testFilesToDelete[] = $existingDirectory;
-        $symlinkName = PATH_site . 'typo3temp/' . $this->getUniqueId('link_');
+        $symlinkName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('link_');
         symlink($existingDirectory, $symlinkName);
         GeneralUtility::rmdir($symlinkName, true);
         $this->assertFalse(is_link($symlinkName));
@@ -3381,8 +3381,8 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         if (TYPO3_OS === 'WIN') {
             $this->markTestSkipped('Test not available on Windows OS.');
         }
-        $notExistingDirectory = PATH_site . 'typo3temp/' . $this->getUniqueId('notExists_') . '/';
-        $symlinkName = PATH_site . 'typo3temp/' . $this->getUniqueId('link_');
+        $notExistingDirectory = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('notExists_') . '/';
+        $symlinkName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('link_');
         symlink($notExistingDirectory, $symlinkName);
         GeneralUtility::rmdir($symlinkName, true);
         $this->assertFalse(is_link($symlinkName));
@@ -3396,8 +3396,8 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         if (TYPO3_OS === 'WIN') {
             $this->markTestSkipped('Test not available on Windows OS.');
         }
-        $notExistingFile = PATH_site . 'typo3temp/' . $this->getUniqueId('notExists_');
-        $symlinkName = PATH_site . 'typo3temp/' . $this->getUniqueId('link_');
+        $notExistingFile = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('notExists_');
+        $symlinkName = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('link_');
         symlink($notExistingFile, $symlinkName);
         GeneralUtility::rmdir($symlinkName, true);
         $this->assertFalse(is_link($symlinkName));
@@ -3624,7 +3624,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             ),
             // Now test against some real world examples
             array(
-                '/opt/local/bin/gm.exe convert +profile \'*\' -geometry 170x136!  -negate "C:/Users/Someuser.Domain/Documents/Htdocs/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]" "C:/Users/Someuser.Domain/Documents/Htdocs/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif"',
+                '/opt/local/bin/gm.exe convert +profile \'*\' -geometry 170x136!  -negate "C:/Users/Someuser.Domain/Documents/Htdocs/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]" "C:/Users/Someuser.Domain/Documents/Htdocs/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif"',
                 array(
                     '/opt/local/bin/gm.exe',
                     'convert',
@@ -3633,8 +3633,8 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                     '-geometry',
                     '170x136!',
                     '-negate',
-                    '"C:/Users/Someuser.Domain/Documents/Htdocs/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]"',
-                    '"C:/Users/Someuser.Domain/Documents/Htdocs/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif"'
+                    '"C:/Users/Someuser.Domain/Documents/Htdocs/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]"',
+                    '"C:/Users/Someuser.Domain/Documents/Htdocs/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif"'
                 ),
                 array(
                     '/opt/local/bin/gm.exe',
@@ -3644,12 +3644,12 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                     '-geometry',
                     '170x136!',
                     '-negate',
-                    'C:/Users/Someuser.Domain/Documents/Htdocs/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]',
-                    'C:/Users/Someuser.Domain/Documents/Htdocs/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif'
+                    'C:/Users/Someuser.Domain/Documents/Htdocs/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]',
+                    'C:/Users/Someuser.Domain/Documents/Htdocs/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif'
                 )
             ),
             array(
-                'C:/opt/local/bin/gm.exe convert +profile \'*\' -geometry 170x136!  -negate "C:/Program Files/Apache2/htdocs/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]" "C:/Program Files/Apache2/htdocs/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif"',
+                'C:/opt/local/bin/gm.exe convert +profile \'*\' -geometry 170x136!  -negate "C:/Program Files/Apache2/htdocs/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]" "C:/Program Files/Apache2/htdocs/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif"',
                 array(
                     'C:/opt/local/bin/gm.exe',
                     'convert',
@@ -3658,8 +3658,8 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                     '-geometry',
                     '170x136!',
                     '-negate',
-                    '"C:/Program Files/Apache2/htdocs/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]"',
-                    '"C:/Program Files/Apache2/htdocs/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif"'
+                    '"C:/Program Files/Apache2/htdocs/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]"',
+                    '"C:/Program Files/Apache2/htdocs/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif"'
                 ),
                 array(
                     'C:/opt/local/bin/gm.exe',
@@ -3669,12 +3669,12 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                     '-geometry',
                     '170x136!',
                     '-negate',
-                    'C:/Program Files/Apache2/htdocs/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]',
-                    'C:/Program Files/Apache2/htdocs/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif'
+                    'C:/Program Files/Apache2/htdocs/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]',
+                    'C:/Program Files/Apache2/htdocs/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif'
                 )
             ),
             array(
-                '/usr/bin/gm convert +profile \'*\' -geometry 170x136!  -negate "/Shared Items/Data/Projects/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]" "/Shared Items/Data/Projects/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif"',
+                '/usr/bin/gm convert +profile \'*\' -geometry 170x136!  -negate "/Shared Items/Data/Projects/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]" "/Shared Items/Data/Projects/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif"',
                 array(
                     '/usr/bin/gm',
                     'convert',
@@ -3683,8 +3683,8 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                     '-geometry',
                     '170x136!',
                     '-negate',
-                    '"/Shared Items/Data/Projects/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]"',
-                    '"/Shared Items/Data/Projects/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif"'
+                    '"/Shared Items/Data/Projects/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]"',
+                    '"/Shared Items/Data/Projects/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif"'
                 ),
                 array(
                     '/usr/bin/gm',
@@ -3694,12 +3694,12 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                     '-geometry',
                     '170x136!',
                     '-negate',
-                    '/Shared Items/Data/Projects/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]',
-                    '/Shared Items/Data/Projects/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif'
+                    '/Shared Items/Data/Projects/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]',
+                    '/Shared Items/Data/Projects/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif'
                 )
             ),
             array(
-                '/usr/bin/gm convert +profile \'*\' -geometry 170x136!  -negate "/Network/Servers/server01.internal/Projects/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]" "/Network/Servers/server01.internal/Projects/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif"',
+                '/usr/bin/gm convert +profile \'*\' -geometry 170x136!  -negate "/Network/Servers/server01.internal/Projects/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]" "/Network/Servers/server01.internal/Projects/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif"',
                 array(
                     '/usr/bin/gm',
                     'convert',
@@ -3708,8 +3708,8 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                     '-geometry',
                     '170x136!',
                     '-negate',
-                    '"/Network/Servers/server01.internal/Projects/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]"',
-                    '"/Network/Servers/server01.internal/Projects/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif"'
+                    '"/Network/Servers/server01.internal/Projects/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]"',
+                    '"/Network/Servers/server01.internal/Projects/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif"'
                 ),
                 array(
                     '/usr/bin/gm',
@@ -3719,12 +3719,12 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                     '-geometry',
                     '170x136!',
                     '-negate',
-                    '/Network/Servers/server01.internal/Projects/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]',
-                    '/Network/Servers/server01.internal/Projects/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif'
+                    '/Network/Servers/server01.internal/Projects/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]',
+                    '/Network/Servers/server01.internal/Projects/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif'
                 )
             ),
             array(
-                '/usr/bin/gm convert +profile \'*\' -geometry 170x136!  -negate \'/Network/Servers/server01.internal/Projects/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]\' \'/Network/Servers/server01.internal/Projects/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif\'',
+                '/usr/bin/gm convert +profile \'*\' -geometry 170x136!  -negate \'/Network/Servers/server01.internal/Projects/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]\' \'/Network/Servers/server01.internal/Projects/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif\'',
                 array(
                     '/usr/bin/gm',
                     'convert',
@@ -3733,8 +3733,8 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                     '-geometry',
                     '170x136!',
                     '-negate',
-                    '\'/Network/Servers/server01.internal/Projects/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]\'',
-                    '\'/Network/Servers/server01.internal/Projects/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif\''
+                    '\'/Network/Servers/server01.internal/Projects/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]\'',
+                    '\'/Network/Servers/server01.internal/Projects/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif\''
                 ),
                 array(
                     '/usr/bin/gm',
@@ -3744,8 +3744,8 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                     '-geometry',
                     '170x136!',
                     '-negate',
-                    '/Network/Servers/server01.internal/Projects/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]',
-                    '/Network/Servers/server01.internal/Projects/typo3temp/temp/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif'
+                    '/Network/Servers/server01.internal/Projects/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif[0]',
+                    '/Network/Servers/server01.internal/Projects/typo3temp/var/transient/61401f5c16c63d58e1d92e8a2449f2fe_maskNT.gif'
                 )
             )
         );
@@ -3774,7 +3774,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function splitFileRefReturnsFileTypeNotForFolders()
     {
         $directoryName = $this->getUniqueId('test_') . '.com';
-        $directoryPath = PATH_site . 'typo3temp/';
+        $directoryPath = PATH_site . 'typo3temp/var/tests/';
         $directory = $directoryPath . $directoryName;
         mkdir($directory, octdec($GLOBALS['TYPO3_CONF_VARS']['SYS']['folderCreateMask']));
         $fileInfo = GeneralUtility::split_fileref($directory);
@@ -4254,12 +4254,12 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function copyDirectoryCopiesFilesAndDirectoriesWithRelativePaths()
     {
-        $sourceDirectory = 'typo3temp/' . $this->getUniqueId('test_') . '/';
+        $sourceDirectory = 'typo3temp/var/tests/' . $this->getUniqueId('test_') . '/';
         $absoluteSourceDirectory = PATH_site . $sourceDirectory;
         $this->testFilesToDelete[] = $absoluteSourceDirectory;
         GeneralUtility::mkdir($absoluteSourceDirectory);
 
-        $targetDirectory = 'typo3temp/' . $this->getUniqueId('test_') . '/';
+        $targetDirectory = 'typo3temp/var/tests/' . $this->getUniqueId('test_') . '/';
         $absoluteTargetDirectory = PATH_site . $targetDirectory;
         $this->testFilesToDelete[] = $absoluteTargetDirectory;
         GeneralUtility::mkdir($absoluteTargetDirectory);
@@ -4279,12 +4279,12 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function copyDirectoryCopiesFilesAndDirectoriesWithAbsolutePaths()
     {
-        $sourceDirectory = 'typo3temp/' . $this->getUniqueId('test_') . '/';
+        $sourceDirectory = 'typo3temp/var/tests/' . $this->getUniqueId('test_') . '/';
         $absoluteSourceDirectory = PATH_site . $sourceDirectory;
         $this->testFilesToDelete[] = $absoluteSourceDirectory;
         GeneralUtility::mkdir($absoluteSourceDirectory);
 
-        $targetDirectory = 'typo3temp/' . $this->getUniqueId('test_') . '/';
+        $targetDirectory = 'typo3temp/var/tests/' . $this->getUniqueId('test_') . '/';
         $absoluteTargetDirectory = PATH_site . $targetDirectory;
         $this->testFilesToDelete[] = $absoluteTargetDirectory;
         GeneralUtility::mkdir($absoluteTargetDirectory);
@@ -4314,7 +4314,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $GLOBALS['TYPO3_CONF_VARS']['SYS']['systemLogLevel'] = 0;
         $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_div.php']['systemLogInit'] = true;
         unset($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_div.php']['systemLog']);
-        $testLogFilename = PATH_site . 'typo3temp/' . $this->getUniqueId('test_') . '.txt';
+        $testLogFilename = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_') . '.txt';
         $GLOBALS['TYPO3_CONF_VARS']['SYS']['systemLog'] = 'file,' . $testLogFilename . ',0';
         $GLOBALS['TYPO3_CONF_VARS']['SYS']['fileCreateMask'] = '0777';
         // Call method, get actual permissions and clean up
@@ -4557,7 +4557,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getAllFilesAndFoldersInPathReturnsArrayWithMd5Keys()
     {
-        $directory = PATH_site . 'typo3temp/' . $this->getUniqueId('directory_');
+        $directory = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('directory_');
         mkdir($directory);
         $filesAndDirectories = GeneralUtility::getAllFilesAndFoldersInPath(array(), $directory, '', true);
         $check = true;
index 35b9bdc..f33be44 100644 (file)
@@ -50,7 +50,7 @@ abstract class UnitTestCase extends BaseTestCase
      * garbage collection. This reduces memory footprint with lots
      * of tests.
      *
-     * If owerwriting tearDown() in test classes, please call
+     * If overwriting tearDown() in test classes, please call
      * parent::tearDown() at the end. Unsetting of own properties
      * is not needed this way.
      *
@@ -81,9 +81,9 @@ abstract class UnitTestCase extends BaseTestCase
             if (!GeneralUtility::validPathStr($absoluteFileName)) {
                 throw new \RuntimeException('tearDown() cleanup: Filename contains illegal characters', 1410633087);
             }
-            if (!StringUtility::beginsWith($absoluteFileName, PATH_site . 'typo3temp/')) {
+            if (!StringUtility::beginsWith($absoluteFileName, PATH_site . 'typo3temp/var/')) {
                 throw new \RuntimeException(
-                    'tearDown() cleanup:  Files to delete must be within typo3temp/',
+                    'tearDown() cleanup:  Files to delete must be within typo3temp/var/',
                     1410633412
                 );
             }
index 2edff5b..37baee4 100644 (file)
@@ -164,7 +164,7 @@ class ActionController extends AbstractController
         $sqlData = $this->installUtility->getExtensionSqlDataDump($extension);
         $dump = $sqlData['extTables'] . $sqlData['staticSql'];
         $fileName = $extension . '_sqlDump.sql';
-        $filePath = PATH_site . 'typo3temp/ExtensionManager/' . $fileName;
+        $filePath = PATH_site . 'typo3temp/var/ExtensionManager/' . $fileName;
         $error = \TYPO3\CMS\Core\Utility\GeneralUtility::writeFileToTypo3tempDir($filePath, $dump);
         if (is_string($error)) {
             throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException($error, 1343048718);
index dd4d588..8f22790 100644 (file)
@@ -426,10 +426,10 @@ class FileHandlingUtility implements \TYPO3\CMS\Core\SingletonInterface
             $version =  '0.0.0';
         }
 
-        if (!@is_dir(PATH_site . 'typo3temp/ExtensionManager/')) {
-            GeneralUtility::mkdir(PATH_site . 'typo3temp/ExtensionManager/');
+        if (!@is_dir(PATH_site . 'typo3temp/var/ExtensionManager/')) {
+            GeneralUtility::mkdir(PATH_site . 'typo3temp/var/ExtensionManager/');
         }
-        $fileName = $this->getAbsolutePath('typo3temp/ExtensionManager/' . $extension . '_' . $version . '_' . date('YmdHi', $GLOBALS['EXEC_TIME']) . '.zip');
+        $fileName = $this->getAbsolutePath('typo3temp/var/ExtensionManager/' . $extension . '_' . $version . '_' . date('YmdHi', $GLOBALS['EXEC_TIME']) . '.zip');
 
         $zip = new \ZipArchive();
         $zip->open($fileName, \ZipArchive::CREATE);
index 392f71d..b4c33bb 100644 (file)
@@ -35,8 +35,8 @@ class FileHandlingUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function createFakeExtension($extkeyOnly = false)
     {
         $extKey = strtolower($this->getUniqueId('testing'));
-        $absExtPath = PATH_site . 'typo3temp/ext-' . $extKey . '/';
-        $relPath = 'typo3temp/ext-' . $extKey . '/';
+        $absExtPath = PATH_site . 'typo3temp/var/tests/ext-' . $extKey . '/';
+        $relPath = 'typo3temp/var/tests/ext-' . $extKey . '/';
         $this->fakedExtensions[$extKey] = array(
             'siteRelPath' => $relPath,
             'siteAbsPath' => $absExtPath
@@ -45,7 +45,7 @@ class FileHandlingUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             return $extKey;
         }
         \TYPO3\CMS\Core\Utility\GeneralUtility::mkdir($absExtPath);
-        $this->testFilesToDelete[] = PATH_site . 'typo3temp/ext-' . $extKey;
+        $this->testFilesToDelete[] = PATH_site . 'typo3temp/var/tests/ext-' . $extKey;
         return $extKey;
     }
 
@@ -59,10 +59,10 @@ class FileHandlingUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $fileHandlerMock = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Utility\FileHandlingUtility::class, array('removeDirectory', 'addDirectory', 'getExtensionDir'), array(), '', false);
         $fileHandlerMock->expects($this->once())
             ->method('removeDirectory')
-            ->with(PATH_site . 'typo3temp/ext-' . $extKey . '/');
+            ->with(PATH_site . 'typo3temp/var/tests/ext-' . $extKey . '/');
         $fileHandlerMock->expects($this->any())
             ->method('getExtensionDir')
-            ->willReturn(PATH_site . 'typo3temp/ext-' . $extKey . '/');
+            ->willReturn(PATH_site . 'typo3temp/var/tests/ext-' . $extKey . '/');
         $fileHandlerMock->_call('makeAndClearExtensionDir', $extKey);
     }
 
@@ -124,10 +124,10 @@ class FileHandlingUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $fileHandlerMock = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Utility\FileHandlingUtility::class, array('removeDirectory', 'addDirectory', 'getExtensionDir'));
         $fileHandlerMock->expects($this->once())
             ->method('addDirectory')
-            ->with(PATH_site . 'typo3temp/ext-' . $extKey . '/');
+            ->with(PATH_site . 'typo3temp/var/tests/ext-' . $extKey . '/');
         $fileHandlerMock->expects($this->any())
             ->method('getExtensionDir')
-            ->willReturn(PATH_site . 'typo3temp/ext-' . $extKey . '/');
+            ->willReturn(PATH_site . 'typo3temp/var/tests/ext-' . $extKey . '/');
         $fileHandlerMock->_call('makeAndClearExtensionDir', $extKey);
     }
 
@@ -150,7 +150,7 @@ class FileHandlingUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function addDirectoryAddsDirectory()
     {
-        $extDirPath = PATH_site . '/typo3temp/' . $this->getUniqueId('test-extensions-');
+        $extDirPath = PATH_site . '/typo3temp/var/tests/' . $this->getUniqueId('test-extensions-');
         $this->testFilesToDelete[] = $extDirPath;
         $fileHandlerMock = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Utility\FileHandlingUtility::class, array('dummy'));
         $fileHandlerMock->_call('addDirectory', $extDirPath);
@@ -163,7 +163,7 @@ class FileHandlingUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function removeDirectoryRemovesDirectory()
     {
-        $extDirPath = PATH_site . '/typo3temp/' . $this->getUniqueId('test-extensions-');
+        $extDirPath = PATH_site . '/typo3temp/var/tests/' . $this->getUniqueId('test-extensions-');
         @mkdir($extDirPath);
         $fileHandlerMock = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Utility\FileHandlingUtility::class, array('dummy'));
         $fileHandlerMock->_call('removeDirectory', $extDirPath);
@@ -176,8 +176,8 @@ class FileHandlingUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function removeDirectoryRemovesSymlink()
     {
-        $absoluteSymlinkPath = PATH_site . 'typo3temp/' . $this->getUniqueId('test_symlink_');
-        $absoluteFilePath = PATH_site . 'typo3temp/' . $this->getUniqueId('test_file_');
+        $absoluteSymlinkPath = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_symlink_');
+        $absoluteFilePath = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_file_');
         touch($absoluteFilePath);
         $this->testFilesToDelete[] = $absoluteFilePath;
         symlink($absoluteFilePath, $absoluteSymlinkPath);
@@ -192,8 +192,8 @@ class FileHandlingUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function removeDirectoryDoesNotRemoveContentOfSymlinkedTargetDirectory()
     {
-        $absoluteSymlinkPath = PATH_site . 'typo3temp/' . $this->getUniqueId('test_symlink_');
-        $absoluteDirectoryPath = PATH_site . 'typo3temp/' . $this->getUniqueId('test_dir_') . '/';
+        $absoluteSymlinkPath = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_symlink_');
+        $absoluteDirectoryPath = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('test_dir_') . '/';
         $relativeFilePath = $this->getUniqueId('test_file_');
 
         mkdir($absoluteDirectoryPath);
@@ -582,7 +582,7 @@ class FileHandlingUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         // Create zip-file from extension
         $filename = $fileHandlerMock->_call('createZipFileFromExtension', $extKey);
 
-        $expectedFilename = PATH_site . 'typo3temp/ExtensionManager/' . $extKey . '_0.0.0_' . date('YmdHi', 42) . '.zip';
+        $expectedFilename = PATH_site . 'typo3temp/var/ExtensionManager/' . $extKey . '_0.0.0_' . date('YmdHi', 42) . '.zip';
         $this->testFilesToDelete[] = $filename;
         $this->assertEquals($expectedFilename, $filename, 'Archive file name differs from expectation');
 
index ede4169..353adbc 100644 (file)
@@ -95,7 +95,7 @@ class InstallUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function tearDown()
     {
         foreach ($this->fakedExtensions as $fakeExtkey => $fakeExtension) {
-            $this->testFilesToDelete[] = PATH_site . 'typo3temp/' . $fakeExtkey;
+            $this->testFilesToDelete[] = PATH_site . 'typo3temp/var/tests/' . $fakeExtkey;
         }
         parent::tearDown();
     }
@@ -109,8 +109,8 @@ class InstallUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function createFakeExtension()
     {
         $extKey = strtolower($this->getUniqueId('testing'));
-        $absExtPath = PATH_site . 'typo3temp/' . $extKey;
-        $relPath = 'typo3temp/' . $extKey . '/';
+        $absExtPath = PATH_site . 'typo3temp/var/tests/' . $extKey;
+        $relPath = 'typo3temp/var/tests/' . $extKey . '/';
         \TYPO3\CMS\Core\Utility\GeneralUtility::mkdir($absExtPath);
         $this->fakedExtensions[$extKey] = array(
             'siteRelPath' => $relPath
@@ -220,7 +220,7 @@ class InstallUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function processDatabaseUpdatesCallsUpdateDbWithExtTablesSql()
     {
         $extKey = $this->createFakeExtension();
-        $extPath = PATH_site . 'typo3temp/' . $extKey . '/';
+        $extPath = PATH_site . 'typo3temp/var/tests/' . $extKey . '/';
         $extTablesFile = $extPath . 'ext_tables.sql';
         $fileContent = 'DUMMY TEXT TO COMPARE';
         file_put_contents($extTablesFile, $fileContent);
@@ -244,7 +244,7 @@ class InstallUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function processDatabaseUpdatesCallsImportStaticSqlFile()
     {
         $extKey = $this->createFakeExtension();
-        $extRelPath = 'typo3temp/' . $extKey . '/';
+        $extRelPath = 'typo3temp/var/tests/' . $extKey . '/';
         $installMock = $this->getAccessibleMock(
             \TYPO3\CMS\Extensionmanager\Utility\InstallUtility::class,
             array('importStaticSqlFile', 'updateDbWithExtTablesSql', 'importT3DFile'),
index 3b84ffa..4606c3a 100755 (executable)
@@ -4746,13 +4746,13 @@ class ContentObjectRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function filelinkCreatesCorrectUrlForFileWithUrlEncodedSpecialChars()
     {
-        $fileNameAndPath = PATH_site . 'typo3temp/phpunitJumpUrlTestFile with spaces & amps.txt';
+        $fileNameAndPath = PATH_site . 'typo3temp/var/tests/phpunitJumpUrlTestFile with spaces & amps.txt';
         file_put_contents($fileNameAndPath, 'Some test data');
         $relativeFileNameAndPath = substr($fileNameAndPath, strlen(PATH_site));
-        $fileName = substr($fileNameAndPath, strlen(PATH_site . 'typo3temp/'));
+        $fileName = substr($fileNameAndPath, strlen(PATH_site . 'typo3temp/var/tests/'));
 
         $expectedLink = str_replace('%2F', '/', rawurlencode($relativeFileNameAndPath));
-        $result = $this->subject->filelink($fileName, array('path' => 'typo3temp/'));
+        $result = $this->subject->filelink($fileName, array('path' => 'typo3temp/var/tests/'));
         $this->assertEquals('<a href="' . $expectedLink . '">' . $fileName . '</a>', $result);
 
         \TYPO3\CMS\Core\Utility\GeneralUtility::unlink_tempfile($fileNameAndPath);
index e639e51..174b0fc 100644 (file)
 <title>powermail</title>
 <meta name="generator" content="TYPO3 6.0 CMS">
 
-<link rel="stylesheet" type="text/css" href="typo3temp/Assets/427bb03fe1.css?1334416344" media="all">
+<link rel="stylesheet" type="text/css" href="typo3temp/assets/css/427bb03fe1.css?1334416344" media="all">
 
 
 
-<script src="typo3temp/assets/175aa1ef20.js?1340313498" type="text/javascript"></script>
+<script src="typo3temp/assets/js/175aa1ef20.js?1340313498" type="text/javascript"></script>
 
 
 <!--HD_679b52796e75d474ccbbed486b6837ab-->
index 4ea6a53..255379d 100644 (file)
@@ -980,7 +980,7 @@ abstract class ImportExport
      */
     protected function getTemporaryFolderName()
     {
-        $temporaryPath = PATH_site . 'typo3temp/';
+        $temporaryPath = PATH_site . 'typo3temp/var/transient/';
         do {
             $temporaryFolderName = $temporaryPath . 'export_temp_files_' . mt_rand(1, PHP_INT_MAX);
         } while (is_dir($temporaryFolderName));
index 38fc781..6c6cc40 100644 (file)
@@ -50,7 +50,7 @@ class IndexerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function extractHyperLinksReturnsCorrectFileUsingT3Vars()
     {
-        $temporaryFileName = tempnam(PATH_site . 'typo3temp/', 't3unit-');
+        $temporaryFileName = tempnam(PATH_site . 'typo3temp/var/tests/', 't3unit-');
         $this->testFilesToDelete[] = $temporaryFileName;
         $html = 'test <a href="testfile">test</a> test';
         $GLOBALS['T3_VAR']['ext']['indexed_search']['indexLocalFiles'] = array(
index 3dca81f..c52ec13 100644 (file)
@@ -259,9 +259,6 @@ class ExtensionCompatibilityTester extends AbstractAjaxAction
             case E_NOTICE:
                 $lastError['type'] = 'E_NOTICE';
                 break;
-            case E_NOTICE:
-                $lastError['type'] = 'E_NOTICE';
-                break;
         }
         $errors[] = $lastError;
 
index 4c23eb1..909ddf5 100644 (file)
@@ -180,7 +180,7 @@ class CleanUp extends Action\AbstractAction
     protected function getTypo3TempStatistics()
     {
         $data = array();
-        $pathTypo3Temp= PATH_site . 'typo3temp/';
+        $pathTypo3Temp = PATH_site . 'typo3temp/';
         $postValues = $this->postValues['values'];
 
         $condition = '0';
@@ -300,7 +300,7 @@ class CleanUp extends Action\AbstractAction
         if ($failedDeletions) {
             /** @var ErrorStatus $message */
             $message = $this->objectManager->get(ErrorStatus::class);
-            $message->setTitle('Failed to delete ' . $failedDeletions . ' processed files. See TYPO3 log (by default typo3temp/logs/typo3_*.log)');
+            $message->setTitle('Failed to delete ' . $failedDeletions . ' processed files. See TYPO3 log (by default typo3temp/var/logs/typo3_*.log)');
         } else {
             /** @var OkStatus $message */
             $message = $this->objectManager->get(OkStatus::class);
index 4578728..5214339 100644 (file)
@@ -84,8 +84,8 @@ class ImportantActions extends Action\AbstractAction
             ->assign('databasePort', $GLOBALS['TYPO3_CONF_VARS']['DB']['port'])
             ->assign('databaseSocket', $GLOBALS['TYPO3_CONF_VARS']['DB']['socket'])
             ->assign('databaseNumberOfTables', count($this->getDatabaseConnection()->admin_get_tables()))
-            ->assign('extensionCompatibilityTesterProtocolFile', GeneralUtility::getIndpEnv('TYPO3_SITE_URL') . 'typo3temp/ExtensionCompatibilityTester.txt')
-            ->assign('extensionCompatibilityTesterErrorProtocolFile', GeneralUtility::getIndpEnv('TYPO3_SITE_URL') . 'typo3temp/ExtensionCompatibilityTesterErrors.json')
+            ->assign('extensionCompatibilityTesterProtocolFile', GeneralUtility::getIndpEnv('TYPO3_SITE_URL') . 'typo3temp/assets/ExtensionCompatibilityTester.txt')
+            ->assign('extensionCompatibilityTesterErrorProtocolFile', GeneralUtility::getIndpEnv('TYPO3_SITE_URL') . 'typo3temp/assets/ExtensionCompatibilityTesterErrors.json')
             ->assign('extensionCompatibilityTesterMessages', $this->getExtensionCompatibilityTesterMessages())
             ->assign('listOfOpcodeCaches', $opcodeCacheService->getAllActive());
 
index 77611bd..31345d1 100644 (file)
@@ -28,7 +28,7 @@ class LoadExtensions extends Action\AbstractAction
      */
     protected function executeAction()
     {
-        $extensionCompatibilityTesterFile = \TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_SITE_URL') . 'typo3temp/ExtensionCompatibilityTester.txt';
+        $extensionCompatibilityTesterFile = \TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_SITE_URL') . 'typo3temp/assets/ExtensionCompatibilityTester.txt';
         $this->view
             ->assign('extensionCompatibilityTesterProtocolFile', $extensionCompatibilityTesterFile)
             ->assign('extensionCompatibilityTesterMessages', $this->getExtensionCompatibilityTesterMessages());
index bd1befb..096012d 100644 (file)
@@ -195,7 +195,7 @@ class TestSetup extends Action\AbstractAction
             \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('install') . 'Resources/Private/Font/vera.ttf',
             'Testing true type'
         );
-        $outputFile = PATH_site . 'typo3temp/installTool-' . StringUtility::getUniqueId('createTrueTypeFontTestImage') . '.gif';
+        $outputFile = PATH_site . 'typo3temp/assets/images/installTool-' . StringUtility::getUniqueId('createTrueTypeFontTestImage') . '.gif';
         imagegif($image, $outputFile);
 
         /** @var \TYPO3\CMS\Install\Status\StatusInterface $message */
index 8100379..10ec7a8 100644 (file)
@@ -118,11 +118,6 @@ class DefaultFactory
                                 'targetPermission' => $directoryPermission
                             ),
                             array(
-                                'name' => 'transient',
-                                'type' => DirectoryNode::class,
-                                'targetPermission' => $directoryPermission
-                            ),
-                            array(
                                 'name' => '_processed_',
                                 'type' => DirectoryNode::class,
                                 'targetPermission' => $directoryPermission
index a3d4d86..290bd09 100644 (file)
@@ -64,7 +64,6 @@ class InstallStatusReport implements \TYPO3\CMS\Reports\StatusProviderInterface
         $checkWritable = array(
             'typo3temp/' => 2,
             'typo3temp/assets/' => 2,
-            'typo3temp/assets/transient/' => 2,
             'typo3temp/assets/compressed/' => 2,
             // only needed when GraphicalFunctions is used
             'typo3temp/assets/images/' => 0,
index 9a55a3e..c4ef87e 100644 (file)
@@ -53,7 +53,7 @@ class ClearCacheService
     public function clearAll()
     {
         // Delete typo3temp/Cache
-        GeneralUtility::flushDirectory(PATH_site . 'typo3temp/Cache', true, true);
+        GeneralUtility::flushDirectory(PATH_site . 'typo3temp/var/Cache', true, true);
 
         $bootstrap = \TYPO3\CMS\Core\Core\Bootstrap::getInstance();
         $bootstrap
index c3cc1e2..013b161 100644 (file)
@@ -48,8 +48,8 @@ class ExtensionCompatibilityTesterTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
     protected function tearDown()
     {
         ExtensionManagementUtility::setPackageManager($this->backupPackageManager);
-        if (file_exists(PATH_site . 'typo3temp/ExtensionCompatibilityTester.txt')) {
-            unlink(PATH_site . 'typo3temp/ExtensionCompatibilityTester.txt');
+        if (file_exists(PATH_site . 'typo3temp/assets/ExtensionCompatibilityTester.txt')) {
+            unlink(PATH_site . 'typo3temp/assets/ExtensionCompatibilityTester.txt');
         }
         parent::tearDown();
     }
index 4ad8e56..de1f4c5 100644 (file)
@@ -132,8 +132,8 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
         }
         /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, array('getAbsolutePath'), array(), '', false);
-        $path = PATH_site . 'typo3temp/' . $this->getUniqueId('link_');
-        $target = PATH_site . 'typo3temp/' . $this->getUniqueId('notExists_');
+        $path = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('link_');
+        $target = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('notExists_');
         symlink($target, $path);
         $this->testFilesToDelete[] = $path;
         $node->expects($this->any())->method('getAbsolutePath')->will($this->returnValue($path));
index f1759b5..2691699 100644 (file)
@@ -634,7 +634,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
         }
         /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, array('getAbsolutePath'), array(), '', false);
-        $path = PATH_site . 'typo3temp/' . $this->getUniqueId('root_');
+        $path = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('root_');
         \TYPO3\CMS\Core\Utility\GeneralUtility::mkdir_deep($path);
         $this->testFilesToDelete[] = $path;
         $link = $this->getUniqueId('link_');
index bf4e74c..7a2a8f9 100644 (file)
@@ -188,7 +188,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
             '',
             false
         );
-        $path = PATH_site . 'typo3temp/' . $this->getUniqueId('dir_');
+        $path = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('dir_');
         $node->expects($this->any())->method('getAbsolutePath')->will($this->returnValue($path));
         $node->expects($this->any())->method('exists')->will($this->returnValue(true));
         $node->expects($this->any())->method('isFile')->will($this->returnValue(true));
@@ -783,7 +783,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
         }
         /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('getAbsolutePath'), array(), '', false);
-        $path = PATH_site . 'typo3temp/' . $this->getUniqueId('root_');
+        $path = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('root_');
         \TYPO3\CMS\Core\Utility\GeneralUtility::mkdir_deep($path);
         $this->testFilesToDelete[] = $path;
         $link = $this->getUniqueId('link_');
index aef9d82..3e7dd4a 100644 (file)
@@ -99,7 +99,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             '',
             false
         );
-        $path = PATH_site . 'typo3temp/' . $this->getUniqueId('dir_');
+        $path = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('dir_');
         $node->expects($this->any())->method('getAbsolutePath')->will($this->returnValue($path));
         $this->assertInternalType('array', $node->getStatus());
     }
@@ -117,7 +117,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             '',
             false
         );
-        $path = PATH_site . 'typo3temp/' . $this->getUniqueId('dir_');
+        $path = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('dir_');
         $node->expects($this->any())->method('getAbsolutePath')->will($this->returnValue($path));
         $node->expects($this->once())->method('isWindowsOs')->will($this->returnValue(true));
         $statusArray = $node->getStatus();
@@ -139,7 +139,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             '',
             false
         );
-        $path = PATH_site . 'typo3temp/' . $this->getUniqueId('dir_');
+        $path = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('dir_');
         $node->expects($this->any())->method('getAbsolutePath')->will($this->returnValue($path));
         $node->expects($this->any())->method('isWindowsOs')->will($this->returnValue(false));
         $node->expects($this->once())->method('exists')->will($this->returnValue(false));
@@ -257,7 +257,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         }
         /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, array('exists', 'getAbsolutePath'), array(), '', false);
-        $path = PATH_site . 'typo3temp/' . $this->getUniqueId('link_');
+        $path = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('link_');
         $target = PATH_site . $this->getUniqueId('linkTarget_');
         symlink($target, $path);
         $this->testFilesToDelete[] = $path;
@@ -276,7 +276,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         }
         /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, array('exists', 'getAbsolutePath'), array(), '', false);
-        $path = PATH_site . 'typo3temp/' . $this->getUniqueId('file_');
+        $path = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('file_');
         touch($path);
         $this->testFilesToDelete[] = $path;
         $node->expects($this->any())->method('exists')->will($this->returnValue(true));
@@ -345,7 +345,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         if (TYPO3_OS === 'WIN') {
             $this->markTestSkipped('Test not available on Windows OS.');
         }
-        $path = PATH_site . 'typo3temp/' . $this->getUniqueId('link_');
+        $path = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('link_');
         $target = $this->getUniqueId('linkTarget_');
         symlink($target, $path);
         $this->testFilesToDelete[] = $path;
@@ -372,7 +372,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         if (TYPO3_OS === 'WIN') {
             $this->markTestSkipped('Test not available on Windows OS.');
         }
-        $path = PATH_site . 'typo3temp/' . $this->getUniqueId('link_');
+        $path = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('link_');
         $target = $this->getUniqueId('linkTarget_');
         symlink($target, $path);
         $this->testFilesToDelete[] = $path;
index 3bdbb98..c1eac73 100644 (file)
@@ -183,7 +183,7 @@ class RootNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             '',
             false
         );
-        $path = PATH_site . 'typo3temp/' . $this->getUniqueId('dir_');
+        $path = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('dir_');
         touch($path);
         $this->testFilesToDelete[] = $path;
         $node->expects($this->any())->method('getAbsolutePath')->will($this->returnValue($path));
@@ -210,7 +210,7 @@ class RootNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             '',
             false
         );
-        $path = PATH_site . 'typo3temp/' . $this->getUniqueId('dir_');
+        $path = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('dir_');
         touch($path);
         $this->testFilesToDelete[] = $path;
         $node->expects($this->any())->method('getAbsolutePath')->will($this->returnValue($path));
index 7c5e3a2..761702e 100644 (file)
@@ -30,7 +30,7 @@ abstract class FolderStructureTestCase extends \TYPO3\CMS\Core\Tests\UnitTestCas
     protected function getVirtualTestDir($prefix = 'root_')
     {
         $root = vfsStream::setup();
-        $path = $root->url() . '/typo3temp/' . $this->getUniqueId($prefix);
+        $path = $root->url() . '/typo3temp/var/tests/' . $this->getUniqueId($prefix);
         \TYPO3\CMS\Core\Utility\GeneralUtility::mkdir_deep($path);
         return $path;
     }
index 897679d..42ffba8 100644 (file)
@@ -63,7 +63,7 @@ class CommandLineBackend extends AbstractBackend
         ) {
             $this->temporaryDirectory = $extconf['temporaryDirectory'];
         } else {
-            $this->temporaryDirectory = PATH_site . 'typo3temp/var';
+            $this->temporaryDirectory = PATH_site . 'typo3temp/var/transient';
         }
     }
 
index 983e280..e92c194 100644 (file)
@@ -491,7 +491,7 @@ config.htmlTag_setParams =  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-U
 ]]></default>
                </property>
                <property name="inlineStyle2TempFile" type="boolean">
-                       <description><![CDATA[If set, the inline styles TYPO3 controls in the core are written to a file,  typo3temp/stylesheet_[hashstring].css, and the header will only contain the link to the stylesheet.
+                       <description><![CDATA[If set, the inline styles TYPO3 controls in the core are written to a file,  typo3temp/assets/css/stylesheet_[hashstring].css, and the header will only contain the link to the stylesheet.
 The file hash is based solely on the content of the styles.
 
 Depends on the compatibility mode (see Tools>Install>Update wizard):