[CLEANUP] Fix class alias maps and IDE files 22/43422/4
authorHelmut Hummel <helmut.hummel@typo3.org>
Thu, 11 Jun 2015 12:06:35 +0000 (14:06 +0200)
committerAndreas Fernandez <typo3@scripting-base.de>
Fri, 18 Sep 2015 14:41:31 +0000 (16:41 +0200)
With moving code around the class alias maps placed in compatibility6
and mediace got a little messed up. Move the aliases to the correct place
and remove stale aliases.

Resolves: #69946
Releases: master
Change-Id: Ifec476b6e6135ad8b6640c34ec54d8118201e6f5
Reviewed-on: http://review.typo3.org/43422
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez <typo3@scripting-base.de>
typo3/sysext/compatibility6/Migrations/Code/ClassAliasMap.php
typo3/sysext/compatibility6/Migrations/Code/LegacyClassesForIde.php
typo3/sysext/mediace/Migrations/Code/ClassAliasMap.php
typo3/sysext/mediace/Migrations/Code/LegacyClassesForIde.php

index 3c77ce7..932f7b5 100644 (file)
@@ -262,7 +262,6 @@ return array(
        't3lib_utility_Path' => \TYPO3\CMS\Core\Utility\PathUtility::class,
        't3lib_utility_PhpOptions' => \TYPO3\CMS\Core\Utility\PhpOptionsUtility::class,
        't3lib_utility_VersionNumber' => \TYPO3\CMS\Core\Utility\VersionNumberUtility::class,
-       'SC_view_help' => \TYPO3\CMS\Cshmanual\Controller\HelpModuleController::class,
        'tx_cssstyledcontent_pi1' => \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController::class,
        'tx_dbal_module1' => \TYPO3\CMS\Dbal\Controller\ModuleController::class,
        'tx_dbal_querycache' => \TYPO3\CMS\Dbal\QueryCache::class,
@@ -949,7 +948,6 @@ return array(
        'tslib_content_File' => \TYPO3\CMS\Frontend\ContentObject\FileContentObject::class,
        'tslib_content_fileLinkHook' => \TYPO3\CMS\Frontend\ContentObject\FileLinkHookInterface::class,
        'tslib_content_Files' => \TYPO3\CMS\Frontend\ContentObject\FilesContentObject::class,
-       'tslib_content_FlowPlayer' => \TYPO3\CMS\Mediace\ContentObject\FlowPlayerContentObject::class,
        'tslib_content_FluidTemplate' => \TYPO3\CMS\Frontend\ContentObject\FluidTemplateContentObject::class,
        'tslib_content_Form' => \TYPO3\CMS\Compatibility6\ContentObject\FormContentObject::class,
        'tslib_content_HierarchicalMenu' => \TYPO3\CMS\Frontend\ContentObject\HierarchicalMenuContentObject::class,
@@ -958,15 +956,11 @@ return array(
        'tslib_content_ImageResource' => \TYPO3\CMS\Frontend\ContentObject\ImageResourceContentObject::class,
        'tslib_content_ImageText' => \TYPO3\CMS\Compatibility6\ContentObject\ImageTextContentObject::class,
        'tslib_content_LoadRegister' => \TYPO3\CMS\Frontend\ContentObject\LoadRegisterContentObject::class,
-       'tslib_content_Media' => \TYPO3\CMS\Mediace\ContentObject\MediaContentObject::class,
-       'tslib_content_Multimedia' => \TYPO3\CMS\Mediace\ContentObject\MultimediaContentObject::class,
        'tslib_content_OffsetTable' => \TYPO3\CMS\Compatibility6\ContentObject\OffsetTableContentObject::class,
-       'tslib_content_QuicktimeObject' => \TYPO3\CMS\Mediace\ContentObject\QuicktimeObjectContentObject::class,
        'tslib_content_Records' => \TYPO3\CMS\Frontend\ContentObject\RecordsContentObject::class,
        'tslib_content_RestoreRegister' => \TYPO3\CMS\Frontend\ContentObject\RestoreRegisterContentObject::class,
        'tslib_content_ScalableVectorGraphics' => \TYPO3\CMS\Frontend\ContentObject\ScalableVectorGraphicsContentObject::class,
        'tslib_content_SearchResult' => \TYPO3\CMS\Compatibility6\ContentObject\SearchResultContentObject::class,
-       'tslib_content_ShockwaveFlashObject' => \TYPO3\CMS\Mediace\ContentObject\ShockwaveFlashObjectContentObject::class,
        'tslib_content_Template' => \TYPO3\CMS\Frontend\ContentObject\TemplateContentObject::class,
        'tslib_content_Text' => \TYPO3\CMS\Frontend\ContentObject\TextContentObject::class,
        'tslib_content_User' => \TYPO3\CMS\Frontend\ContentObject\UserContentObject::class,
@@ -989,9 +983,6 @@ return array(
        'tx_cms_mediaItems' => \TYPO3\CMS\Frontend\Hooks\MediaItemHooks::class,
        'tx_cms_treelistCacheUpdate' => \TYPO3\CMS\Frontend\Hooks\TreelistCacheUpdateHooks::class,
        'tslib_gifBuilder' => \TYPO3\CMS\Frontend\Imaging\GifBuilder::class,
-       'tslib_mediaWizardCoreProvider' => \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProvider::class,
-       'tslib_mediaWizardProvider' => \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProviderInterface::class,
-       'tslib_mediaWizardManager' => \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProviderManager::class,
        't3lib_cacheHash' => \TYPO3\CMS\Frontend\Page\CacheHashCalculator::class,
        'tslib_frameset' => \TYPO3\CMS\Frontend\Page\FramesetRenderer::class,
        'TSpagegen' => \TYPO3\CMS\Frontend\Page\PageGenerator::class,
index 396dfc6..befc943 100644 (file)
@@ -854,7 +854,7 @@ class t3lib_softrefproc extends \TYPO3\CMS\Core\Database\SoftReferenceIndex {}
 /**
  * @deprecated since 6.0, removed since 7.0
  */
-class t3lib_sqlparser extends \TYPO3\CMS\Core\Database\SqlParser {}
+class t3lib_sqlparser extends \TYPO3\CMS\Dbal\Database\SqlParser {}
 
 /**
  * @deprecated since 6.0, removed since 7.0
@@ -1314,11 +1314,6 @@ class t3lib_utility_VersionNumber extends \TYPO3\CMS\Core\Utility\VersionNumberU
 /**
  * @deprecated since 6.0, removed since 7.0
  */
-class SC_view_help extends \TYPO3\CMS\Cshmanual\Controller\HelpModuleController {}
-
-/**
- * @deprecated since 6.0, removed since 7.0
- */
 class tx_cssstyledcontent_pi1 extends \TYPO3\CMS\CssStyledContent\Controller\CssStyledContentController {}
 
 /**
@@ -4744,11 +4739,6 @@ class tslib_content_Files extends \TYPO3\CMS\Frontend\ContentObject\FilesContent
 /**
  * @deprecated since 6.0, removed since 7.0
  */
-class tslib_content_FlowPlayer extends \TYPO3\CMS\Mediace\ContentObject\FlowPlayerContentObject {}
-
-/**
- * @deprecated since 6.0, removed since 7.0
- */
 class tslib_content_FluidTemplate extends \TYPO3\CMS\Frontend\ContentObject\FluidTemplateContentObject {}
 
 /**
@@ -4789,26 +4779,11 @@ class tslib_content_LoadRegister extends \TYPO3\CMS\Frontend\ContentObject\LoadR
 /**
  * @deprecated since 6.0, removed since 7.0
  */
-class tslib_content_Media extends \TYPO3\CMS\Mediace\ContentObject\MediaContentObject {}
-
-/**
- * @deprecated since 6.0, removed since 7.0
- */
-class tslib_content_Multimedia extends \TYPO3\CMS\Mediace\ContentObject\MultimediaContentObject {}
-
-/**
- * @deprecated since 6.0, removed since 7.0
- */
 class tslib_content_OffsetTable extends \TYPO3\CMS\Compatibility6\ContentObject\OffsetTableContentObject {}
 
 /**
  * @deprecated since 6.0, removed since 7.0
  */
-class tslib_content_QuicktimeObject extends \TYPO3\CMS\Mediace\ContentObject\QuicktimeObjectContentObject {}
-
-/**
- * @deprecated since 6.0, removed since 7.0
- */
 class tslib_content_Records extends \TYPO3\CMS\Frontend\ContentObject\RecordsContentObject {}
 
 /**
@@ -4829,11 +4804,6 @@ class tslib_content_SearchResult extends \TYPO3\CMS\Compatibility6\ContentObject
 /**
  * @deprecated since 6.0, removed since 7.0
  */
-class tslib_content_ShockwaveFlashObject extends \TYPO3\CMS\Mediace\ContentObject\ShockwaveFlashObjectContentObject {}
-
-/**
- * @deprecated since 6.0, removed since 7.0
- */
 class tslib_content_Template extends \TYPO3\CMS\Frontend\ContentObject\TemplateContentObject {}
 
 /**
@@ -4944,21 +4914,6 @@ class tslib_gifBuilder extends \TYPO3\CMS\Frontend\Imaging\GifBuilder {}
 /**
  * @deprecated since 6.0, removed since 7.0
  */
-class tslib_mediaWizardCoreProvider extends \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProvider {}
-
-/**
- * @deprecated since 6.0, removed since 7.0
- */
-interface tslib_mediaWizardProvider extends \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProviderInterface {}
-
-/**
- * @deprecated since 6.0, removed since 7.0
- */
-class tslib_mediaWizardManager extends \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProviderManager {}
-
-/**
- * @deprecated since 6.0, removed since 7.0
- */
 class t3lib_cacheHash extends \TYPO3\CMS\Frontend\Page\CacheHashCalculator {}
 
 /**
index bf86d73..5648679 100644 (file)
@@ -8,4 +8,12 @@ return array(
        'TYPO3\\CMS\\Frontend\\MediaWizard\MediaWizardProvider' => \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProvider::class,
        'TYPO3\\CMS\\Frontend\\MediaWizard\MediaWizardProviderInterface' => \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProviderInterface::class,
        'TYPO3\\CMS\\Frontend\\MediaWizard\MediaWizardProviderManager' => \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProviderManager::class,
+       'tslib_content_FlowPlayer' => \TYPO3\CMS\Mediace\ContentObject\FlowPlayerContentObject::class,
+       'tslib_content_Media' => \TYPO3\CMS\Mediace\ContentObject\MediaContentObject::class,
+       'tslib_content_Multimedia' => \TYPO3\CMS\Mediace\ContentObject\MultimediaContentObject::class,
+       'tslib_content_QuicktimeObject' => \TYPO3\CMS\Mediace\ContentObject\QuicktimeObjectContentObject::class,
+       'tslib_content_ShockwaveFlashObject' => \TYPO3\CMS\Mediace\ContentObject\ShockwaveFlashObjectContentObject::class,
+       'tslib_mediaWizardCoreProvider' => \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProvider::class,
+       'tslib_mediaWizardProvider' => \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProviderInterface::class,
+       'tslib_mediaWizardManager' => \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProviderManager::class,
 );
index 8d49b75..18b6461 100644 (file)
@@ -24,3 +24,19 @@ class tslib_content_QuicktimeObject extends \TYPO3\CMS\Mediace\ContentObject\Qui
  * @deprecated since 6.0, removed since 7.0
  */
 class tslib_content_ShockwaveFlashObject extends \TYPO3\CMS\Mediace\ContentObject\ShockwaveFlashObjectContentObject {}
+
+/**
+ * @deprecated since 6.0, removed since 7.0
+ */
+class tslib_mediaWizardCoreProvider extends \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProvider {}
+
+/**
+ * @deprecated since 6.0, removed since 7.0
+ */
+interface tslib_mediaWizardProvider extends \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProviderInterface {}
+
+/**
+ * @deprecated since 6.0, removed since 7.0
+ */
+class tslib_mediaWizardManager extends \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProviderManager {}
+