[TASK] Remove compat layer for new 6.0 classes
authorChristian Kuhn <lolli@schwarzbu.ch>
Sun, 26 Aug 2012 15:21:37 +0000 (17:21 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Sun, 26 Aug 2012 18:21:58 +0000 (20:21 +0200)
There is no compatibility layer needed for classes that were added
with 6.0. This first patch affects lots of classes in t3lib/,
especially some new 6.0 cache classes, the category code and
the whole FAL layer. The compatibily files are removed, deleted from
core_autoload and the migration class_alias file and all other
occurences of the class names within the core are cleaned up.

Change-Id: I8e81af7bf99a9d47866e1060dc5554f8297af5ca
Resolves: #40240
Related: #40095
Releases: 6.0
Reviewed-on: http://review.typo3.org/14120
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
95 files changed:
t3lib/cache/backend/class.t3lib_cache_backend_simplefilebackend.php [deleted file]
t3lib/cache/backend/class.t3lib_cache_backend_wincachebackend.php [deleted file]
t3lib/cache/backend/interfaces/interface.t3lib_cache_backend_freezablebackend.php [deleted file]
t3lib/cache/backend/interfaces/interface.t3lib_cache_backend_taggablebackend.php [deleted file]
t3lib/category/Collection/CategoryCollection.php [deleted file]
t3lib/category/Registry.php [deleted file]
t3lib/class.t3lib_userauthgroup.php
t3lib/core_autoload.php
t3lib/file/AbstractFile.php [deleted file]
t3lib/file/Collection/AbstractFileCollection.php [deleted file]
t3lib/file/Collection/FolderBasedFileCollection.php [deleted file]
t3lib/file/Collection/StaticFileCollection.php [deleted file]
t3lib/file/Driver/AbstractDriver.php [deleted file]
t3lib/file/Driver/DriverRegistry.php [deleted file]
t3lib/file/Driver/LocalDriver.php [deleted file]
t3lib/file/Exception/AbstractFileException.php [deleted file]
t3lib/file/Exception/AbstractFileOperationException.php [deleted file]
t3lib/file/Exception/ExistingTargetFileNameException.php [deleted file]
t3lib/file/Exception/ExistingTargetFolderException.php [deleted file]
t3lib/file/Exception/FileDoesNotExistException.php [deleted file]
t3lib/file/Exception/FileOperationErrorException.php [deleted file]
t3lib/file/Exception/FolderDoesNotExistException.php [deleted file]
t3lib/file/Exception/IllegalFileExtensionException.php [deleted file]
t3lib/file/Exception/InsufficientFileAccessPermissionsException.php [deleted file]
t3lib/file/Exception/InsufficientFileReadPermissionsException.php [deleted file]
t3lib/file/Exception/InsufficientFileWritePermissionsException.php [deleted file]
t3lib/file/Exception/InsufficientFolderAccessPermissionsException.php [deleted file]
t3lib/file/Exception/InsufficientFolderReadPermissionsException.php [deleted file]
t3lib/file/Exception/InsufficientFolderWritePermissionsException.php [deleted file]
t3lib/file/Exception/InsufficientUserPermissionsException.php [deleted file]
t3lib/file/Exception/InvalidConfigurationException.php [deleted file]
t3lib/file/Exception/InvalidFileException.php [deleted file]
t3lib/file/Exception/InvalidFileNameException.php [deleted file]
t3lib/file/Exception/InvalidFolderException.php [deleted file]
t3lib/file/Exception/InvalidPathException.php [deleted file]
t3lib/file/Exception/InvalidTargetFolderException.php [deleted file]
t3lib/file/Exception/NotInMountPointException.php [deleted file]
t3lib/file/Exception/UploadException.php [deleted file]
t3lib/file/Exception/UploadSizeException.php [deleted file]
t3lib/file/Factory.php [deleted file]
t3lib/file/File.php [deleted file]
t3lib/file/FileInterface.php [deleted file]
t3lib/file/FileReference.php [deleted file]
t3lib/file/Folder.php [deleted file]
t3lib/file/FolderInterface.php [deleted file]
t3lib/file/ProcessedFile.php [deleted file]
t3lib/file/Repository/AbstractRepository.php [deleted file]
t3lib/file/Repository/FileCollectionRepository.php [deleted file]
t3lib/file/Repository/FileRepository.php [deleted file]
t3lib/file/Repository/ProcessedFileRepository.php [deleted file]
t3lib/file/Repository/StorageRepository.php [deleted file]
t3lib/file/ResourceInterface.php [deleted file]
t3lib/file/Service/BackwardsCompatibility/TslibContentAdapterService.php [deleted file]
t3lib/file/Service/FileProcessingService.php [deleted file]
t3lib/file/Service/ImageProcessingService.php [deleted file]
t3lib/file/Service/IndexerService.php [deleted file]
t3lib/file/Service/MagicImageService.php [deleted file]
t3lib/file/Service/UserfilemountService.php [deleted file]
t3lib/file/Storage.php [deleted file]
t3lib/file/Utility/FileExtensionFilter.php [deleted file]
t3lib/file/Utility/FileInfo.php [deleted file]
t3lib/file/Utility/FilenameFilters.php [deleted file]
t3lib/stddb/tbl_be.php
t3lib/stddb/tca_sys_file.php
t3lib/stddb/tca_sys_file_collection.php
tests/Unit/t3lib/category/Collection/CategoryCollectionTest.php
tests/Unit/t3lib/class.t3lib_extfilefuncTest.php
tests/Unit/t3lib/file/BaseTestCase.php
tests/Unit/t3lib/file/Driver/LocalDriverTest.php
tests/Unit/t3lib/file/Utility/FileExtensionFilterTest.php
typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php
typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php
typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php
typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
typo3/sysext/core/Classes/Cache/Frontend/AbstractFrontend.php
typo3/sysext/core/Classes/Resource/AbstractFile.php
typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php
typo3/sysext/core/Classes/Resource/FileCollectionRepository.php
typo3/sysext/core/Classes/Resource/FileRepository.php
typo3/sysext/core/Classes/Resource/Folder.php
typo3/sysext/core/Classes/Resource/FolderInterface.php
typo3/sysext/core/Classes/Resource/ResourceFactory.php
typo3/sysext/core/Classes/Resource/ResourceStorage.php
typo3/sysext/core/Classes/Resource/Service/ImageProcessingService.php
typo3/sysext/core/Classes/Resource/Service/IndexerService.php
typo3/sysext/core/Classes/Resource/Service/UserFileMountService.php
typo3/sysext/core/Classes/Resource/StorageRepository.php
typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
typo3/sysext/core/Migrations/Code/ClassAliasMap201208221700.php
typo3/sysext/filelist/Classes/Controller/FileListController.php
typo3/sysext/filelist/Classes/FileList.php
typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php
typo3/sysext/rtehtmlarea/Classes/FolderTree.php
typo3/sysext/rtehtmlarea/Classes/ImageFolderTree.php

diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_simplefilebackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_simplefilebackend.php
deleted file mode 100644 (file)
index 7d13681..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_cache_backend_SimpleFileBackend and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Cache/Backend/SimpleFileBackend.php
- */
-require_once __DIR__ . '/../../../typo3/sysext/core/Classes/Cache/Backend/SimpleFileBackend.php';
-?>
\ No newline at end of file
diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_wincachebackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_wincachebackend.php
deleted file mode 100644 (file)
index da461f2..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_cache_backend_WincacheBackend and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Cache/Backend/WincacheBackend.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Cache/Backend/WincacheBackend.php';
-?>
\ No newline at end of file
diff --git a/t3lib/cache/backend/interfaces/interface.t3lib_cache_backend_freezablebackend.php b/t3lib/cache/backend/interfaces/interface.t3lib_cache_backend_freezablebackend.php
deleted file mode 100644 (file)
index 63db587..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_cache_backend_FreezableBackend and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Cache/Backend/FreezableBackendInterface.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Cache/Backend/FreezableBackendInterface.php';
-?>
\ No newline at end of file
diff --git a/t3lib/cache/backend/interfaces/interface.t3lib_cache_backend_taggablebackend.php b/t3lib/cache/backend/interfaces/interface.t3lib_cache_backend_taggablebackend.php
deleted file mode 100644 (file)
index 1b39290..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_cache_backend_TaggableBackend and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Cache/Backend/TaggableBackendInterface.php
- */
-require_once __DIR__ . '/../../../../typo3/sysext/core/Classes/Cache/Backend/TaggableBackendInterface.php';
-?>
\ No newline at end of file
diff --git a/t3lib/category/Collection/CategoryCollection.php b/t3lib/category/Collection/CategoryCollection.php
deleted file mode 100644 (file)
index 822b532..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_category_Collection_CategoryCollection and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Category/Collection/CategoryCollection
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Category/Collection/CategoryCollection';
-?>
\ No newline at end of file
diff --git a/t3lib/category/Registry.php b/t3lib/category/Registry.php
deleted file mode 100644 (file)
index 61f3957..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_category_Registry and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Category/CategoryRegistry.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Category/CategoryRegistry.php';
-?>
\ No newline at end of file
index 1a9c96d..cbb4fe4 100644 (file)
@@ -174,7 +174,7 @@ abstract class t3lib_userAuthGroup extends t3lib_userAuth {
        public $checkWorkspaceCurrent_cache = NULL;
 
        /**
-        * @var t3lib_file_Storage[]
+        * @var \TYPO3\CMS\Core\Resource\ResourceStorage[]
         */
        protected $fileStorages;
 
@@ -1363,8 +1363,8 @@ abstract class t3lib_userAuthGroup extends t3lib_userAuth {
         */
        protected function initializeFileStorages() {
                $this->fileStorages = array();
-               /** @var $storageRepository t3lib_file_Repository_StorageRepository */
-               $storageRepository = t3lib_div::makeInstance('t3lib_file_Repository_StorageRepository');
+               /** @var $storageRepository \TYPO3\CMS\Core\Resource\StorageRepository */
+               $storageRepository = t3lib_div::makeInstance('\TYPO3\CMS\Core\Resource\StorageRepository');
                // Admin users have all file storages visible, without any filters
                if ($this->isAdmin()) {
                        $storageObjects = $storageRepository->findAll();
@@ -1434,7 +1434,7 @@ abstract class t3lib_userAuthGroup extends t3lib_userAuth {
         * If no filemounts an empty array is returned.
         *
         * @api
-        * @return t3lib_file_Storage[]
+        * @return \TYPO3\CMS\Core\Resource\ResourceStorage[]
         */
        public function getFileStorages() {
                // Initializing file mounts after the groups are fetched
@@ -1455,7 +1455,7 @@ abstract class t3lib_userAuthGroup extends t3lib_userAuth {
        public function evaluateUserSpecificFileFilterSettings() {
                // Add the option for also displaying the non-hidden files
                if ($this->uc['showHiddenFilesAndFolders']) {
-                       t3lib_file_Utility_FilenameFilters::setShowHiddenFilesAndFolders(TRUE);
+                       \TYPO3\CMS\Core\Resource\Filter\FileNameFilter::setShowHiddenFilesAndFolders(TRUE);
                }
        }
 
@@ -1565,10 +1565,10 @@ abstract class t3lib_userAuthGroup extends t3lib_userAuth {
         * storage with the default settings
         *
         * @api
-        * @param t3lib_file_Storage $storageObject
+        * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storageObject
         * @return array
         */
-       public function getFilePermissionsForStorage(t3lib_file_Storage $storageObject) {
+       public function getFilePermissionsForStorage(\TYPO3\CMS\Core\Resource\ResourceStorage $storageObject) {
                $defaultFilePermissions = $this->getFilePermissions();
                $storageFilePermissions = $this->getTSConfig('permissions.file.storage.' . $storageObject->getUid());
                if (is_array($storageFilePermissions) && count($storageFilePermissions)) {
@@ -1579,7 +1579,7 @@ abstract class t3lib_userAuthGroup extends t3lib_userAuth {
        }
 
        /**
-        * Returns a t3lib_file_Folder object that is used for uploading
+        * Returns a \TYPO3\CMS\Core\Resource\Folder object that is used for uploading
         * files by default.
         * This is used for RTE and its magic images, as well as uploads
         * in the TCEforms fields, unless otherwise configured (will be added in the future)
@@ -1590,21 +1590,21 @@ abstract class t3lib_userAuthGroup extends t3lib_userAuth {
         *
         * options.defaultUploadFolder = 3:myfolder/yourfolder/
         *
-        * @return t3lib_file_Folder|boolean The default upload folder for this user
+        * @return \TYPO3\CMS\Core\Resource\Folder|boolean The default upload folder for this user
         */
        public function getDefaultUploadFolder() {
                $uploadFolder = $this->getTSConfigVal('options.defaultUploadFolder');
                if ($uploadFolder) {
-                       $uploadFolder = t3lib_file_Factory::getInstance()->getFolderObjectFromCombinedIdentifier($uploadFolder);
+                       $uploadFolder = \TYPO3\CMS\Core\Resource\ResourceFactory::getInstance()->getFolderObjectFromCombinedIdentifier($uploadFolder);
                } else {
                        $storages = $this->getFileStorages();
                        if (count($storages) > 0) {
-                               /** @var $firstStorage t3lib_file_Storage */
+                               /** @var $firstStorage \TYPO3\CMS\Core\Resource\ResourceStorage */
                                $firstStorage = reset($storages);
                                $uploadFolder = $firstStorage->getDefaultFolder();
                        }
                }
-               if ($uploadFolder instanceof t3lib_file_Folder) {
+               if ($uploadFolder instanceof \TYPO3\CMS\Core\Resource\Folder) {
                        return $uploadFolder;
                } else {
                        return FALSE;
@@ -1793,7 +1793,7 @@ abstract class t3lib_userAuthGroup extends t3lib_userAuth {
                                // empty the fileStorages (will be re-applied later)
                                $existingFileStoragesOfUser = $this->fileStorages;
                                $this->fileStorages = array();
-                               $storageRepository = t3lib_div::makeInstance('t3lib_file_Repository_StorageRepository');
+                               $storageRepository = t3lib_div::makeInstance('\TYPO3\CMS\Core\Resource\StorageRepository');
                                // Fetching all filemounts from the workspace
                                $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('*', 'sys_filemounts', ('deleted = 0 AND hidden = 0 AND pid = 0 AND uid IN (' . $GLOBALS['TYPO3_DB']->cleanIntList($storageFiltersInWorkspace)) . ')');
                                // add every filemount of this workspace record
index 876fd0c..af01df9 100644 (file)
@@ -22,7 +22,6 @@ $t3libClasses = array(
        't3lib_cache_backend_backend' => PATH_t3lib . 'cache/backend/interfaces/interface.t3lib_cache_backend_backend.php',
        't3lib_cache_backend_dbbackend' => PATH_t3lib . 'cache/backend/class.t3lib_cache_backend_dbbackend.php',
        't3lib_cache_backend_filebackend' => PATH_t3lib . 'cache/backend/class.t3lib_cache_backend_filebackend.php',
-       't3lib_cache_backend_freezablebackend' => PATH_t3lib . 'cache/backend/interfaces/interface.t3lib_cache_backend_freezablebackend.php',
        't3lib_cache_backend_memcachedbackend' => PATH_t3lib . 'cache/backend/class.t3lib_cache_backend_memcachedbackend.php',
        't3lib_cache_backend_nullbackend' => PATH_t3lib . 'cache/backend/class.t3lib_cache_backend_nullbackend.php',
        't3lib_cache_backend_pdobackend' => PATH_t3lib . 'cache/backend/class.t3lib_cache_backend_pdobackend.php',
@@ -44,8 +43,6 @@ $t3libClasses = array(
        't3lib_Cache\Frontend\VariableFrontend' => PATH_t3lib . 'cache/frontend/class.t3lib_Cache\Frontend\VariableFrontend.php',
        't3lib_cache_manager' => PATH_t3lib . 'cache/class.t3lib_cache_manager.php',
        't3lib_cachehash' => PATH_t3lib . 'class.t3lib_cacheHash.php',
-       't3lib_category_registry' => PATH_t3lib . 'category/Registry.php',
-       't3lib_category_collection_categorycollection' => PATH_t3lib . 'category/Collection/CategoryCollection.php',
        't3lib_cli' => PATH_t3lib . 'class.t3lib_cli.php',
        't3lib_clipboard' => PATH_t3lib . 'class.t3lib_clipboard.php',
        't3lib_collection_abstractrecordcollection' => PATH_t3lib . 'collection/AbstractRecordCollection.php',
@@ -100,61 +97,6 @@ $t3libClasses = array(
        't3lib_extmgm' => PATH_t3lib . 'class.t3lib_extmgm.php',
        't3lib_extobjbase' => PATH_t3lib . 'class.t3lib_extobjbase.php',
        't3lib_exttables_postprocessinghook' => PATH_t3lib . 'interfaces/interface.t3lib_exttables_postprocessinghook.php',
-       't3lib_file_abstractfile' => PATH_t3lib . 'file/AbstractFile.php',
-       't3lib_file_collection_abstractfilecollection' => PATH_t3lib . 'file/Collection/AbstractFileCollection.php',
-       't3lib_file_collection_folderbasedfilecollection' => PATH_t3lib . 'file/Collection/FolderBasedFileCollection.php',
-       't3lib_file_collection_staticfilecollection' => PATH_t3lib . 'file/Collection/StaticFileCollection.php',
-       't3lib_file_driver_abstractdriver' => PATH_t3lib . 'file/Driver/AbstractDriver.php',
-       't3lib_file_driver_driverregistry' => PATH_t3lib . 'file/Driver/DriverRegistry.php',
-       't3lib_file_driver_localdriver' => PATH_t3lib . 'file/Driver/LocalDriver.php',
-       't3lib_file_exception_abstractfileexception' => PATH_t3lib . 'file/Exception/AbstractFileException.php',
-       't3lib_file_exception_abstractfileoperationexception' => PATH_t3lib . 'file/Exception/AbstractFileOperationException.php',
-       't3lib_file_exception_existingtargetfilenameexception' => PATH_t3lib . 'file/Exception/ExistingTargetFileNameException.php',
-       't3lib_file_exception_existingtargetfolderexception' => PATH_t3lib . 'file/Exception/ExistingTargetFolderException.php',
-       't3lib_file_exception_filedoesnotexistexception' => PATH_t3lib . 'file/Exception/FileDoesNotExistException.php',
-       't3lib_file_exception_fileoperationerrorexception' => PATH_t3lib . 'file/Exception/FileOperationErrorException.php',
-       't3lib_file_exception_folderdoesnotexistexception' => PATH_t3lib . 'file/Exception/FolderDoesNotExistException.php',
-       't3lib_file_exception_illegalfileextensionexception' => PATH_t3lib . 'file/Exception/IllegalFileExtensionException.php',
-       't3lib_file_exception_insufficientfileaccesspermissionsexception' => PATH_t3lib . 'file/Exception/InsufficientFileAccessPermissionsException.php',
-       't3lib_file_exception_insufficientfilereadpermissionsexception' => PATH_t3lib . 'file/Exception/InsufficientFileReadPermissionsException.php',
-       't3lib_file_exception_insufficientfilewritepermissionsexception' => PATH_t3lib . 'file/Exception/InsufficientFileWritePermissionsException.php',
-       't3lib_file_exception_insufficientfolderaccesspermissionsexception' => PATH_t3lib . 'file/Exception/InsufficientFolderAccessPermissionsException.php',
-       't3lib_file_exception_insufficientfolderreadpermissionsexception' => PATH_t3lib . 'file/Exception/InsufficientFolderReadPermissionsException.php',
-       't3lib_file_exception_insufficientfolderwritepermissionsexception' => PATH_t3lib . 'file/Exception/InsufficientFolderWritePermissionsException.php',
-       't3lib_file_exception_insufficientuserpermissionsexception' => PATH_t3lib . 'file/Exception/InsufficientUserPermissionsException.php',
-       't3lib_file_exception_invalidconfigurationexception' => PATH_t3lib . 'file/Exception/InvalidConfigurationException.php',
-       't3lib_file_exception_invalidfileexception' => PATH_t3lib . 'file/Exception/InvalidFileException.php',
-       't3lib_file_exception_invalidfilenameexception' => PATH_t3lib . 'file/Exception/InvalidFileNameException.php',
-       't3lib_file_exception_invalidfolderexception' => PATH_t3lib . 'file/Exception/InvalidFolderException.php',
-       't3lib_file_exception_invalidpathexception' => PATH_t3lib . 'file/Exception/InvalidPathException.php',
-       't3lib_file_exception_invalidtargetfolderexception' => PATH_t3lib . 'file/Exception/InvalidTargetFolderException.php',
-       't3lib_file_exception_notinmountpointexception' => PATH_t3lib . 'file/Exception/NotInMountPointException.php',
-       't3lib_file_exception_uploadexception' => PATH_t3lib . 'file/Exception/UploadException.php',
-       't3lib_file_exception_uploadsizeexception' => PATH_t3lib . 'file/Exception/UploadSizeException.php',
-       't3lib_file_factory' => PATH_t3lib . 'file/Factory.php',
-       't3lib_file_file' => PATH_t3lib . 'file/File.php',
-       't3lib_file_fileinterface' => PATH_t3lib . 'file/FileInterface.php',
-       't3lib_file_filereference' => PATH_t3lib . 'file/FileReference.php',
-       't3lib_file_folder' => PATH_t3lib . 'file/Folder.php',
-       't3lib_file_folderinterface' => PATH_t3lib . 'file/FolderInterface.php',
-       't3lib_file_processedfile' => PATH_t3lib . 'file/ProcessedFile.php',
-       't3lib_file_repository_abstractrepository' => PATH_t3lib . 'file/Repository/AbstractRepository.php',
-       't3lib_file_repository_filecollectionrepository' => PATH_t3lib . 'file/Repository/FileCollectionRepository.php',
-       't3lib_file_repository_filerepository' => PATH_t3lib . 'file/Repository/FileRepository.php',
-       't3lib_file_repository_processedfilerepository' => PATH_t3lib . 'file/Repository/ProcessedFileRepository.php',
-       't3lib_file_repository_storagerepository' => PATH_t3lib . 'file/Repository/StorageRepository.php',
-       't3lib_file_resourceinterface' => PATH_t3lib . 'file/ResourceInterface.php',
-       't3lib_file_service_backwardscompatibility_tslibcontentadapterservice' => PATH_t3lib . 'file/Service/BackwardsCompatibility/TslibContentAdapterService.php',
-       't3lib_file_service_fileprocessingservice' => PATH_t3lib . 'file/Service/FileProcessingService.php',
-       't3lib_file_service_imageprocessingservice' => PATH_t3lib . 'file/Service/ImageProcessingService.php',
-       't3lib_file_service_indexerservice' => PATH_t3lib . 'file/Service/IndexerService.php',
-       't3lib_file_service_magicimageservice' => PATH_t3lib . 'file/Service/MagicImageService.php',
-       't3lib_file_service_publishing_publisher' => PATH_t3lib . 'interfaces/file/Service/Publishing/Publisher.php',
-       't3lib_file_service_userfilemountservice' => PATH_t3lib . 'file/Service/UserfilemountService.php',
-       't3lib_file_storage' => PATH_t3lib . 'file/Storage.php',
-       't3lib_file_utility_fileextensionfilter' => PATH_t3lib . 'file/Utility/FileExtensionFilter.php',
-       't3lib_file_utility_fileinfo' => PATH_t3lib . 'file/Utility/FileInfo.php',
-       't3lib_file_utility_filenamefilters' => PATH_t3lib . 'file/Utility/FilenameFilters.php',
        't3lib_flashmessage' => PATH_t3lib . 'class.t3lib_flashmessage.php',
        't3lib_flashmessagequeue' => PATH_t3lib . 'class.t3lib_flashmessagequeue.php',
        't3lib_flexformtools' => PATH_t3lib . 'class.t3lib_flexformtools.php',
diff --git a/t3lib/file/AbstractFile.php b/t3lib/file/AbstractFile.php
deleted file mode 100644 (file)
index b39b262..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_AbstractFile and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/AbstractFile.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/AbstractFile.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Collection/AbstractFileCollection.php b/t3lib/file/Collection/AbstractFileCollection.php
deleted file mode 100644 (file)
index 1ec5734..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_Collection_AbstractFileCollection and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Collection/AbstractFileCollection.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Collection/AbstractFileCollection.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Collection/FolderBasedFileCollection.php b/t3lib/file/Collection/FolderBasedFileCollection.php
deleted file mode 100644 (file)
index 97210df..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_Collection_FolderBasedFileCollection and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Collection/FolderBasedFileCollection.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Collection/FolderBasedFileCollection.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Collection/StaticFileCollection.php b/t3lib/file/Collection/StaticFileCollection.php
deleted file mode 100644 (file)
index 9ddf9ec..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_Collection_StaticFileCollection and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Collection/StaticFileCollection.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Collection/StaticFileCollection.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Driver/AbstractDriver.php b/t3lib/file/Driver/AbstractDriver.php
deleted file mode 100644 (file)
index 88c314f..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_Driver_AbstractDriver and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Driver/AbstractDriver.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Driver/AbstractDriver.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Driver/DriverRegistry.php b/t3lib/file/Driver/DriverRegistry.php
deleted file mode 100644 (file)
index d8d645e..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_Driver_DriverRegistry and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Driver/DriverRegistry.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Driver/DriverRegistry.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Driver/LocalDriver.php b/t3lib/file/Driver/LocalDriver.php
deleted file mode 100644 (file)
index f697840..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_Driver_LocalDriver and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Driver/LocalDriver.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Exception/AbstractFileException.php b/t3lib/file/Exception/AbstractFileException.php
deleted file mode 100644 (file)
index 2b737bb..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_exception_AbstractFileException and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Exception.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Exception.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Exception/AbstractFileOperationException.php b/t3lib/file/Exception/AbstractFileOperationException.php
deleted file mode 100644 (file)
index cc59c46..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_exception_AbstractFileOperationException and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Exception/AbstractFileOperationException.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Exception/AbstractFileOperationException.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Exception/ExistingTargetFileNameException.php b/t3lib/file/Exception/ExistingTargetFileNameException.php
deleted file mode 100644 (file)
index 2a336b5..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_exception_ExistingTargetFileNameException and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Exception/ExistingTargetFileNameException.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Exception/ExistingTargetFileNameException.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Exception/ExistingTargetFolderException.php b/t3lib/file/Exception/ExistingTargetFolderException.php
deleted file mode 100644 (file)
index c977480..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_exception_ExistingTargetFolderException and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Exception/ExistingTargetFolderException.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Exception/ExistingTargetFolderException.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Exception/FileDoesNotExistException.php b/t3lib/file/Exception/FileDoesNotExistException.php
deleted file mode 100644 (file)
index ce54076..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_exception_FileDoesNotExistException and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Exception/FileDoesNotExistException.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Exception/FileDoesNotExistException.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Exception/FileOperationErrorException.php b/t3lib/file/Exception/FileOperationErrorException.php
deleted file mode 100644 (file)
index 8f36b27..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_exception_FileOperationErrorException and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Exception/FileOperationErrorException.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Exception/FileOperationErrorException.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Exception/FolderDoesNotExistException.php b/t3lib/file/Exception/FolderDoesNotExistException.php
deleted file mode 100644 (file)
index 7be5b1e..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_exception_FolderDoesNotExistException and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Exception/FolderDoesNotExistException.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Exception/FolderDoesNotExistException.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Exception/IllegalFileExtensionException.php b/t3lib/file/Exception/IllegalFileExtensionException.php
deleted file mode 100644 (file)
index 9835b2a..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_exception_IllegalFileExtensionException and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Exception/IllegalFileExtensionException.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Exception/IllegalFileExtensionException.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Exception/InsufficientFileAccessPermissionsException.php b/t3lib/file/Exception/InsufficientFileAccessPermissionsException.php
deleted file mode 100644 (file)
index 4f864d5..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_exception_InsufficientFileAccessPermissionsException and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Exception/InsufficientFileAccessPermissionsException.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Exception/InsufficientFileAccessPermissionsException.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Exception/InsufficientFileReadPermissionsException.php b/t3lib/file/Exception/InsufficientFileReadPermissionsException.php
deleted file mode 100644 (file)
index 85ff800..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_exception_InsufficientFileReadPermissionsException and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Exception/InsufficientFileReadPermissionsException.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Exception/InsufficientFileReadPermissionsException.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Exception/InsufficientFileWritePermissionsException.php b/t3lib/file/Exception/InsufficientFileWritePermissionsException.php
deleted file mode 100644 (file)
index 06eae02..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_exception_InsufficientFileWritePermissionsException and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Exception/InsufficientFileWritePermissionsException.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Exception/InsufficientFileWritePermissionsException.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Exception/InsufficientFolderAccessPermissionsException.php b/t3lib/file/Exception/InsufficientFolderAccessPermissionsException.php
deleted file mode 100644 (file)
index db688bd..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_exception_InsufficientFolderAccessPermissionsException and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderAccessPermissionsException.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Exception/InsufficientFolderAccessPermissionsException.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Exception/InsufficientFolderReadPermissionsException.php b/t3lib/file/Exception/InsufficientFolderReadPermissionsException.php
deleted file mode 100644 (file)
index 22c15f4..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_exception_InsufficientFolderReadPermissionsException and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderReadPermissionsException.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Exception/InsufficientFolderReadPermissionsException.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Exception/InsufficientFolderWritePermissionsException.php b/t3lib/file/Exception/InsufficientFolderWritePermissionsException.php
deleted file mode 100644 (file)
index 4878193..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_exception_InsufficientFolderWritePermissionsException and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderWritePermissionsException.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Exception/InsufficientFolderWritePermissionsException.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Exception/InsufficientUserPermissionsException.php b/t3lib/file/Exception/InsufficientUserPermissionsException.php
deleted file mode 100644 (file)
index f09e92d..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_exception_InsufficientUserPermissionsException and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Exception/InsufficientUserPermissionsException.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Exception/InsufficientUserPermissionsException.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Exception/InvalidConfigurationException.php b/t3lib/file/Exception/InvalidConfigurationException.php
deleted file mode 100644 (file)
index 559e539..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_exception_InvalidConfigurationException and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Exception/InvalidConfigurationException.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Exception/InvalidConfigurationException.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Exception/InvalidFileException.php b/t3lib/file/Exception/InvalidFileException.php
deleted file mode 100644 (file)
index e4a7d1b..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_exception_InvalidFileException and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Exception/InvalidFileException.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Exception/InvalidFileException.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Exception/InvalidFileNameException.php b/t3lib/file/Exception/InvalidFileNameException.php
deleted file mode 100644 (file)
index d174999..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_exception_InvalidFileNameException and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Exception/InvalidFileNameException.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Exception/InvalidFileNameException.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Exception/InvalidFolderException.php b/t3lib/file/Exception/InvalidFolderException.php
deleted file mode 100644 (file)
index 243d414..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_exception_InvalidFolderException and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Exception/InvalidFolderException.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Exception/InvalidFolderException.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Exception/InvalidPathException.php b/t3lib/file/Exception/InvalidPathException.php
deleted file mode 100644 (file)
index 727e41c..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_exception_InvalidPathException and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Exception/InvalidPathException.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Exception/InvalidPathException.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Exception/InvalidTargetFolderException.php b/t3lib/file/Exception/InvalidTargetFolderException.php
deleted file mode 100644 (file)
index e83ab14..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_exception_InvalidTargetFolderException and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Exception/InvalidTargetFolderException.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Exception/InvalidTargetFolderException.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Exception/NotInMountPointException.php b/t3lib/file/Exception/NotInMountPointException.php
deleted file mode 100644 (file)
index 73a12ea..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_exception_NotInMountPointException and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Exception/NotInMountPointException.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Exception/NotInMountPointException.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Exception/UploadException.php b/t3lib/file/Exception/UploadException.php
deleted file mode 100644 (file)
index e8513e2..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_exception_UploadException and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Exception/UploadException.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Exception/UploadException.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Exception/UploadSizeException.php b/t3lib/file/Exception/UploadSizeException.php
deleted file mode 100644 (file)
index 9405696..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_exception_UploadSizeException and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Exception/UploadSizeException.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Exception/UploadSizeException.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Factory.php b/t3lib/file/Factory.php
deleted file mode 100644 (file)
index 424f843..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_Factory and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/ResourceFactory.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/ResourceFactory.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/File.php b/t3lib/file/File.php
deleted file mode 100644 (file)
index cd49979..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_File and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/File.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/File.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/FileInterface.php b/t3lib/file/FileInterface.php
deleted file mode 100644 (file)
index 6b0cae4..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_FileInterface and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/FileInterface.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/FileInterface.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/FileReference.php b/t3lib/file/FileReference.php
deleted file mode 100644 (file)
index af59dd6..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_FileReference and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/FileReference.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/FileReference.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Folder.php b/t3lib/file/Folder.php
deleted file mode 100644 (file)
index 5216dbd..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_Folder and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Folder.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Folder.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/FolderInterface.php b/t3lib/file/FolderInterface.php
deleted file mode 100644 (file)
index 9d61639..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_FolderInterface and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/FolderInterface.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/FolderInterface.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/ProcessedFile.php b/t3lib/file/ProcessedFile.php
deleted file mode 100644 (file)
index 07b069a..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_ProcessedFile and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/ProcessedFile.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/ProcessedFile.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Repository/AbstractRepository.php b/t3lib/file/Repository/AbstractRepository.php
deleted file mode 100644 (file)
index f197baa..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_Repository_AbstractRepository and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/AbstractRepository.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/AbstractRepository.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Repository/FileCollectionRepository.php b/t3lib/file/Repository/FileCollectionRepository.php
deleted file mode 100644 (file)
index 651deb6..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_Repository_FileCollectionRepository and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/FileCollectionRepository.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/FileCollectionRepository.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Repository/FileRepository.php b/t3lib/file/Repository/FileRepository.php
deleted file mode 100644 (file)
index bbd694c..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_Repository_FileRepository and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/FileRepository.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/FileRepository.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Repository/ProcessedFileRepository.php b/t3lib/file/Repository/ProcessedFileRepository.php
deleted file mode 100644 (file)
index 0e41ac0..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_Repository_ProcessedFileRepository and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/ProcessedFileRepository.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/ProcessedFileRepository.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Repository/StorageRepository.php b/t3lib/file/Repository/StorageRepository.php
deleted file mode 100644 (file)
index d0489fc..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_Repository_StorageRepository and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/StorageRepository.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/StorageRepository.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/ResourceInterface.php b/t3lib/file/ResourceInterface.php
deleted file mode 100644 (file)
index 5d1d82e..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_ResourceInterface and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/ResourceInterface.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/ResourceInterface.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Service/BackwardsCompatibility/TslibContentAdapterService.php b/t3lib/file/Service/BackwardsCompatibility/TslibContentAdapterService.php
deleted file mode 100644 (file)
index 4925a5b..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_Service_BackwardsCompatibility_TslibContentAdapterService and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Service/FrontendContentAdapterService.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Service/FrontendContentAdapterService.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Service/FileProcessingService.php b/t3lib/file/Service/FileProcessingService.php
deleted file mode 100644 (file)
index ede6fc0..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_Service_FileProcessingService and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Service/FileProcessingService.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Service/FileProcessingService.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Service/ImageProcessingService.php b/t3lib/file/Service/ImageProcessingService.php
deleted file mode 100644 (file)
index 25e623b..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_Service_ImageProcessingService and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Service/ImageProcessingService.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Service/ImageProcessingService.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Service/IndexerService.php b/t3lib/file/Service/IndexerService.php
deleted file mode 100644 (file)
index fd748b6..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_Service_IndexerService and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Service/IndexerService.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Service/IndexerService.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Service/MagicImageService.php b/t3lib/file/Service/MagicImageService.php
deleted file mode 100644 (file)
index 06c6760..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_Service_MagicImageService and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Service/MagicImageService.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Service/MagicImageService.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Service/UserfilemountService.php b/t3lib/file/Service/UserfilemountService.php
deleted file mode 100644 (file)
index 83473b6..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_Service_UserfilemountService and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Service/UserFileMountService.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Service/UserFileMountService.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Storage.php b/t3lib/file/Storage.php
deleted file mode 100644 (file)
index 0c0400c..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_Storage and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/ResourceStorage.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/ResourceStorage.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Utility/FileExtensionFilter.php b/t3lib/file/Utility/FileExtensionFilter.php
deleted file mode 100644 (file)
index 3808014..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_Utility_FileExtensionFilter and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Filter/FileExtensionFilter.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Filter/FileExtensionFilter.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Utility/FileInfo.php b/t3lib/file/Utility/FileInfo.php
deleted file mode 100644 (file)
index 482f964..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_Utility_FileInfo and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Hook/FileInfoHook.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Hook/FileInfoHook.php';
-?>
\ No newline at end of file
diff --git a/t3lib/file/Utility/FilenameFilters.php b/t3lib/file/Utility/FilenameFilters.php
deleted file mode 100644 (file)
index fac29ce..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname t3lib_file_Utility_FilenameFilters and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Resource/Filter/FileNameFilter.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('core') . 'Classes/Resource/Filter/FileNameFilter.php';
-?>
\ No newline at end of file
index ad80da3..c779b8e 100644 (file)
@@ -677,7 +677,7 @@ $TCA['sys_filemounts'] = array(
                        'config' => array(
                                'type' => 'select',
                                'items' => array(),
-                               'itemsProcFunc' => 't3lib/file/Service/UserfilemountService.php:TYPO3\\CMS\\Core\\Resource\\Service\\UserFileMountService->renderTceformsSelectDropdown'
+                               'itemsProcFunc' => 'typo3/sysext/core/Classes/Resource/Service/UserFileMountService.php:TYPO3\CMS\Core\Resource\Service\UserFileMountService->renderTceformsSelectDropdown',
                        )
                )
        ),
index a0f6f09..0209d12 100644 (file)
@@ -20,7 +20,7 @@ $TCA['sys_file'] = array(
                'fileinfo' => array(
                        'config' => array(
                                'type' => 'user',
-                               'userFunc' => 't3lib/file/Utility/FileInfo.php:t3lib_file_utility_fileinfo->renderFileInfo'
+                               'userFunc' => 'typo3/sysext/core/Classes/Resource/Hook/FileInfoHook.php:TYPO3\CMS\Core\Resource\Hook\FileInfoHook->renderFileInfo'
                        )
                ),
                'storage' => array(
index c329dc6..7059e99 100644 (file)
@@ -130,7 +130,7 @@ $TCA['sys_file_collection'] = array(
                        'config' => array(
                                'type' => 'select',
                                'items' => array(),
-                               'itemsProcFunc' => 't3lib/file/Service/UserfilemountService.php:t3lib_file_Service_UserfilemountService->renderTceformsSelectDropdown'
+                               'itemsProcFunc' => 'typo3/sysext/core/Classes/Resource/Service/UserFileMountService.php:TYPO3\CMS\Core\Resource\Service\UserFileMountService->renderTceformsSelectDropdown',
                        )
                )
        ),
index f74854b..ce60097 100644 (file)
@@ -85,7 +85,7 @@ class t3lib_category_CategoryCollectionTest extends Tx_Phpunit_TestCase {
        /**
         * @test
         * @expectedException RuntimeException
-        * @covers t3lib_category_Collection_CategoryCollection::__construct
+        * @covers \TYPO3\CMS\Core\Category\Collection\CategoryCollection::__construct
         * @return void
         */
        public function missingTableNameArgumentForObjectCategoryCollection() {
@@ -94,7 +94,7 @@ class t3lib_category_CategoryCollectionTest extends Tx_Phpunit_TestCase {
 
        /**
         * @test
-        * @covers t3lib_category_Collection_CategoryCollection::fromArray
+        * @covers \TYPO3\CMS\Core\Category\Collection\CategoryCollection::fromArray
         * @return void
         */
        public function checkIfFromArrayMethodSetCorrectProperties() {
@@ -108,27 +108,27 @@ class t3lib_category_CategoryCollectionTest extends Tx_Phpunit_TestCase {
 
        /**
         * @test
-        * @covers t3lib_category_Collection_CategoryCollection::create
+        * @covers \TYPO3\CMS\Core\Category\Collection\CategoryCollection::create
         * @return void
         */
        public function canCreateDummyCollection() {
                $collection = \TYPO3\CMS\Core\Category\Collection\CategoryCollection::create($this->collectionRecord);
-               $this->assertInstanceOf('t3lib_category_collection_categorycollection', $collection);
+               $this->assertInstanceOf('\TYPO3\CMS\Core\Category\Collection\CategoryCollection', $collection);
        }
 
        /**
         * @test
-        * @covers t3lib_category_Collection_CategoryCollection::create
+        * @covers \TYPO3\CMS\Core\Category\Collection\CategoryCollection::create
         * @return void
         */
        public function canCreateDummyCollectionAndFillItems() {
                $collection = \TYPO3\CMS\Core\Category\Collection\CategoryCollection::create($this->collectionRecord, TRUE);
-               $this->assertInstanceOf('t3lib_category_collection_categorycollection', $collection);
+               $this->assertInstanceOf('\TYPO3\CMS\Core\Category\Collection\CategoryCollection', $collection);
        }
 
        /**
         * @test
-        * @covers t3lib_category_Collection_CategoryCollection::getCollectedRecords
+        * @covers \TYPO3\CMS\Core\Category\Collection\CategoryCollection::getCollectedRecords
         * @return void
         */
        public function getCollectedRecordsReturnsEmptyRecordSet() {
@@ -141,7 +141,7 @@ class t3lib_category_CategoryCollectionTest extends Tx_Phpunit_TestCase {
 
        /**
         * @test
-        * @covers t3lib_category_Collection_CategoryCollection::getStorageTableName
+        * @covers \TYPO3\CMS\Core\Category\Collection\CategoryCollection::getStorageTableName
         * @return void
         */
        public function isStorageTableNameEqualsToSysCategory() {
@@ -150,7 +150,7 @@ class t3lib_category_CategoryCollectionTest extends Tx_Phpunit_TestCase {
 
        /**
         * @test
-        * @covers t3lib_category_Collection_CategoryCollection::getStorageItemsField
+        * @covers \TYPO3\CMS\Core\Category\Collection\CategoryCollection::getStorageItemsField
         * @return void
         */
        public function isStorageItemsFieldEqualsToItems() {
index 48a34de..07164ea 100644 (file)
@@ -114,7 +114,7 @@ class t3lib_extFileFunctionsTest extends tx_phpunit_testcase {
                foreach ($storages as $storage) {
 
                }
-               //* @var $storage t3lib_file_Storage */
+               /** @var $storage \TYPO3\CMS\Core\Resource\ResourceStorage */
                return $storages[0];
        }
 
index 7f653a5..577d85b 100644 (file)
@@ -108,7 +108,7 @@ abstract class t3lib_file_BaseTestCase extends Tx_Phpunit_TestCase {
         * @param $type
         * @param $identifier
         * @param $mockedMethods
-        * @return t3lib_file_File|t3lib_File_Folder
+        * @return \TYPO3\CMS\Core\Resource\File|\TYPO3\CMS\Core\Resource\Folder
         */
        protected function _createFileFolderMock($type, $identifier, $mockedMethods) {
                if (!empty($mockedMethods)) {
@@ -152,9 +152,9 @@ abstract class t3lib_file_BaseTestCase extends Tx_Phpunit_TestCase {
         *
         * @param $identifier
         * @param array $mockedMethods Methods to mock, in addition to getFiles and getSubfolders
-        * @param t3lib_file_Folder[] $subfolders
-        * @param t3lib_file_File[] $files
-        * @return t3lib_file_File|t3lib_File_Folder
+        * @param \TYPO3\CMS\Core\Resource\Folder[] $subfolders
+        * @param \TYPO3\CMS\Core\Resource\File[] $files
+        * @return \TYPO3\CMS\Core\Resource\File|\TYPO3\CMS\Core\Resource\Folder
         */
        protected function getFolderMock($identifier, $mockedMethods = array(), $subfolders = array(), $files = array()) {
                $folder = $this->_createFileFolderMock('TYPO3\\CMS\\Core\\Resource\\Folder', $identifier, array_merge($mockedMethods, array('getFiles', 'getSubfolders')));
index 08330ce..3e421c7 100644 (file)
Binary files a/tests/Unit/t3lib/file/Driver/LocalDriverTest.php and b/tests/Unit/t3lib/file/Driver/LocalDriverTest.php differ
index da1c89b..015a564 100644 (file)
@@ -49,7 +49,7 @@ class t3lib_file_Utility_FileExtensionFilterTest extends Tx_Phpunit_TestCase {
        protected $tceMainMock;
 
        /**
-        * @var t3lib_file_Factory|PHPUnit_Framework_MockObject_MockObject
+        * @var \TYPO3\CMS\Core\Resource\ResourceFactory|PHPUnit_Framework_MockObject_MockObject
         */
        protected $fileFactoryMock;
 
index c333551..47a87da 100644 (file)
@@ -708,7 +708,7 @@ class ClickMenu {
         *
         * @param string $combinedIdentifier The combined identifier
         * @return string HTML content
-        * @see t3lib_file_Factory::retrieveFileOrFolderObject()
+        * @see \TYPO3\CMS\Core\Resource\ResourceFactory::retrieveFileOrFolderObject()
         * @todo Define visibility
         */
        public function printFileClickMenu($combinedIdentifier) {
index cc25ad9..b095a1f 100644 (file)
@@ -414,7 +414,7 @@ class ElementInformationController {
         * Make reference display
         *
         * @param string $table Table name
-        * @param string|t3lib_file_File $ref Filename or uid
+        * @param string|\TYPO3\CMS\Core\Resource\File $ref Filename or uid
         * @return string HTML
         * @todo Define visibility
         */
index eb12fff..aa97c9a 100644 (file)
@@ -48,7 +48,7 @@ class FolderTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
        /**
         * The users' file Storages
         *
-        * @var t3lib_file_storage[]
+        * @var \TYPO3\CMS\Core\Resource\ResourceStorage[]
         */
        protected $storages = NULL;
 
@@ -144,7 +144,7 @@ class FolderTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
         * Wrapping $title in a-tags.
         *
         * @param string $title Title string
-        * @param t3lib_file_Folder     $folderObject the folder record
+        * @param \TYPO3\CMS\Core\Resource\Folder       $folderObject the folder record
         * @param integer $bank Bank pointer (which mount point number)
         * @return string
         * @internal
index 1dc198c..9e04a4d 100644 (file)
@@ -176,7 +176,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
        public $checkWorkspaceCurrent_cache = NULL;
 
        /**
-        * @var t3lib_file_Storage[]
+        * @var \TYPO3\CMS\Core\Resource\ResourceStorage[]
         */
        protected $fileStorages;
 
@@ -1578,7 +1578,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
         * If no filemounts an empty array is returned.
         *
         * @api
-        * @return t3lib_file_Storage[]
+        * @return \TYPO3\CMS\Core\Resource\ResourceStorage[]
         */
        public function getFileStorages() {
                // Initializing file mounts after the groups are fetched
@@ -1723,7 +1723,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
        }
 
        /**
-        * Returns a t3lib_file_Folder object that is used for uploading
+        * Returns a \TYPO3\CMS\Core\Resource\Folder object that is used for uploading
         * files by default.
         * This is used for RTE and its magic images, as well as uploads
         * in the TCEforms fields, unless otherwise configured (will be added in the future)
@@ -1734,7 +1734,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
         *
         * options.defaultUploadFolder = 3:myfolder/yourfolder/
         *
-        * @return t3lib_file_Folder|boolean The default upload folder for this user
+        * @return \TYPO3\CMS\Core\Resource\Folder|boolean The default upload folder for this user
         */
        public function getDefaultUploadFolder() {
                $uploadFolder = $this->getTSConfigVal('options.defaultUploadFolder');
index 77d5307..c14decc 100644 (file)
@@ -44,7 +44,7 @@ abstract class AbstractFrontend implements \TYPO3\CMS\Core\Cache\Frontend\Fronte
        protected $identifier;
 
        /**
-        * @var t3lib_cache_backend_AbstractBackend|t3lib_cache_backend_TaggableBackend
+        * @var \TYPO3\CMS\Core\Cache\Backend\AbstractBackend|\TYPO3\CMS\Core\Cache\Backend\TaggableBackendInterface
         */
        protected $backend;
 
index 9a85bad..4a8670d 100644 (file)
@@ -351,7 +351,7 @@ abstract class AbstractFile implements \TYPO3\CMS\Core\Resource\FileInterface {
         * t3lib/file/-internal usage; don't use it to move files.
         *
         * @internal Should only be used by other parts of the File API (e.g. drivers after moving a file)
-        * @param integer|t3lib_file_Storage $storage
+        * @param integer|\TYPO3\CMS\Core\Resource\ResourceStorage $storage
         * @return \TYPO3\CMS\Core\Resource\File
         */
        public function setStorage($storage) {
index e442de9..a124f49 100644 (file)
@@ -473,7 +473,7 @@ class LocalDriver extends \TYPO3\CMS\Core\Resource\Driver\AbstractDriver {
        /**
         * Returns the absolute path of a file or folder.
         *
-        * @param t3lib_file_FileInterface|t3lib_file_Folder|string $file
+        * @param \TYPO3\CMS\Core\Resource\FileInterface|\TYPO3\CMS\Core\Resource\Folder|string $file
         * @return string
         */
        public function getAbsolutePath($file) {
@@ -548,7 +548,7 @@ class LocalDriver extends \TYPO3\CMS\Core\Resource\Driver\AbstractDriver {
         * @param \TYPO3\CMS\Core\Resource\Folder $targetFolder
         * @param string $fileName The name to add the file under
         * @param \TYPO3\CMS\Core\Resource\AbstractFile $updateFileObject File object to update (instead of creating a new object). With this parameter, this function can be used to "populate" a dummy file object with a real file underneath.
-        * @todo t3lib_file_File $updateFileObject should be t3lib_file_FileInterface, but indexer logic is only in t3lib_file_File
+        * @todo \TYPO3\CMS\Core\Resource\File $updateFileObject should be \TYPO3\CMS\Core\Resource\FileInterface, but indexer logic is only in \TYPO3\CMS\Core\Resource\File
         * @return \TYPO3\CMS\Core\Resource\FileInterface
         */
        public function addFile($localFilePath, \TYPO3\CMS\Core\Resource\Folder $targetFolder, $fileName, \TYPO3\CMS\Core\Resource\AbstractFile $updateFileObject = NULL) {
index 0f11222..65e7d4b 100644 (file)
@@ -51,7 +51,8 @@ class FileCollectionRepository extends \TYPO3\CMS\Core\Collection\RecordCollecti
         *
         * @todo the parent function throws already an exception if not found
         * @param integer $uid The uid to be looked up
-        * @return NULL|t3lib_file_Collection_AbstractFileCollection
+        * @return NULL|\TYPO3\CMS\Core\Resource\Collection\AbstractFileCollection
+        * @throws \RuntimeException
         */
        public function findByUid($uid) {
                $object = parent::findByUid($uid);
index 16a0ddf..8253354 100644 (file)
@@ -192,7 +192,7 @@ class FileRepository extends \TYPO3\CMS\Core\Resource\AbstractRepository {
         * Find FileReference objects by uid
         *
         * @param integer $uid The UID of the sys_file_reference record
-        * @return t3lib_file_FileReference|boolean
+        * @return \TYPO3\CMS\Core\Resource\FileReference|boolean
         * @api
         */
        public function findFileReferenceByUid($uid) {
@@ -214,7 +214,7 @@ class FileRepository extends \TYPO3\CMS\Core\Resource\AbstractRepository {
         * @return void
         */
        public function update($modifiedObject) {
-               // TODO check if $modifiedObject is an instance of t3lib_file_File
+               // TODO check if $modifiedObject is an instance of \TYPO3\CMS\Core\Resource\File
                // TODO check if $modifiedObject is indexed
                $changedProperties = $modifiedObject->getUpdatedProperties();
                $properties = $modifiedObject->getProperties();
index 09c4d33..c66b3a8 100644 (file)
@@ -157,7 +157,7 @@ class Folder implements \TYPO3\CMS\Core\Resource\FolderInterface {
         * @param integer $start The item to start at
         * @param integer $numberOfItems The number of items to return
         * @param boolean $useFilters
-        * @return t3lib_file_File[]
+        * @return \TYPO3\CMS\Core\Resource\File[]
         */
        public function getFiles($start = 0, $numberOfItems = 0, $useFilters = TRUE) {
                // TODO fetch
@@ -204,7 +204,7 @@ class Folder implements \TYPO3\CMS\Core\Resource\FolderInterface {
        /**
         * Returns a list of all subfolders
         *
-        * @return t3lib_file_Folder[]
+        * @return \TYPO3\CMS\Core\Resource\Folder[]
         */
        public function getSubfolders() {
                $folderObjects = array();
index 3df2f6d..0462e9b 100644 (file)
@@ -38,7 +38,7 @@ interface FolderInterface extends \TYPO3\CMS\Core\Resource\ResourceInterface
        /**
         * Returns a list of all subfolders
         *
-        * @return t3lib_file_Folder[]
+        * @return \TYPO3\CMS\Core\Resource\Folder[]
         */
        public function getSubfolders();
 
index 62da3d9..e9cc30a 100644 (file)
@@ -48,7 +48,7 @@ class ResourceFactory implements \TYPO3\CMS\Core\SingletonInterface {
        }
 
        /**
-        * @var t3lib_file_Storage[]
+        * @var \TYPO3\CMS\Core\Resource\ResourceStorage[]
         */
        protected $storageInstances = array();
 
@@ -58,12 +58,12 @@ class ResourceFactory implements \TYPO3\CMS\Core\SingletonInterface {
        protected $collectionInstances = array();
 
        /**
-        * @var t3lib_file_File[]
+        * @var \TYPO3\CMS\Core\Resource\File[]
         */
        protected $fileInstances = array();
 
        /**
-        * @var t3lib_file_FileReference[]
+        * @var \TYPO3\CMS\Core\Resource\FileReference[]
         */
        protected $fileReferenceInstances = array();
 
@@ -301,7 +301,7 @@ class ResourceFactory implements \TYPO3\CMS\Core\SingletonInterface {
         * - "file:23"
         *
         * @param string $input
-        * @return t3lib_file_FileInterface|t3lib_file_Folder
+        * @return \TYPO3\CMS\Core\Resource\FileInterface|\TYPO3\CMS\Core\Resource\Folder
         */
        public function retrieveFileOrFolderObject($input) {
                // Easy function to deal with that, could be dropped in the future
@@ -352,7 +352,7 @@ class ResourceFactory implements \TYPO3\CMS\Core\SingletonInterface {
         * Gets a file or folder object.
         *
         * @param string $identifier
-        * @return t3lib_file_FileInterface|t3lib_file_Folder
+        * @return \TYPO3\CMS\Core\Resource\FileInterface|\TYPO3\CMS\Core\Resource\Folder
         */
        public function getObjectFromCombinedIdentifier($identifier) {
                list($storageId, $objectIdentifier) = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(':', $identifier);
@@ -431,7 +431,7 @@ class ResourceFactory implements \TYPO3\CMS\Core\SingletonInterface {
        }
 
        /**
-        * Generates a new object of the type t3lib_file_ProcessedFile
+        * Generates a new object of the type \TYPO3\CMS\Core\Resource\ProcessedFile
         * additionally checks if this processed file already exists in the DB
         *
         * @param \TYPO3\CMS\Core\Resource\FileInterface $originalFileObject
@@ -442,7 +442,7 @@ class ResourceFactory implements \TYPO3\CMS\Core\SingletonInterface {
        public function getProcessedFileObject(\TYPO3\CMS\Core\Resource\FileInterface $originalFileObject, $context, array $configuration) {
                /** @var \TYPO3\CMS\Core\Resource\ProcessedFile $processedFileObject */
                $processedFileObject = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Resource\\ProcessedFile', $originalFileObject, $context, $configuration);
-               /* @var t3lib_file_Repository_ProcessedFileRepository $repository */
+               /* @var \TYPO3\CMS\Core\Resource\ProcessedFileRepository $repository */
                $repository = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Resource\\ProcessedFileRepository');
                // Check if this file already exists in the DB
                $repository->populateDataOfProcessedFileObject($processedFileObject);
index 4ebeccd..8decebf 100644 (file)
@@ -982,8 +982,8 @@ class ResourceStorage {
         * copies a source file (from any location) in to the target
         * folder, the latter has to be part of this storage
         *
-        * @param       t3lib_file_FileInterface        $file
-        * @param       t3lib_file_Folder $targetFolder
+        * @param       \TYPO3\CMS\Core\Resource\FileInterface  $file
+        * @param       \TYPO3\CMS\Core\Resource\Folder $targetFolder
         * @param       string  $conflictMode   "overrideExistingFile", "renameNewFile", "cancel
         * @param       string  $targetFileName an optional destination fileName
         * @return \TYPO3\CMS\Core\Resource\FileInterface
@@ -1203,7 +1203,7 @@ class ResourceStorage {
        /**
         * Previously in t3lib_extFileFunc::func_rename()
         *
-        * @param       t3lib_file_FileInterface        $file
+        * @param       \TYPO3\CMS\Core\Resource\FileInterface  $file
         * @param       string  $targetFileName
         * @return \TYPO3\CMS\Core\Resource\FileInterface
         */
@@ -1287,7 +1287,7 @@ class ResourceStorage {
         * Returns an array with all file objects in a folder and its subfolders, with the file identifiers as keys.
         *
         * @param \TYPO3\CMS\Core\Resource\Folder $folder
-        * @return t3lib_file_File[]
+        * @return \TYPO3\CMS\Core\Resource\File[]
         */
        protected function getAllFileObjectsInFolder(\TYPO3\CMS\Core\Resource\Folder $folder) {
                $files = array();
@@ -1718,91 +1718,91 @@ class ResourceStorage {
        /**
         * Emits the folder pre-copy signal
         *
-        * @param t3lib_File_Folder $folder
+        * @param \TYPO3\CMS\Core\Resource\Folder $folder
         * @param \TYPO3\CMS\Core\Resource\Folder $targetFolder
         * @param $newName
         * @return void
         */
-       protected function emitPreFolderCopySignal(\t3lib_File_Folder $folder, \TYPO3\CMS\Core\Resource\Folder $targetFolder, $newName) {
-               $this->getSignalSlotDispatcher()->dispatch('t3lib_File_Storage', self::SIGNAL_PreFolderCopy, array($folder, $targetFolder));
+       protected function emitPreFolderCopySignal(\TYPO3\CMS\Core\Resource\Folder $folder, \TYPO3\CMS\Core\Resource\Folder $targetFolder, $newName) {
+               $this->getSignalSlotDispatcher()->dispatch('\TYPO3\CMS\Core\Resource\ResourceStorage', self::SIGNAL_PreFolderCopy, array($folder, $targetFolder));
        }
 
        /**
         * Emits the folder post-copy signal
         *
-        * @param t3lib_File_Folder $folder
+        * @param \TYPO3\CMS\Core\Resource\Folder $folder
         * @param \TYPO3\CMS\Core\Resource\Folder $targetFolder
         * @param $newName
         * @return void
         */
-       protected function emitPostFolderCopySignal(\t3lib_File_Folder $folder, \TYPO3\CMS\Core\Resource\Folder $targetFolder, $newName) {
-               $this->getSignalSlotDispatcher()->dispatch('t3lib_File_Storage', self::SIGNAL_PostFolderCopy, array($folder, $targetFolder));
+       protected function emitPostFolderCopySignal(\TYPO3\CMS\Core\Resource\Folder $folder, \TYPO3\CMS\Core\Resource\Folder $targetFolder, $newName) {
+               $this->getSignalSlotDispatcher()->dispatch('\TYPO3\CMS\Core\Resource\ResourceStorage', self::SIGNAL_PostFolderCopy, array($folder, $targetFolder));
        }
 
        /**
         * Emits the folder pre-move signal
         *
-        * @param t3lib_File_Folder $folder
+        * @param \TYPO3\CMS\Core\Resource\Folder $folder
         * @param \TYPO3\CMS\Core\Resource\Folder $targetFolder
         * @param $newName
         * @return void
         */
-       protected function emitPreFolderMoveSignal(\t3lib_File_Folder $folder, \TYPO3\CMS\Core\Resource\Folder $targetFolder, $newName) {
-               $this->getSignalSlotDispatcher()->dispatch('t3lib_File_Storage', self::SIGNAL_PreFolderMove, array($folder, $targetFolder));
+       protected function emitPreFolderMoveSignal(\TYPO3\CMS\Core\Resource\Folder $folder, \TYPO3\CMS\Core\Resource\Folder $targetFolder, $newName) {
+               $this->getSignalSlotDispatcher()->dispatch('\TYPO3\CMS\Core\Resource\ResourceStorage', self::SIGNAL_PreFolderMove, array($folder, $targetFolder));
        }
 
        /**
         * Emits the folder post-move signal
         *
-        * @param t3lib_File_Folder $folder
+        * @param \TYPO3\CMS\Core\Resource\Folder $folder
         * @param \TYPO3\CMS\Core\Resource\Folder $targetFolder
         * @param $newName
         * @return void
         */
-       protected function emitPostFolderMoveSignal(\t3lib_File_Folder $folder, \TYPO3\CMS\Core\Resource\Folder $targetFolder, $newName) {
-               $this->getSignalSlotDispatcher()->dispatch('t3lib_File_Storage', self::SIGNAL_PostFolderMove, array($folder, $targetFolder));
+       protected function emitPostFolderMoveSignal(\TYPO3\CMS\Core\Resource\Folder $folder, \TYPO3\CMS\Core\Resource\Folder $targetFolder, $newName) {
+               $this->getSignalSlotDispatcher()->dispatch('\TYPO3\CMS\Core\Resource\ResourceStorage', self::SIGNAL_PostFolderMove, array($folder, $targetFolder));
        }
 
        /**
         * Emits the folder pre-rename signal
         *
-        * @param t3lib_File_Folder $folder
+        * @param \TYPO3\CMS\Core\Resource\Folder $folder
         * @param $newName
         * @return void
         */
-       protected function emitPreFolderRenameSignal(\t3lib_File_Folder $folder, $newName) {
-               $this->getSignalSlotDispatcher()->dispatch('t3lib_File_Storage', self::SIGNAL_PreFolderRename, array($folder, $newName));
+       protected function emitPreFolderRenameSignal(\TYPO3\CMS\Core\Resource\Folder $folder, $newName) {
+               $this->getSignalSlotDispatcher()->dispatch('\TYPO3\CMS\Core\Resource\ResourceStorage', self::SIGNAL_PreFolderRename, array($folder, $newName));
        }
 
        /**
         * Emits the folder post-rename signal
         *
-        * @param t3lib_File_Folder $folder
+        * @param \TYPO3\CMS\Core\Resource\Folder $folder
         * @param $newName
         * @return void
         */
-       protected function emitPostFolderRenameSignal(\t3lib_File_Folder $folder, $newName) {
-               $this->getSignalSlotDispatcher()->dispatch('t3lib_File_Storage', self::SIGNAL_PostFolderRename, array($folder, $newName));
+       protected function emitPostFolderRenameSignal(\TYPO3\CMS\Core\Resource\Folder $folder, $newName) {
+               $this->getSignalSlotDispatcher()->dispatch('\TYPO3\CMS\Core\Resource\ResourceStorage', self::SIGNAL_PostFolderRename, array($folder, $newName));
        }
 
        /**
         * Emits the folder pre-deletion signal
         *
-        * @param t3lib_File_Folder $folder
+        * @param \TYPO3\CMS\Core\Resource\Folder $folder
         * @return void
         */
-       protected function emitPreFolderDeleteSignal(\t3lib_File_Folder $folder) {
-               $this->getSignalSlotDispatcher()->dispatch('t3lib_File_Storage', self::SIGNAL_PreFolderDelete, array($folder));
+       protected function emitPreFolderDeleteSignal(\TYPO3\CMS\Core\Resource\Folder $folder) {
+               $this->getSignalSlotDispatcher()->dispatch('\TYPO3\CMS\Core\Resource\ResourceStorage', self::SIGNAL_PreFolderDelete, array($folder));
        }
 
        /**
         * Emits folder postdeletion signal.
         *
-        * @param t3lib_File_Folder $folder
+        * @param \TYPO3\CMS\Core\Resource\Folder $folder
         * @return void
         */
-       protected function emitPostFolderDeleteSignal(\t3lib_File_Folder $folder) {
-               $this->getSignalSlotDispatcher()->dispatch('t3lib_File_Storage', self::SIGNAL_PostFolderDelete, array($folder));
+       protected function emitPostFolderDeleteSignal(\TYPO3\CMS\Core\Resource\Folder $folder) {
+               $this->getSignalSlotDispatcher()->dispatch('\TYPO3\CMS\Core\Resource\ResourceStorage', self::SIGNAL_PostFolderDelete, array($folder));
        }
 
        /**
@@ -1851,7 +1851,7 @@ class ResourceStorage {
         * @return      string          A unique fileName inside $folder, based on $theFile.
         * @see t3lib_basicFileFunc::getUniqueName()
         */
-       // TODO check if this should be moved back to t3lib_file_Folder
+       // TODO check if this should be moved back to \TYPO3\CMS\Core\Resource\Folder
        protected function getUniqueName(\TYPO3\CMS\Core\Resource\Folder $folder, $theFile, $dontCheckForUnique = FALSE) {
                static $maxNumber = 99, $uniqueNamePrefix = '';
                // Fetches info about path, name, extention of $theFile
index 125153f..3407ce4 100644 (file)
@@ -58,7 +58,7 @@ class ImageProcessingService {
                        $theImage = $file->getForLocalProcessing(FALSE);
                } else {
                        // clean ../ sections of the path and resolve to proper string.
-                       // This is necessary for the t3lib_file_Service_BackwardsCompatibility_TslibContentAdapterService to work.
+                       // This is necessary for the \TYPO3\CMS\Core\Resource\Service\FrontendContentAdapterService to work.
                        $file = \TYPO3\CMS\Core\Utility\GeneralUtility::resolveBackPath($file);
                        $theImage = $GLOBALS['TSFE']->tmpl->getFileName($file);
                        if (!$theImage) {
@@ -76,7 +76,7 @@ class ImageProcessingService {
                        $maskImages['m_bottomImg'] = $this->getImgResource($contentObject, $maskArray['bottomImg'], $maskArray['bottomImg.']);
                        $maskImages['m_bottomImg_mask'] = $this->getImgResource($contentObject, $maskArray['bottomImg_mask'], $maskArray['bottomImg_mask.']);
                }
-               // TODO use t3lib_file_FileInterface here
+               // TODO use \TYPO3\CMS\Core\Resource\FileInterface here
                if ($file instanceof \TYPO3\CMS\Core\Resource\FileReference) {
                        $hash = $file->getOriginalFile()->calculateChecksum();
                } else {
index 47ae9fb..d743705 100644 (file)
@@ -83,7 +83,7 @@ class IndexerService implements \TYPO3\CMS\Core\SingletonInterface {
         *
         * @param \TYPO3\CMS\Core\Resource\File $fileObject
         * @param bool $updateObject Set this to FALSE to get the indexed values. You have to take care of updating the object yourself then!
-        * @return t3lib_file_File|array the indexed $fileObject or an array of indexed properties.
+        * @return \TYPO3\CMS\Core\Resource\File|array the indexed $fileObject or an array of indexed properties.
         */
        public function indexFile(\TYPO3\CMS\Core\Resource\File $fileObject, $updateObject = TRUE) {
                // Get the file information of this object
@@ -151,7 +151,7 @@ class IndexerService implements \TYPO3\CMS\Core\SingletonInterface {
         * Indexes an array of file objects
         * currently this is done in a simple way, however could be changed to be more performant
         *
-        * @param t3lib_file_File[] $fileObjects
+        * @param \TYPO3\CMS\Core\Resource\File[] $fileObjects
         * @return void
         */
        public function indexFiles(array $fileObjects) {
index e0c8f8c..dec4201 100644 (file)
@@ -78,7 +78,7 @@ class UserFileMountService {
         *
         * @param \TYPO3\CMS\Core\Resource\Folder $parentFolder
         * @param integer $level a limiter
-        * @return t3lib_file_Folder[]
+        * @return \TYPO3\CMS\Core\Resource\Folder[]
         */
        protected function getSubfoldersForOptionList(\TYPO3\CMS\Core\Resource\Folder $parentFolder, $level = 0) {
                $level++;
index 22fe6b5..0c8109b 100644 (file)
@@ -55,7 +55,7 @@ class StorageRepository extends \TYPO3\CMS\Core\Resource\AbstractRepository {
         * Finds storages by type.
         *
         * @param string $storageType
-        * @return t3lib_file_Storage[]
+        * @return \TYPO3\CMS\Core\Resource\ResourceStorage[]
         */
        public function findByStorageType($storageType) {
                $storageObjects = array();
@@ -73,7 +73,7 @@ class StorageRepository extends \TYPO3\CMS\Core\Resource\AbstractRepository {
         * Returns a list of mountpoints that are available in the VFS.
         * In case no storage exists this automatically created a storage for fileadmin/
         *
-        * @return t3lib_file_Storage[]
+        * @return \TYPO3\CMS\Core\Resource\ResourceStorage[]
         */
        public function findAll() {
                $storageObjects = array();
index 404e16a..b0c4bad 100644 (file)
@@ -319,7 +319,7 @@ class ExtendedFileUtility extends \TYPO3\CMS\Core\Utility\File\BasicFileUtility
         * @return string Returns the path (without trailing slash) of the closest recycle-folder if found. Else FALSE.
         * @todo To be put in Storage with a better concept
         * @todo Define visibility
-        * @deprecated since TYPO3 6.0, use t3lib_file_Storage method instead
+        * @deprecated since TYPO3 6.0, use \TYPO3\CMS\Core\Resource\ResourceStorage method instead
         */
        public function findRecycler($theFile) {
                \TYPO3\CMS\Core\Utility\GeneralUtility::logDeprecatedFunction();
@@ -435,7 +435,7 @@ class ExtendedFileUtility extends \TYPO3\CMS\Core\Utility\File\BasicFileUtility
         * Gets a File or a Folder object from an identifier [storage]:[fileId]
         *
         * @param string $identifier
-        * @return t3lib_file_Folder|t3lib_file_File
+        * @return \TYPO3\CMS\Core\Resource\Folder|\TYPO3\CMS\Core\Resource\File
         */
        protected function getFileObject($identifier) {
                $object = $this->fileFactory->retrieveFileOrFolderObject($identifier);
index 36d7b4f..e6bb638 100644 (file)
@@ -201,17 +201,13 @@ return array(
        't3lib_cache_backend_ApcBackend' => 'TYPO3\\CMS\\Core\\Cache\\Backend\\ApcBackend',
        't3lib_cache_backend_Backend' => 'TYPO3\\CMS\\Core\\Cache\\Backend\\BackendInterface',
        't3lib_cache_backend_FileBackend' => 'TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend',
-       't3lib_cache_backend_FreezableBackend' => 'TYPO3\\CMS\\Core\\Cache\\Backend\\FreezableBackendInterface',
        't3lib_cache_backend_MemcachedBackend' => 'TYPO3\\CMS\\Core\\Cache\\Backend\\MemcachedBackend',
        't3lib_cache_backend_NullBackend' => 'TYPO3\\CMS\\Core\\Cache\\Backend\\NullBackend',
        't3lib_cache_backend_PdoBackend' => 'TYPO3\\CMS\\Core\\Cache\\Backend\\PdoBackend',
        't3lib_cache_backend_PhpCapableBackend' => 'TYPO3\\CMS\\Core\\Cache\\Backend\\PhpCapableBackendInterface',
        't3lib_cache_backend_RedisBackend' => 'TYPO3\\CMS\\Core\\Cache\\Backend\\RedisBackend',
-       't3lib_cache_backend_SimpleFileBackend' => 'TYPO3\\CMS\\Core\\Cache\\Backend\\SimpleFileBackend',
-       't3lib_cache_backend_TaggableBackend' => 'TYPO3\\CMS\\Core\\Cache\\Backend\\TaggableBackendInterface',
        't3lib_cache_backend_TransientMemoryBackend' => 'TYPO3\\CMS\\Core\\Cache\\Backend\\TransientMemoryBackend',
        't3lib_cache_backend_DbBackend' => 'TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend',
-       't3lib_cache_backend_WincacheBackend' => 'TYPO3\\CMS\\Core\\Cache\\Backend\\WincacheBackend',
        't3lib_cache' => 'TYPO3\\CMS\\Core\\Cache\\Cache',
        't3lib_cache_Factory' => 'TYPO3\\CMS\\Core\\Cache\\CacheFactory',
        't3lib_cache_Manager' => 'TYPO3\\CMS\\Core\\Cache\\CacheManager',
@@ -227,8 +223,6 @@ return array(
        't3lib_cache_frontend_PhpFrontend' => 'TYPO3\\CMS\\Core\\Cache\\Frontend\\PhpFrontend',
        't3lib_cache_frontend_StringFrontend' => 'TYPO3\\CMS\\Core\\Cache\\Frontend\\StringFrontend',
        't3lib_cache_frontend_VariableFrontend' => 'TYPO3\\CMS\\Core\\Cache\\Frontend\\VariableFrontend',
-       't3lib_category_Registry' => 'TYPO3\\CMS\\Core\\Category\\CategoryRegistry',
-       't3lib_category_Collection_CategoryCollection' => 'TYPO3\\CMS\\Core\\Category\\Collection\\CategoryCollection',
        't3lib_cs' => 'TYPO3\\CMS\\Core\\Charset\\CharsetConverter',
        't3lib_collection_AbstractRecordCollection' => 'TYPO3\\CMS\\Core\\Collection\\AbstractRecordCollection',
        't3lib_collection_Collection' => 'TYPO3\\CMS\\Core\\Collection\\CollectionInterface',
@@ -339,61 +333,7 @@ return array(
        't3lib_FlashMessageQueue' => 'TYPO3\\CMS\\Core\\Messaging\\FlashMessageQueue',
        't3lib_PageRenderer' => 'TYPO3\\CMS\\Core\\Page\\PageRenderer',
        't3lib_Registry' => 'TYPO3\\CMS\\Core\\Registry',
-       't3lib_file_AbstractFile' => 'TYPO3\\CMS\\Core\\Resource\\AbstractFile',
-       't3lib_file_Repository_AbstractRepository' => 'TYPO3\\CMS\\Core\\Resource\\AbstractRepository',
-       't3lib_file_Collection_AbstractFileCollection' => 'TYPO3\\CMS\\Core\\Resource\\Collection\\AbstractFileCollection',
-       't3lib_file_Collection_FolderBasedFileCollection' => 'TYPO3\\CMS\\Core\\Resource\\Collection\\FolderBasedFileCollection',
-       't3lib_file_Collection_StaticFileCollection' => 'TYPO3\\CMS\\Core\\Resource\\Collection\\StaticFileCollection',
-       't3lib_file_Driver_AbstractDriver' => 'TYPO3\\CMS\\Core\\Resource\\Driver\\AbstractDriver',
-       't3lib_file_Driver_DriverRegistry' => 'TYPO3\\CMS\\Core\\Resource\\Driver\\DriverRegistry',
-       't3lib_file_Driver_LocalDriver' => 'TYPO3\\CMS\\Core\\Resource\\Driver\\LocalDriver',
-       't3lib_file_exception_AbstractFileException' => 'TYPO3\\CMS\\Core\\Resource\\Exception',
-       't3lib_file_exception_AbstractFileOperationException' => 'TYPO3\\CMS\\Core\\Resource\\Exception\\AbstractFileOperationException',
-       't3lib_file_exception_ExistingTargetFileNameException' => 'TYPO3\\CMS\\Core\\Resource\\Exception\\ExistingTargetFileNameException',
-       't3lib_file_exception_ExistingTargetFolderException' => 'TYPO3\\CMS\\Core\\Resource\\Exception\\ExistingTargetFolderException',
-       't3lib_file_exception_FileDoesNotExistException' => 'TYPO3\\CMS\\Core\\Resource\\Exception\\FileDoesNotExistException',
-       't3lib_file_exception_FileOperationErrorException' => 'TYPO3\\CMS\\Core\\Resource\\Exception\\FileOperationErrorException',
-       't3lib_file_exception_FolderDoesNotExistException' => 'TYPO3\\CMS\\Core\\Resource\\Exception\\FolderDoesNotExistException',
-       't3lib_file_exception_IllegalFileExtensionException' => 'TYPO3\\CMS\\Core\\Resource\\Exception\\IllegalFileExtensionException',
-       't3lib_file_exception_InsufficientFileAccessPermissionsException' => 'TYPO3\\CMS\\Core\\Resource\\Exception\\InsufficientFileAccessPermissionsException',
-       't3lib_file_exception_InsufficientFileReadPermissionsException' => 'TYPO3\\CMS\\Core\\Resource\\Exception\\InsufficientFileReadPermissionsException',
-       't3lib_file_exception_InsufficientFileWritePermissionsException' => 'TYPO3\\CMS\\Core\\Resource\\Exception\\InsufficientFileWritePermissionsException',
-       't3lib_file_exception_InsufficientFolderAccessPermissionsException' => 'TYPO3\\CMS\\Core\\Resource\\Exception\\InsufficientFolderAccessPermissionsException',
-       't3lib_file_exception_InsufficientFolderReadPermissionsException' => 'TYPO3\\CMS\\Core\\Resource\\Exception\\InsufficientFolderReadPermissionsException',
-       't3lib_file_exception_InsufficientFolderWritePermissionsException' => 'TYPO3\\CMS\\Core\\Resource\\Exception\\InsufficientFolderWritePermissionsException',
-       't3lib_file_exception_InsufficientUserPermissionsException' => 'TYPO3\\CMS\\Core\\Resource\\Exception\\InsufficientUserPermissionsException',
-       't3lib_file_exception_InvalidConfigurationException' => 'TYPO3\\CMS\\Core\\Resource\\Exception\\InvalidConfigurationException',
-       't3lib_file_exception_InvalidFileException' => 'TYPO3\\CMS\\Core\\Resource\\Exception\\InvalidFileException',
-       't3lib_file_exception_InvalidFileNameException' => 'TYPO3\\CMS\\Core\\Resource\\Exception\\InvalidFileNameException',
-       't3lib_file_exception_InvalidFolderException' => 'TYPO3\\CMS\\Core\\Resource\\Exception\\InvalidFolderException',
-       't3lib_file_exception_InvalidPathException' => 'TYPO3\\CMS\\Core\\Resource\\Exception\\InvalidPathException',
-       't3lib_file_exception_InvalidTargetFolderException' => 'TYPO3\\CMS\\Core\\Resource\\Exception\\InvalidTargetFolderException',
-       't3lib_file_exception_NotInMountPointException' => 'TYPO3\\CMS\\Core\\Resource\\Exception\\NotInMountPointException',
-       't3lib_file_exception_UploadException' => 'TYPO3\\CMS\\Core\\Resource\\Exception\\UploadException',
-       't3lib_file_exception_UploadSizeException' => 'TYPO3\\CMS\\Core\\Resource\\Exception\\UploadSizeException',
-       't3lib_file_File' => 'TYPO3\\CMS\\Core\\Resource\\File',
-       't3lib_file_Repository_FileCollectionRepository' => 'TYPO3\\CMS\\Core\\Resource\\FileCollectionRepository',
-       't3lib_file_FileInterface' => 'TYPO3\\CMS\\Core\\Resource\\FileInterface',
-       't3lib_file_FileReference' => 'TYPO3\\CMS\\Core\\Resource\\FileReference',
-       't3lib_file_Repository_FileRepository' => 'TYPO3\\CMS\\Core\\Resource\\FileRepository',
-       't3lib_file_Utility_FileExtensionFilter' => 'TYPO3\\CMS\\Core\\Resource\\Filter\\FileExtensionFilter',
-       't3lib_file_Utility_FilenameFilters' => 'TYPO3\\CMS\\Core\\Resource\\Filter\\FileNameFilter',
-       't3lib_file_Folder' => 'TYPO3\\CMS\\Core\\Resource\\Folder',
-       't3lib_file_FolderInterface' => 'TYPO3\\CMS\\Core\\Resource\\FolderInterface',
-       't3lib_file_Utility_FileInfo' => 'TYPO3\\CMS\\Core\\Resource\\Hook\\FileInfoHook',
-       't3lib_file_ProcessedFile' => 'TYPO3\\CMS\\Core\\Resource\\ProcessedFile',
-       't3lib_file_Repository_ProcessedFileRepository' => 'TYPO3\\CMS\\Core\\Resource\\ProcessedFileRepository',
        't3lib_Compressor' => 'TYPO3\\CMS\\Core\\Resource\\ResourceCompressor',
-       't3lib_file_Factory' => 'TYPO3\\CMS\\Core\\Resource\\ResourceFactory',
-       't3lib_file_ResourceInterface' => 'TYPO3\\CMS\\Core\\Resource\\ResourceInterface',
-       't3lib_file_Storage' => 'TYPO3\\CMS\\Core\\Resource\\ResourceStorage',
-       't3lib_file_Service_FileProcessingService' => 'TYPO3\\CMS\\Core\\Resource\\Service\\FileProcessingService',
-       't3lib_file_Service_BackwardsCompatibility_TslibContentAdapterService' => 'TYPO3\\CMS\\Core\\Resource\\Service\\FrontendContentAdapterService',
-       't3lib_file_Service_ImageProcessingService' => 'TYPO3\\CMS\\Core\\Resource\\Service\\ImageProcessingService',
-       't3lib_file_Service_IndexerService' => 'TYPO3\\CMS\\Core\\Resource\\Service\\IndexerService',
-       't3lib_file_Service_MagicImageService' => 'TYPO3\\CMS\\Core\\Resource\\Service\\MagicImageService',
-       't3lib_file_Service_UserfilemountService' => 'TYPO3\\CMS\\Core\\Resource\\Service\\UserFileMountService',
-       't3lib_file_Repository_StorageRepository' => 'TYPO3\\CMS\\Core\\Resource\\StorageRepository',
        't3lib_svbase' => 'TYPO3\\CMS\\Core\\Service\\AbstractService',
        't3lib_Singleton' => 'TYPO3\\CMS\\Core\\SingletonInterface',
        't3lib_TimeTrackNull' => 'TYPO3\\CMS\\Core\\TimeTracker\\NullTimeTracker',
@@ -1775,4 +1715,4 @@ return array(
        'Tx_Workspaces_Service_AutoPublishTask' => 'TYPO3\\CMS\\Workspaces\\Task\\AutoPublishTask',
        'Tx_Workspaces_Service_CleanupPreviewLinkTask' => 'TYPO3\\CMS\\Workspaces\\Task\\CleanupPreviewLinkTask'
 );
-?>
\ No newline at end of file
+?>
index 2d8e71a..f9c3dc9 100644 (file)
@@ -48,7 +48,7 @@ class FileListController {
         */
        public $id;
 
-       /* @var t3lib_file_Folder $folderObject */
+       /* @var \TYPO3\CMS\Core\Resource\Folder $folderObject */
        protected $folderObject;
 
        /* @var t3lib_FlashMessage $errorMessage */
index aead034..f4e0cba 100644 (file)
@@ -397,7 +397,7 @@ class FileList extends \TYPO3\CMS\Backend\RecordList\AbstractRecordList {
        /**
         * This returns tablerows for the directories in the array $items['sorting'].
         *
-        * @param t3lib_file_Folder[] $folders Folders of t3lib_file_Folder
+        * @param \TYPO3\CMS\Core\Resource\Folder[] $folders Folders of \TYPO3\CMS\Core\Resource\Folder
         * @return string HTML table rows.
         * @todo Define visibility
         */
@@ -539,7 +539,7 @@ class FileList extends \TYPO3\CMS\Backend\RecordList\AbstractRecordList {
        /**
         * This returns tablerows for the files in the array $items['sorting'].
         *
-        * @param t3lib_file_File[] $files File items
+        * @param \TYPO3\CMS\Core\Resource\File[] $files File items
         * @return string HTML table rows.
         * @todo Define visibility
         */
@@ -647,7 +647,7 @@ class FileList extends \TYPO3\CMS\Backend\RecordList\AbstractRecordList {
        /**
         * Creates the clipboard control pad
         *
-        * @param t3lib_file_File|t3lib_file_Folder $fileOrFolderObject Array with information about the file/directory for which to make the clipboard panel for the listing.
+        * @param \TYPO3\CMS\Core\Resource\File|\TYPO3\CMS\Core\Resource\Folder $fileOrFolderObject Array with information about the file/directory for which to make the clipboard panel for the listing.
         * @return string HTML-table
         * @todo Define visibility
         */
@@ -683,7 +683,7 @@ class FileList extends \TYPO3\CMS\Backend\RecordList\AbstractRecordList {
        /**
         * Creates the edit control section
         *
-        * @param t3lib_file_File|t3lib_file_Folder $fileOrFolderObject Array with information about the file/directory for which to make the edit control section for the listing.
+        * @param \TYPO3\CMS\Core\Resource\File|\TYPO3\CMS\Core\Resource\Folder $fileOrFolderObject Array with information about the file/directory for which to make the edit control section for the listing.
         * @return string HTML-table
         * @todo Define visibility
         */
@@ -745,7 +745,7 @@ class FileList extends \TYPO3\CMS\Backend\RecordList\AbstractRecordList {
        /**
         * Make reference count
         *
-        * @param t3lib_file_File|t3lib_file_Folder $fileOrFolderObject Array with information about the file/directory for which to make the clipboard panel for the listing.
+        * @param \TYPO3\CMS\Core\Resource\File|\TYPO3\CMS\Core\Resource\Folder $fileOrFolderObject Array with information about the file/directory for which to make the clipboard panel for the listing.
         * @return string HTML
         * @todo Define visibility
         */
index ad6f21e..6d8e6c9 100644 (file)
@@ -5314,7 +5314,7 @@ class ContentObjectRenderer {
                        $fileObject = NULL;
                }
                if ($fileObject instanceof \TYPO3\CMS\Core\Resource\FileInterface) {
-                       // All properties of the t3lib_file_FileInterface are available here:
+                       // All properties of the \TYPO3\CMS\Core\Resource\FileInterface are available here:
                        switch ($requestedFileInformationKey) {
                        case 'name':
                                return $fileObject->getName();
index f55c719..6029b66 100644 (file)
@@ -1485,7 +1485,7 @@ class ElementBrowser {
         * Render list of files.
         *
         * @param array $files List of files. See t3lib_div::getFilesInDir
-        * @param string t3lib_file_Folder $folder If set a header with a folder icon and folder name are shown
+        * @param string \TYPO3\CMS\Core\Resource\Folder $folder If set a header with a folder icon and folder name are shown
         * @param boolean $noThumbs Whether to show thumbnails or not. If set, no thumbnails are shown.
         * @return string HTML output
         * @todo Define visibility
index 953cc4f..35d4b41 100644 (file)
@@ -15,7 +15,7 @@ class FolderTree extends \rteFolderTree {
         * Wrapping the title in a link, if applicable.
         *
         * @param       string                  Title, ready for output.
-        * @param       t3lib_file_Folder       The "record
+        * @param       \TYPO3\CMS\Core\Resource\Folder The "record
         * @return      string                  Wrapping title string.
         * @todo Define visibility
         */
index 81c0263..ba0297f 100644 (file)
@@ -51,7 +51,7 @@ class ImageFolderTree extends TBE_FolderTree {
         * Wrapping the title in a link, if applicable.
         *
         * @param       string                  Title, ready for output.
-        * @param       t3lib_file_Folder       The "record
+        * @param       \TYPO3\CMS\Core\Resource\Folder The "record
         * @return      string                  Wrapping title string.
         * @todo Define visibility
         */
@@ -67,7 +67,7 @@ class ImageFolderTree extends TBE_FolderTree {
        /**
         * Returns TRUE if the input "record" contains a folder which can be linked.
         *
-        * @param       t3lib_file_Folder       Object with information about the folder element. Contains keys like title, uid, path, _title
+        * @param       \TYPO3\CMS\Core\Resource\Folder Object with information about the folder element. Contains keys like title, uid, path, _title
         * @return      boolean                 TRUE is returned if the path is found in the web-part of the the server and is NOT a recycler or temp folder
         * @todo Define visibility
         */