From b830361a1dad0128341457f1fe812fcca1851f58 Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Thu, 11 Apr 2013 20:03:08 +0200
Subject: [PATCH] [TASK] Update t3lib mentions
Some core parts still mention t3lib classes after namespaces,
mostly in comments.
Resolves: #47138
Releases: 6.1
Change-Id: I0775fc10f8c901a02533e5bc0fe1c6aa2276758b
Reviewed-on: https://review.typo3.org/19803
Reviewed-by: Anja Leichsenring
Tested-by: Anja Leichsenring
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
---
.../backend/Classes/ClickMenu/ClickMenu.php | 2 +-
.../TranslationConfigurationProvider.php | 4 +-
.../Classes/Configuration/TsConfigParser.php | 1 -
.../ConditionMatching/ConditionMatcher.php | 2 +-
.../AbstractExtdirectContextMenu.php | 8 ++--
.../Classes/Controller/LogoutController.php | 2 +-
.../SimpleDataHandlerController.php | 4 +-
.../Wizard/ColorpickerController.php | 4 +-
.../backend/Classes/Form/DataPreprocessor.php | 6 +--
.../Form/DatabaseFileIconsHookInterface.php | 11 +++---
.../Classes/Form/Element/InlineElement.php | 24 ++++++------
.../Element/InlineElementHookInterface.php | 9 +++--
.../Form/Element/SuggestDefaultReceiver.php | 2 +-
.../Classes/Form/Element/SuggestElement.php | 6 ++-
.../Classes/Form/Element/ValueSlider.php | 2 +-
.../backend/Classes/Form/FlexFormsHelper.php | 6 +--
.../backend/Classes/Form/FormEngine.php | 14 +++----
.../FrontendBackendUserAuthentication.php | 7 +---
.../Classes/Module/AbstractFunctionModule.php | 34 +++++++++-------
.../Classes/Module/BaseScriptClass.php | 20 +++-------
.../backend/Classes/Module/ModuleLoader.php | 11 ++----
.../backend/Classes/Module/ModuleSettings.php | 12 +-----
.../Classes/RecordList/AbstractRecordList.php | 5 ++-
.../Classes/Search/LiveSearch/LiveSearch.php | 11 ++----
.../Classes/Sprite/AbstractSpriteHandler.php | 14 ++++---
.../Classes/Sprite/SimpleSpriteHandler.php | 14 ++++---
.../Sprite/SpriteIconGeneratorInterface.php | 2 +-
.../backend/Classes/Sprite/SpriteManager.php | 2 +-
.../Classes/Template/DocumentTemplate.php | 4 +-
.../Classes/Tree/Pagetree/DataProvider.php | 13 ++++---
.../Classes/Tree/TreeNodeCollection.php | 2 +-
.../Classes/Tree/View/AbstractTreeView.php | 8 ++--
.../Classes/Tree/View/BrowseTreeView.php | 13 +------
.../Classes/Tree/View/FolderTreeView.php | 15 ++-----
.../Classes/Tree/View/PagePositionMap.php | 3 +-
.../Classes/Tree/View/PageTreeView.php | 11 +-----
.../Classes/Utility/BackendUtility.php | 29 +++++++-------
.../backend/Classes/Utility/IconUtility.php | 18 +++++----
.../Classes/View/BackendLayoutView.php | 4 +-
.../backend/Classes/View/PageTreeView.php | 7 ++--
.../Unit/Tree/Pagetree/DataProviderTest.php | 2 +-
typo3/sysext/cms/tslib/showpic.php | 9 ++++-
.../AbstractUserAuthentication.php | 5 +--
.../BackendUserAuthentication.php | 5 +--
.../Classes/Cache/Backend/AbstractBackend.php | 2 +-
.../Cache/Backend/BackendInterface.php | 2 +-
.../Classes/Cache/Backend/FileBackend.php | 8 ++--
.../Cache/Backend/MemcachedBackend.php | 2 +-
.../Classes/Cache/Backend/RedisBackend.php | 4 +-
.../core/Classes/Charset/CharsetConverter.php | 2 +-
.../Configuration/FlexForm/FlexFormTools.php | 2 +-
.../AbstractConditionMatcher.php | 2 +-
typo3/sysext/core/Classes/Core/Bootstrap.php | 4 +-
.../sysext/core/Classes/Core/ClassLoader.php | 4 +-
.../Classes/Core/SystemEnvironmentBuilder.php | 4 +-
.../core/Classes/DataHandling/DataHandler.php | 35 +++++++----------
...dlerCheckModifyAccessListHookInterface.php | 4 +-
.../DataHandlerProcessUploadHookInterface.php | 4 +-
.../Classes/Database/DatabaseConnection.php | 6 +--
.../PostProcessQueryHookInterface.php | 4 +-
.../Database/PreProcessQueryHookInterface.php | 4 +-
.../Classes/Database/PreparedStatement.php | 24 ++++++------
.../core/Classes/Database/ReferenceIndex.php | 2 +-
.../core/Classes/Database/RelationHandler.php | 5 +--
.../Error/AbstractExceptionHandler.php | 4 +-
.../core/Classes/Error/ErrorHandler.php | 4 +-
.../FormProtection/AbstractFormProtection.php | 5 +--
.../FormProtection/BackendFormProtection.php | 9 ++---
.../FormProtection/DisabledFormProtection.php | 3 +-
.../FormProtection/FormProtectionFactory.php | 9 ++---
.../InstallToolFormProtection.php | 3 +-
.../FrontendEditingController.php | 6 +--
.../core/Classes/Html/RteHtmlParser.php | 5 +--
.../Classes/Imaging/GraphicalFunctions.php | 4 +-
.../core/Classes/Localization/Locales.php | 6 +--
typo3/sysext/core/Classes/Locking/Locker.php | 7 +---
.../core/Classes/Mail/SwiftMailerAdapter.php | 2 +-
.../Classes/Messaging/AbstractMessage.php | 4 +-
.../Messaging/AbstractStandaloneMessage.php | 2 +-
.../Classes/Messaging/ErrorpageMessage.php | 2 +-
.../core/Classes/Messaging/FlashMessage.php | 2 +-
.../sysext/core/Classes/Page/PageRenderer.php | 4 +-
.../Classes/Resource/Driver/LocalDriver.php | 2 +-
.../core/Classes/Resource/ResourceFactory.php | 2 +-
.../core/Classes/Resource/ResourceStorage.php | 23 +++++------
.../Resource/Service/UserFileMountService.php | 8 ++--
.../core/Classes/TimeTracker/TimeTracker.php | 12 +-----
.../DatabaseTreeDataProvider.php | 2 +-
.../TreeDataProviderFactory.php | 7 ++--
.../TypoScript/ExtendedTemplateService.php | 2 +-
.../TypoScript/Parser/TypoScriptParser.php | 19 ++++-----
.../Classes/TypoScript/TemplateService.php | 9 +++--
.../core/Classes/Utility/CommandUtility.php | 2 +-
.../Utility/ExtensionManagementUtility.php | 5 ++-
.../Classes/Utility/File/BasicFileUtility.php | 15 +++----
.../Utility/File/ExtendedFileUtility.php | 1 -
...dedFileUtilityProcessDataHookInterface.php | 4 +-
.../core/Classes/Utility/GeneralUtility.php | 6 +--
.../Configuration/DefaultConfiguration.php | 16 ++++----
.../Migrations/Code/LegacyClassesForIde.php | 5 ---
.../AbstractUserAuthenticationTest.php | 2 +-
.../Unit/Cache/Backend/FileBackendTest.php | 6 +--
.../Unit/Cache/Backend/RedisBackendTest.php | 2 +-
.../core/Tests/Unit/Core/ClassLoaderTest.php | 4 +-
.../Unit/DataHandling/DataHandlerTest.php | 4 +-
.../Unit/Database/PreparedStatementTest.php | 18 +++------
.../AbstractFormProtectionTest.php | 4 +-
.../BackendFormProtectionTest.php | 2 +-
.../FormProtectionFactoryTest.php | 2 +-
.../core/Tests/Unit/Locking/LockerTest.php | 2 +-
.../Tests/Unit/Log/Writer/DatabaseTest.php | 4 +-
.../core/Tests/Unit/Mail/MailerTest.php | 3 --
.../Utility/FileExtensionFilterTest.php | 2 +-
.../Tests/Unit/Utility/ClientUtilityTest.php | 2 +-
...stClassWithStringRepresentationFixture.php | 5 +--
typo3/sysext/core/ext_tables.php | 2 +-
.../Controller/HelpModuleController.php | 3 +-
.../ViewHelpers/Be/ContainerViewHelper.php | 2 +-
typo3/sysext/extensionmanager/ext_tables.php | 4 +-
.../feedit/Classes/FrontendEditPanel.php | 1 -
typo3/sysext/filelist/Classes/FileList.php | 3 --
.../FrontendUserAuthentication.php | 4 +-
.../ConditionMatching/ConditionMatcher.php | 2 +-
.../ContentObject/ContentObjectRenderer.php | 24 ++++++------
.../TypoScriptFrontendController.php | 39 +++++++++----------
.../frontend/Classes/Imaging/GifBuilder.php | 15 +++----
.../Classes/Page/FramesetRenderer.php | 1 -
.../frontend/Classes/Page/PageGenerator.php | 1 -
.../frontend/Classes/Page/PageRepository.php | 4 +-
.../PageRepositoryGetPageHookInterface.php | 4 +-
...eRepositoryGetPageOverlayHookInterface.php | 4 +-
...epositoryGetRecordOverlayHookInterface.php | 3 +-
.../frontend/Classes/View/AdminPanelView.php | 2 +-
.../Menu/AbstractMenuContentObjectTest.php | 2 +-
.../Unit/Page/CacheHashCalculatorTest.php | 2 +-
.../WebFunctionWizardsBaseController.php | 4 --
.../Controller/ImportExportController.php | 4 +-
typo3/sysext/impexp/Classes/ImportExport.php | 2 +-
.../IndexingStatisticsController.php | 4 +-
.../Repository/IndexSearchRepository.php | 4 +-
.../Classes/Hook/CrawlerHook.php | 4 +-
.../sysext/indexed_search/Classes/Indexer.php | 4 +-
typo3/sysext/indexed_search/Classes/Lexer.php | 2 +-
.../install/Classes/InstallBootstrap.php | 3 +-
typo3/sysext/install/Classes/Installer.php | 2 +-
typo3/sysext/install/Classes/Session.php | 4 +-
.../install/Classes/Sql/SchemaMigrator.php | 3 +-
.../Classes/Updates/AbstractUpdate.php | 2 +-
.../Classes/Updates/FilemountUpdateWizard.php | 2 +-
.../ViewHelpers/Be/ContainerViewHelper.php | 2 +-
typo3/sysext/lang/locallang_core.xlf | 2 +-
.../lowlevel/Classes/DoubleFilesCommand.php | 3 +-
.../lowlevel/Classes/MissingFilesCommand.php | 3 +-
.../Classes/MissingRelationsCommand.php | 3 +-
.../lowlevel/Classes/RteImagesCommand.php | 3 +-
.../Classes/View/DatabaseIntegrityView.php | 2 +-
.../HOWTO_clean_up_TYPO3_installations.txt | 2 +-
typo3/sysext/openid/Classes/OpenidService.php | 27 +++++++------
.../sysext/openid/sv1/class.tx_openid_sv1.php | 7 +++-
.../Classes/Browser/ElementBrowser.php | 2 +-
.../RecordList/AbstractDatabaseRecordList.php | 5 ++-
.../Classes/RecordList/DatabaseRecordList.php | 2 +-
.../Controller/RecyclerModuleController.php | 3 +-
.../Classes/Domain/Model/DeletedRecords.php | 1 -
.../Classes/ViewHelpers/IconViewHelper.php | 4 +-
.../rtehtmlarea/Classes/BrowseLinks.php | 2 +-
.../Controller/SpellCheckingController.php | 4 +-
.../rtehtmlarea/Classes/SelectImage.php | 6 +--
.../Classes/SaltedPasswordService.php | 1 -
.../Controller/SchedulerModuleController.php | 2 +-
.../scheduler/Classes/Example/TestTask.php | 4 +-
.../Controller/SetupModuleController.php | 2 +-
.../Classes/AbstractAuthenticationService.php | 1 -
.../sv/Classes/AuthenticationService.php | 3 +-
typo3/sysext/sv/class.tx_sv_authbase.php | 8 +++-
.../sysext/sys_action/Classes/ActionTask.php | 4 +-
.../Hook/TypoScriptTemplateInfoHook.php | 1 -
.../ts_codecompletion/tscodecompletion.js | 2 +-
typo3/sysext/t3editor/res/tsref/tsref.xml | 24 ++++++------
.../Controller/TaskModuleController.php | 2 +-
.../TypoScriptTemplateModuleController.php | 3 --
...ateInformationModuleFunctionController.php | 3 +-
...atePagesWizardModuleFunctionController.php | 2 +-
typo3/tce_db.php | 10 +++--
typo3/thumbs.php | 5 ++-
typo3/wizard_tsconfig.php | 2 +-
186 files changed, 519 insertions(+), 603 deletions(-)
diff --git a/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php b/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php
index 968663109e9c..330ec61d0f8b 100644
--- a/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php
+++ b/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php
@@ -427,7 +427,7 @@ class ClickMenu {
* @param string $type Type: "into" or "after
* @param array $elInfo Contains instructions about whether to copy or cut an element.
* @return array Item array, element in $menuItems
- * @see t3lib_clipboard::pasteUrl()
+ * @see \TYPO3\CMS\Backend\Clipboard\Clipboard::pasteUrl()
* @internal
* @todo Define visibility
*/
diff --git a/typo3/sysext/backend/Classes/Configuration/TranslationConfigurationProvider.php b/typo3/sysext/backend/Classes/Configuration/TranslationConfigurationProvider.php
index 49d79b62def1..e19173dda715 100644
--- a/typo3/sysext/backend/Classes/Configuration/TranslationConfigurationProvider.php
+++ b/typo3/sysext/backend/Classes/Configuration/TranslationConfigurationProvider.php
@@ -43,8 +43,8 @@ class TranslationConfigurationProvider {
*
* Since TYPO3 4.5 the flagIcon is not returned as a filename in "gfx/flags/*" anymore,
* but as a string <flags-xx>. The calling party should call
- * t3lib_iconWorks::getSpriteIcon(<flags-xx>) to get an HTML which will represent
- * the flag of this language.
+ * \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon(<flags-xx>) to get an HTML
+ * which will represent the flag of this language.
*
* @param integer $page_id Page id (only used to get TSconfig configuration setting flag and label for default language)
* @param string $backPath Backpath for flags
diff --git a/typo3/sysext/backend/Classes/Configuration/TsConfigParser.php b/typo3/sysext/backend/Classes/Configuration/TsConfigParser.php
index 98401e77f273..db889ea58408 100644
--- a/typo3/sysext/backend/Classes/Configuration/TsConfigParser.php
+++ b/typo3/sysext/backend/Classes/Configuration/TsConfigParser.php
@@ -47,7 +47,6 @@ class TsConfigParser extends \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser
* @param integer $id The uid of the page being handled
* @param array $rootLine The rootline of the page being handled
* @return array Array containing the parsed TSConfig and a flag whether the content was retrieved from cache
- * @see t3lib_TSparser
*/
public function parseTSconfig($TStext, $type, $id = 0, array $rootLine = array()) {
$this->type = $type;
diff --git a/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php b/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
index 0b9cd2dc1922..98f63e5a2ca4 100644
--- a/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
+++ b/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
@@ -50,7 +50,7 @@ class ConditionMatcher extends \TYPO3\CMS\Core\Configuration\TypoScript\Conditio
*
* @param string $string The condition to match against its criterias.
* @return boolean Whether the condition matched
- * @see t3lib_tsparser::parse()
+ * @see \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser::parse()
*/
protected function evaluateCondition($string) {
list($key, $value) = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode('=', $string, FALSE, 2);
diff --git a/typo3/sysext/backend/Classes/ContextMenu/Extdirect/AbstractExtdirectContextMenu.php b/typo3/sysext/backend/Classes/ContextMenu/Extdirect/AbstractExtdirectContextMenu.php
index 30793d4fa382..c310cafeb922 100644
--- a/typo3/sysext/backend/Classes/ContextMenu/Extdirect/AbstractExtdirectContextMenu.php
+++ b/typo3/sysext/backend/Classes/ContextMenu/Extdirect/AbstractExtdirectContextMenu.php
@@ -43,11 +43,11 @@ abstract class AbstractExtdirectContextMenu extends \TYPO3\CMS\Backend\ContextMe
* Note: This method should be overriden to fit your specific needs.
*
* The informations should contain the basic informations of a
- * t3lib_tree_Node for further processing. Also the classname (property type)
- * of the node should be given, because we need this information
- * to create the ndoe.
+ * \TYPO3\CMS\Backend\Tree\TreeNode for further processing. Also the classname
+ * (property type) of the node should be given, because we need this information
+ * to create the node.
*
- * @param stdClass $nodeData
+ * @param \stdClass $nodeData
* @return array
*/
public function getActionsForNodeArray($nodeData) {
diff --git a/typo3/sysext/backend/Classes/Controller/LogoutController.php b/typo3/sysext/backend/Classes/Controller/LogoutController.php
index 85dc975b94ac..aa2884cee212 100644
--- a/typo3/sysext/backend/Classes/Controller/LogoutController.php
+++ b/typo3/sysext/backend/Classes/Controller/LogoutController.php
@@ -44,7 +44,7 @@ class LogoutController {
public function logout() {
// Logout written to log
$GLOBALS['BE_USER']->writelog(255, 2, 0, 1, 'User %s logged out from TYPO3 Backend', array($GLOBALS['BE_USER']->user['username']));
- \t3lib_formProtection_Factory::get()->removeSessionTokenFromRegistry();
+ \TYPO3\CMS\Core\FormProtection\FormProtectionFactory::get()->removeSessionTokenFromRegistry();
$GLOBALS['BE_USER']->logoff();
$redirect = \TYPO3\CMS\Core\Utility\GeneralUtility::sanitizeLocalUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('redirect'));
$redirectUrl = $redirect ? $redirect : 'index.php';
diff --git a/typo3/sysext/backend/Classes/Controller/SimpleDataHandlerController.php b/typo3/sysext/backend/Classes/Controller/SimpleDataHandlerController.php
index a759e7dfb2b6..5a3ad6f59209 100644
--- a/typo3/sysext/backend/Classes/Controller/SimpleDataHandlerController.php
+++ b/typo3/sysext/backend/Classes/Controller/SimpleDataHandlerController.php
@@ -28,7 +28,9 @@ namespace TYPO3\CMS\Backend\Controller;
***************************************************************/
/**
- * Script Class, creating object of t3lib_TCEmain and sending the posted data to the object.
+ * Script Class, creating object of \TYPO3\CMS\Core\DataHandling\DataHandler and
+ * sending the posted data to the object.
+ *
* Used by many smaller forms/links in TYPO3, including the QuickEdit module.
* Is not used by alt_doc.php though (main form rendering script) - that uses the same class (TCEmain) but makes its own initialization (to save the redirect request).
* For all other cases than alt_doc.php it is recommended to use this script for submitting your editing forms - but the best solution in any case would probably be to link your application to alt_doc.php, that will give you easy form-rendering as well.
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php b/typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php
index 52d99bc6305b..427e7ec3f148 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php
@@ -357,7 +357,7 @@ class ColorpickerController {
if (!$this->imageError) {
if ($this->pickerImage) {
if (\TYPO3\CMS\Core\Utility\GeneralUtility::_POST('coords_x')) {
- $this->colorValue = '#' . $this->getIndex(\t3lib_stdgraphic::imageCreateFromFile($this->pickerImage), \TYPO3\CMS\Core\Utility\GeneralUtility::_POST('coords_x'), \TYPO3\CMS\Core\Utility\GeneralUtility::_POST('coords_y'));
+ $this->colorValue = '#' . $this->getIndex(\TYPO3\CMS\Core\Imaging\GraphicalFunctions::imageCreateFromFile($this->pickerImage), \TYPO3\CMS\Core\Utility\GeneralUtility::_POST('coords_x'), \TYPO3\CMS\Core\Utility\GeneralUtility::_POST('coords_y'));
}
$pickerFormImage = '
<p class="c-head">' . $GLOBALS['LANG']->getLL('colorpicker_fromImage', 1) . '</p>
@@ -376,7 +376,7 @@ class ColorpickerController {
* Gets the HTML (Hex) Color Code for the selected pixel of an image
* This method handles the correct imageResource no matter what format
*
- * @param pointer $im Valid ImageResource returned by t3lib_stdgraphic::imageCreateFromFile
+ * @param pointer $im Valid ImageResource returned by \TYPO3\CMS\Core\Imaging\GraphicalFunctions::imageCreateFromFile
* @param integer $x X-Coordinate of the pixel that should be checked
* @param integer $y Y-Coordinate of the pixel that should be checked
* @return string HEX RGB value for color
diff --git a/typo3/sysext/backend/Classes/Form/DataPreprocessor.php b/typo3/sysext/backend/Classes/Form/DataPreprocessor.php
index 749c5b034e5d..a0f0626068d4 100644
--- a/typo3/sysext/backend/Classes/Form/DataPreprocessor.php
+++ b/typo3/sysext/backend/Classes/Form/DataPreprocessor.php
@@ -545,7 +545,7 @@ class DataPreprocessor {
* @param array $pParams Various parameters to pass-through
* @return array Modified $dataPart array.
* @access private
- * @see t3lib_TCEmain::checkValue_flex_procInData(), renderRecord_flexProc_procInData_travDS()
+ * @see \TYPO3\CMS\Core\DataHandling\DataHandler::checkValue_flex_procInData(), renderRecord_flexProc_procInData_travDS()
* @todo Define visibility
*/
public function renderRecord_flexProc_procInData($dataPart, $dataStructArray, $pParams) {
@@ -569,7 +569,7 @@ class DataPreprocessor {
* @param array $DSelements Data structure
* @param array $pParams Various parameters pass-through.
* @return void
- * @see renderRecord_flexProc_procInData(), t3lib_TCEmain::checkValue_flex_procInData_travDS()
+ * @see \TYPO3\CMS\Core\DataHandling\DataHandler::checkValue_flex_procInData(), renderRecord_flexProc_procInData_travDS()
* @todo Define visibility
*/
public function renderRecord_flexProc_procInData_travDS(&$dataValues, $DSelements, $pParams) {
@@ -798,7 +798,7 @@ class DataPreprocessor {
* @param array $elements The array of original elements - basically the field value exploded by ",
* @param array $fieldConfig Field configuration from TCA
* @param array $row The data array, currently. Used to set the "local_uid" for selecting MM relation records.
- * @param string $table Current table name. passed on to t3lib_loadDBGroup
+ * @param string $table Current table name. passed on to \TYPO3\CMS\Core\Database\RelationHandler
* @return array An array with ids of the records from the input elements array.
* @access private
* @todo Define visibility
diff --git a/typo3/sysext/backend/Classes/Form/DatabaseFileIconsHookInterface.php b/typo3/sysext/backend/Classes/Form/DatabaseFileIconsHookInterface.php
index bc14516bde6b..9cb64859a795 100644
--- a/typo3/sysext/backend/Classes/Form/DatabaseFileIconsHookInterface.php
+++ b/typo3/sysext/backend/Classes/Form/DatabaseFileIconsHookInterface.php
@@ -27,7 +27,8 @@ namespace TYPO3\CMS\Backend\Form;
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
/**
- * Interface for classes which hook into t3lib_TCEforms and do additional dbFileIcons processing
+ * Interface for classes which hook into \TYPO3\CMS\Backend\Form\FormEngine
+ * and do additional dbFileIcons processing
*
* @author Andy Grunwald <andreas.grunwald@wmdb.de>
*/
@@ -42,13 +43,13 @@ interface DatabaseFileIconsHookInterface
* @param array $icons Defined icons next to the selector box.
* @param string $rightbox Thumbnail view of images. Only filled if there are other types as images. This images will be shown right next to the selectorbox.
* @param string $fName Form element name
- * @param array $uidList The array of item-uids. Have a look at t3lib_TCEforms::dbFileIcons parameter "$itemArray
- * @param array $additionalParams Array with additional parameters which are be available at method call. Includes $mode, $allowed, $itemArray, $onFocus, $table, $field, $uid. For more information have a look at PHPDoc-Comment of t3lib_TCEforms::dbFileIcons
- * @param \TYPO3\CMS\Backend\Form\FormEngine $parentObject Parent t3lib_TCEforms object
+ * @param array $uidList The array of item-uids. Have a look at \TYPO3\CMS\Backend\Form\FormEngine::dbFileIcons parameter "$itemArray
+ * @param array $additionalParams Array with additional parameters which are be available at method call. Includes $mode, $allowed, $itemArray, $onFocus, $table, $field, $uid. For more information have a look at PHPDoc-Comment of \TYPO3\CMS\Backend\Form\FormEngine::dbFileIcons
+ * @param \TYPO3\CMS\Backend\Form\FormEngine $parentObject Parent object
* @return void
*/
public function dbFileIcons_postProcess(array &$params, &$selector, &$thumbnails, array &$icons, &$rightbox, &$fName, array &$uidList, array $additionalParams, \TYPO3\CMS\Backend\Form\FormEngine $parentObject);
}
-?>
\ No newline at end of file
+?>
diff --git a/typo3/sysext/backend/Classes/Form/Element/InlineElement.php b/typo3/sysext/backend/Classes/Form/Element/InlineElement.php
index 229f7daaeefa..beebb5847d4c 100644
--- a/typo3/sysext/backend/Classes/Form/Element/InlineElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/InlineElement.php
@@ -121,7 +121,7 @@ class InlineElement {
protected $hookObjects = array();
/**
- * Initialize an instance of t3lib_TCEforms_inline
+ * Initialize
*
* @param \TYPO3\CMS\Backend\Form\FormEngine $tceForms Reference to an TCEforms instance
* @return void
@@ -138,7 +138,8 @@ class InlineElement {
/**
* Initialized the hook objects for this class.
- * Each hook object has to implement the interface t3lib_tceformsInlineHook.
+ * Each hook object has to implement the interface
+ * \TYPO3\CMS\Backend\Form\Element\InlineElementHookInterface
*
* @return void
*/
@@ -354,7 +355,7 @@ class InlineElement {
* Render the form-fields of a related (foreign) record.
*
* @param string $parentUid The uid of the parent (embedding) record (uid or NEW...)
- * @param array $rec The table record of the child/embedded table (normaly post-processed by t3lib_transferData)
+ * @param array $rec The table record of the child/embedded table (normaly post-processed by \TYPO3\CMS\Backend\Form\DataPreprocessor)
* @param array $config Content of $PA['fieldConf']['config']
* @return string The HTML code for this "foreign record
* @todo Define visibility
@@ -470,7 +471,7 @@ class InlineElement {
* @return string The rendered form
*/
protected function renderMainFields($table, array $row, array $overruleTypesArray = array()) {
- // The current render depth of t3lib_TCEforms:
+ // The current render depth of \TYPO3\CMS\Backend\Form\FormEngine
$depth = $this->fObj->renderDepth;
// If there is some information about already rendered palettes of our parent, store this info:
if (isset($this->fObj->palettesRendered[$depth][$table])) {
@@ -692,7 +693,7 @@ class InlineElement {
* so two tables are combined (the intermediate table with attributes and the sub-embedded table).
* -> This is a direct embedding over two levels!
*
- * @param array $rec The table record of the child/embedded table (normaly post-processed by t3lib_transferData)
+ * @param array $rec The table record of the child/embedded table (normaly post-processed by \TYPO3\CMS\Backend\Form\DataPreprocessor)
* @param string $appendFormFieldNames The [<table>][<uid>] of the parent record (the intermediate table)
* @param array $config content of $PA['fieldConf']['config']
* @return string A HTML string with <table> tag around.
@@ -978,7 +979,7 @@ class InlineElement {
/**
* Construct runtime environment for Inline Relational Record Editing.
* - creates an anoymous SC_alt_doc in $GLOBALS['SOBE']
- * - creates a t3lib_TCEforms in $GLOBALS['SOBE']->tceforms
+ * - creates a \TYPO3\CMS\Backend\Form\FormEngine in $GLOBALS['SOBE']->tceforms
* - sets ourself as reference to $GLOBALS['SOBE']->tceforms->inline
* - sets $GLOBALS['SOBE']->tceforms->RTEcounter to the current situation on client-side
*
@@ -1080,7 +1081,7 @@ class InlineElement {
$expandSingle = isset($config['appearance']['expandSingle']) && $config['appearance']['expandSingle'];
// Put the current level also to the dynNestedStack of TCEforms:
$this->fObj->pushToDynNestedStack('inline', $this->inlineNames['object']);
- // Dynamically create a new record using t3lib_transferData
+ // Dynamically create a new record using \TYPO3\CMS\Backend\Form\DataPreprocessor
if (!$foreignUid || !\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($foreignUid) || $config['foreign_selector']) {
$record = $this->getNewRecord($this->inlineFirstPid, $current['table']);
// Set language of new child record to the language of the parent record:
@@ -1381,7 +1382,7 @@ class InlineElement {
$itemArray = $this->getRelatedRecordsUidArray($itemList);
// Perform modification of the selected items array:
foreach ($itemArray as $uid) {
- // Get the records for this uid using t3lib_transferdata:
+ // Get the records for this uid using \TYPO3\CMS\Backend\Form\DataPreprocessor
if ($record = $this->getRecord($pid, $table, $uid)) {
$records[$uid] = $record;
}
@@ -1555,13 +1556,14 @@ class InlineElement {
/**
* Get a single record row for a TCA table from the database.
- * t3lib_transferData is used for "upgrading" the values, especially the relations.
+ * \TYPO3\CMS\Backend\Form\DataPreprocessor is used for "upgrading" the
+ * values, especially the relations.
*
* @param integer $pid The pid of the page the record should be stored (only relevant for NEW records)
* @param string $table The table to fetch data from (= foreign_table)
* @param string $uid The uid of the record to fetch, or the pid if a new record should be created
* @param string $cmd The command to perform, empty or 'new'
- * @return array A record row from the database post-processed by t3lib_transferData
+ * @return array A record row from the database post-processed by \TYPO3\CMS\Backend\Form\DataPreprocessor
* @todo Define visibility
*/
public function getRecord($pid, $table, $uid, $cmd = '') {
@@ -1587,7 +1589,7 @@ class InlineElement {
*
* @param integer $pid The pid of the page the record should be stored (only relevant for NEW records)
* @param string $table The table to fetch data from (= foreign_table)
- * @return array A record row from the database post-processed by t3lib_transferData
+ * @return array A record row from the database post-processed by \TYPO3\CMS\Backend\Form\DataPreprocessor
* @todo Define visibility
*/
public function getNewRecord($pid, $table) {
diff --git a/typo3/sysext/backend/Classes/Form/Element/InlineElementHookInterface.php b/typo3/sysext/backend/Classes/Form/Element/InlineElementHookInterface.php
index a83669b9dd5b..c3d519e2538e 100644
--- a/typo3/sysext/backend/Classes/Form/Element/InlineElementHookInterface.php
+++ b/typo3/sysext/backend/Classes/Form/Element/InlineElementHookInterface.php
@@ -26,17 +26,18 @@ namespace TYPO3\CMS\Backend\Form\Element;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
- * Interface for classes which hook into t3lib_TCEforms_inline.
+ * Interface for classes which hook into \TYPO3\CMS\Backend\Form\Element\InlineElement
*
* @author Oliver Hader <oh@inpublica.de>
*/
-interface InlineElementHookInterface
-{
+interface InlineElementHookInterface {
+
/**
* Initializes this hook object.
*
- * @param \TYPO3\CMS\Backend\Form\Element\InlineElement $parentObject The calling t3lib_TCEforms_inline object.
+ * @param \TYPO3\CMS\Backend\Form\Element\InlineElement $parentObject
* @return void
*/
public function init(&$parentObject);
diff --git a/typo3/sysext/backend/Classes/Form/Element/SuggestDefaultReceiver.php b/typo3/sysext/backend/Classes/Form/Element/SuggestDefaultReceiver.php
index c88c810479eb..64766c5033bc 100644
--- a/typo3/sysext/backend/Classes/Form/Element/SuggestDefaultReceiver.php
+++ b/typo3/sysext/backend/Classes/Form/Element/SuggestDefaultReceiver.php
@@ -329,7 +329,7 @@ class SuggestDefaultReceiver {
}
/**
- * Return the icon for a record - just a wrapper for two functions from t3lib_iconWorks
+ * Return the icon for a record - just a wrapper for two functions from \TYPO3\CMS\Backend\Utility\IconUtility
*
* @param array $row The record to get the icon for
* @return string The path to the icon
diff --git a/typo3/sysext/backend/Classes/Form/Element/SuggestElement.php b/typo3/sysext/backend/Classes/Form/Element/SuggestElement.php
index 14f4a8b5b8dc..1fc9123fcf03 100644
--- a/typo3/sysext/backend/Classes/Form/Element/SuggestElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/SuggestElement.php
@@ -39,11 +39,13 @@ class SuggestElement {
public $cssClass = 'typo3-TCEforms-suggest';
- // Reference to t3lib_tceforms
+ /**
+ * @var \TYPO3\CMS\Backend\Form\FormEngine
+ */
public $TCEformsObj;
/**
- * Initialize an instance of t3lib_TCEforms_suggest
+ * Initialize an instance of SuggestElement
*
* @param \TYPO3\CMS\Backend\Form\FormEngine $tceForms Reference to an TCEforms instance
* @return void
diff --git a/typo3/sysext/backend/Classes/Form/Element/ValueSlider.php b/typo3/sysext/backend/Classes/Form/Element/ValueSlider.php
index 454be5b22eb1..7e614d749c0b 100644
--- a/typo3/sysext/backend/Classes/Form/Element/ValueSlider.php
+++ b/typo3/sysext/backend/Classes/Form/Element/ValueSlider.php
@@ -104,7 +104,7 @@ class ValueSlider {
elementType: "' . $elementType . '"
});
';
- /** @var $pageRenderer t3lib_pageRenderer */
+ /** @var $pageRenderer \TYPO3\CMS\Core\Page\PageRenderer */
$pageRenderer = $GLOBALS['SOBE']->doc->getPageRenderer();
$pageRenderer->addExtOnReadyCode($js);
return $contents;
diff --git a/typo3/sysext/backend/Classes/Form/FlexFormsHelper.php b/typo3/sysext/backend/Classes/Form/FlexFormsHelper.php
index c78d0ed08eef..76c1e0d466a5 100644
--- a/typo3/sysext/backend/Classes/Form/FlexFormsHelper.php
+++ b/typo3/sysext/backend/Classes/Form/FlexFormsHelper.php
@@ -70,7 +70,7 @@ class FlexFormsHelper extends \TYPO3\CMS\Backend\Form\FormEngine {
* @param array $tableRow The record data
* @param array $tableConf Additional configuration options
* @return array Modified FlexForm DS
- * @see t3lib_TCEforms::getSingleField_typeFlex()
+ * @see \TYPO3\CMS\Backend\Form\FormEngine::getSingleField_typeFlex()
*/
public function modifyFlexFormDS(array $dataStructure, $table, $tableField, array $tableRow, array $tableConf) {
$singleSheet = !isset($dataStructure['sheets']) || !is_array($dataStructure['sheets']);
@@ -153,7 +153,7 @@ class FlexFormsHelper extends \TYPO3\CMS\Backend\Form\FormEngine {
* @param array $sheetConf Sheet configuration
* @param array $nonExcludeFields Non-exclude-fields for this sheet
* @return array Modified sheet
- * @see t3lib_TCEforms_flex::modifyFlexFormDS()
+ * @see \TYPO3\CMS\Backend\Form\FlexFormsHelper::modifyFlexFormDS()
*/
public function modifySingleFlexFormSheet(array $sheet, $table, $tableField, array $tableRow, array $sheetConf, array $nonExcludeFields) {
if (empty($sheet) || empty($table) || empty($tableField) || empty($tableRow)) {
@@ -242,7 +242,7 @@ class FlexFormsHelper extends \TYPO3\CMS\Backend\Form\FormEngine {
* @param string $tableField The field name
* @param string $extIdent The extension identifier
* @return array All non_exclude_fields from FlexForms
- * @see t3lib_TCEforms::getSingleField_typeFlex()
+ * @see \TYPO3\CMS\Backend\Form\FormEngine::getSingleField_typeFlex()
*/
protected function getFlexFormNonExcludeFields($table, $tableField, $extIdent) {
if (empty($GLOBALS['BE_USER']->groupData['non_exclude_fields']) || empty($table) || empty($tableField) || empty($extIdent)) {
diff --git a/typo3/sysext/backend/Classes/Form/FormEngine.php b/typo3/sysext/backend/Classes/Form/FormEngine.php
index 677096cddb5b..93e4621ab6eb 100644
--- a/typo3/sysext/backend/Classes/Form/FormEngine.php
+++ b/typo3/sysext/backend/Classes/Form/FormEngine.php
@@ -525,8 +525,6 @@ class FormEngine {
public $additionalJS_delete = array();
/**
- * Instance of t3lib_tceforms_inline
- *
* @var \TYPO3\CMS\Backend\Form\Element\InlineElement
* @todo Define visibility
*/
@@ -593,11 +591,11 @@ class FormEngine {
'group' => array('size', 'autoSizeMax', 'max_size', 'show_thumbs', 'maxitems', 'minitems', 'disable_controls', 'readOnly'),
'inline' => array('appearance', 'behaviour', 'foreign_label', 'foreign_selector', 'foreign_unique', 'maxitems', 'minitems', 'size', 'autoSizeMax', 'symmetric_label', 'readOnly')
);
- // Create instance of t3lib_TCEforms_inline only if this a non-IRRE-AJAX call:
+ // Create instance of \TYPO3\CMS\Backend\Form\Element\InlineElement only if this a non-IRRE-AJAX call:
if (!isset($GLOBALS['ajaxID']) || strpos($GLOBALS['ajaxID'], 'TYPO3\\CMS\\Backend\\Form\\Element\\InlineElement::') !== 0) {
$this->inline = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Form\\Element\\InlineElement');
}
- // Create instance of t3lib_TCEforms_suggest only if this a non-Suggest-AJAX call:
+ // Create instance of \TYPO3\CMS\Backend\Form\Element\SuggestElement only if this a non-Suggest-AJAX call:
if (!isset($GLOBALS['ajaxID']) || strpos($GLOBALS['ajaxID'], 'TYPO3\\CMS\\Backend\\Form\\Element\\SuggestElement::') !== 0) {
$this->suggest = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Form\\Element\\SuggestElement');
}
@@ -676,7 +674,9 @@ class FormEngine {
/**
* Based on the $table and $row of content, this displays the complete TCEform for the record.
- * The input-$row is required to be preprocessed if necessary by eg. the t3lib_transferdata class. For instance the RTE content should be transformed through this class first.
+ * The input-$row is required to be preprocessed if necessary by eg.
+ * the \TYPO3\CMS\Backend\Form\DataPreprocessor class. For instance the RTE content
+ * should be transformed through this class first.
*
* @param string $table The table name
* @param array $row The record from the table for which to render a field.
@@ -1322,7 +1322,7 @@ class FormEngine {
}
break;
default:
- // Pair hook to the one in t3lib_TCEmain::checkValue_input_Eval()
+ // Pair hook to the one in \TYPO3\CMS\Core\DataHandling\DataHandler::checkValue_input_Eval()
$evalObj = \TYPO3\CMS\Core\Utility\GeneralUtility::getUserObj($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tce']['formevals'][$func] . ':&' . $func);
if (is_object($evalObj) && method_exists($evalObj, 'deevaluateFieldValue')) {
$_params = array(
@@ -1550,7 +1550,7 @@ function ' . $evalData . '(value) {
$this->registerRequiredProperty('field', $table . '_' . $row['uid'] . '_' . $field, $PA['itemFormElName']);
break;
default:
- // Pair hook to the one in t3lib_TCEmain::checkValue_input_Eval() and t3lib_TCEmain::checkValue_text_Eval()
+ // Pair hook to the one in \TYPO3\CMS\Core\DataHandling\DataHandler::checkValue_input_Eval() and \TYPO3\CMS\Core\DataHandling\DataHandler::checkValue_text_Eval()
$evalObj = \TYPO3\CMS\Core\Utility\GeneralUtility::getUserObj($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tce']['formevals'][$func] . ':&' . $func);
if (is_object($evalObj) && method_exists($evalObj, 'deevaluateFieldValue')) {
$_params = array(
diff --git a/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php b/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php
index c5b7c1e8ce6c..238b8d083a52 100644
--- a/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php
+++ b/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php
@@ -108,9 +108,7 @@ class FrontendBackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\B
public $adminPanel = NULL;
/**
- * Class for frontend editing.
- *
- * @var t3lib_frontendedit
+ * @var \TYPO3\CMS\Core\FrontendEditing\FrontendEditingController
*/
public $frontendEdit = NULL;
@@ -196,7 +194,6 @@ class FrontendBackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\B
* Used in the frontend.
*
* @return boolean Returns TRUE if access is OK
- * @see typo3/init.php, t3lib_beuserauth::backendCheckLogin()
*/
public function checkBackendAccessSettingsFromInitPhp() {
// Check Hardcoded lock on BE
@@ -215,7 +212,7 @@ class FrontendBackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\B
return FALSE;
}
}
- // Finally a check from t3lib_beuserauth::backendCheckLogin()
+ // Finally a check from \TYPO3\CMS\Core\Authentication\BackendUserAuthentication::backendCheckLogin()
if ($this->isUserAllowedToLogin()) {
return TRUE;
} else {
diff --git a/typo3/sysext/backend/Classes/Module/AbstractFunctionModule.php b/typo3/sysext/backend/Classes/Module/AbstractFunctionModule.php
index 889cd019a9ca..103d1dc36bf6 100644
--- a/typo3/sysext/backend/Classes/Module/AbstractFunctionModule.php
+++ b/typo3/sysext/backend/Classes/Module/AbstractFunctionModule.php
@@ -25,13 +25,14 @@ namespace TYPO3\CMS\Backend\Module;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
* Parent class for 'Extension Objects' in backend modules.
*
* Used for 'submodules' to other modules. Also called 'Function menu modules'
- * in t3lib_extMgm. And now its even called 'Extension Objects'. Or
- * 'Module functions'. Wish we had just one name. Or a name at all...(?)
- * Thank God its not so advanced when it works...
+ * in \TYPO3\CMS\Core\Utility\ExtensionManagementUtility. And now its even called
+ * 'Extension Objects'. Or 'Module functions'. Wish we had just one name. Or a
+ * name at all...(?) Thank God its not so advanced when it works...
*
* In other words this class is used for backend modules which is not true
* backend modules appearing in the menu but rather adds themselves as a new
@@ -43,9 +44,10 @@ namespace TYPO3\CMS\Backend\Module;
* of the classname, script-path and a label (title/name).
*
* For more information about this, please see the large example comment for the
- * class t3lib_SCbase. This will show the principle of a 'level-1' connection.
- * The more advanced example - having two layers as it is done by the 'func_wizards'
- * extension with the 'web_info' module - can be seen in the comment above.
+ * class \TYPO3\CMS\Backend\Module\BaseScriptClass. This will show the principle of a
+ * 'level-1' connection. The more advanced example - having two layers as it is done
+ * by the 'func_wizards' extension with the 'web_info' module - can be seen in the
+ * comment above.
*
* EXAMPLE: One level.
* This can be seen in the extension 'cms' where the info module have a
@@ -99,13 +101,14 @@ namespace TYPO3\CMS\Backend\Module;
* But then again ->include_once is traversed IF the initialization of
* the level-1 modules might have added more files!!
* And after that $SOBE->checkSubExtObj() is called to initialize the second level.
+ *
* In this way even a third level could be supported - but most likely that is
* a too layered model to be practical.
*
* Anyways, the final interesting thing is to see what the framework
* "func_wizard" actually does:
*
- * class tx_funcwizards_webfunc extends t3lib_extobjbase {
+ * class WebFunctionWizardsBaseController extends \TYPO3\CMS\Backend\Module\AbstractFunctionModule {
* var $localLangFile = "locallang.php";
* var $function_key = "wiz";
* function init(&$pObj, $conf) {
@@ -119,14 +122,14 @@ namespace TYPO3\CMS\Backend\Module;
* }
* }
*
- * Notice that the handleExternalFunctionValue of this class (t3lib_extobjbase)
+ * Notice that the handleExternalFunctionValue of this class
* is called and that the ->function_key internal var is set!
*
* The two level-2 sub-module "wizard_crpages" and "wizard_sortpages"
* are totally normal "submodules".
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @see t3lib_SCbase
+ * @see \TYPO3\CMS\Backend\Module\BaseScriptClass
* @see tx_funcwizards_webfunc::init()
* @see tx_funcwizards_webfunc
* @see tx_wizardsortpages_webfunc_2
@@ -134,7 +137,8 @@ namespace TYPO3\CMS\Backend\Module;
abstract class AbstractFunctionModule {
/**
- * Contains a reference to the parent (calling) object (which is probably an instance of an extension class to t3lib_SCbase)
+ * Contains a reference to the parent (calling) object (which is probably an instance of
+ * an extension class to \TYPO3\CMS\Backend\Module\BaseScriptClass
*
* @var \TYPO3\CMS\Backend\Module\BaseScriptClass
* @see init()
@@ -179,10 +183,12 @@ abstract class AbstractFunctionModule {
/**
* Initialize the object
*
- * @param object $pObj A reference to the parent (calling) object (which is probably an instance of an extension class to t3lib_SCbase)
+ * @param object $pObj A reference to the parent (calling) object (which is probably an instance of an
+ * extension class to \TYPO3\CMS\Backend\Module\BaseScriptClass
+ *
* @param array $conf The configuration set for this module - from global array TBE_MODULES_EXT
* @return void
- * @see t3lib_SCbase::checkExtObj()
+ * @see \TYPO3\CMS\Backend\Module\BaseScriptClass::checkExtObj()
* @todo Define visibility
*/
public function init(&$pObj, $conf) {
@@ -232,10 +238,10 @@ abstract class AbstractFunctionModule {
}
/**
- * Same as t3lib_SCbase::checkExtObj()
+ * Same as \TYPO3\CMS\Backend\Module\BaseScriptClass::checkExtObj()
*
* @return void
- * @see t3lib_SCbase::checkExtObj()
+ * @see \TYPO3\CMS\Backend\Module\BaseScriptClass::checkExtObj()
* @todo Define visibility
*/
public function checkExtObj() {
diff --git a/typo3/sysext/backend/Classes/Module/BaseScriptClass.php b/typo3/sysext/backend/Classes/Module/BaseScriptClass.php
index b068c1e19216..4d366ea9d16f 100644
--- a/typo3/sysext/backend/Classes/Module/BaseScriptClass.php
+++ b/typo3/sysext/backend/Classes/Module/BaseScriptClass.php
@@ -26,17 +26,13 @@ namespace TYPO3\CMS\Backend\Module;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
- * Contains the parent class for 'ScriptClasses' in backend modules.
- *
- * Revised for TYPO3 3.6 July/2003 by Kasper Skårhøj
+ * Parent class for 'ScriptClasses' in backend modules.
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- */
-/**
* EXAMPLE PROTOTYPE
*
- * As for examples there are lots of them if you search for classes which extends 't3lib_SCbase'.
+ * As for examples there are lots of them if you search for classes which extends \TYPO3\CMS\Backend\Module\BaseScriptClass
* However you can see a prototype example of how a module might use this class in an index.php file typically hosting a backend module.
* NOTICE: This example only outlines the basic structure of how this class is used. You should consult the documentation and other real-world examples for some actual things to do when building modules.
*
@@ -48,8 +44,9 @@ namespace TYPO3\CMS\Backend\Module;
* $GLOBALS['LANG']->includeLLFile('EXT:prototype/locallang.php');
* $GLOBALS['BE_USER']->modAccess($MCONF,1);
*
- * SC_mod_prototype EXTENDS THE CLASS t3lib_SCbase with a main() and printContent() function:
- * class SC_mod_prototype extends t3lib_SCbase {
+ * SC_mod_prototype EXTENDS THE CLASS \TYPO3\CMS\Backend\Module\BaseScriptClass with a main() and printContent() function:
+ *
+ * class SC_mod_prototype extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
* MAIN FUNCTION - HERE YOU CREATE THE MODULE CONTENT IN $this->content
* function main() {
* TYPICALLY THE INTERNAL VAR, $this->doc is instantiated like this:
@@ -79,13 +76,8 @@ namespace TYPO3\CMS\Backend\Module;
* $SOBE->main();
* FINALLY THE printContent() FUNCTION WILL OUTPUT THE ACCUMULATED CONTENT
* $SOBE->printContent();
- */
-/**
- * Parent class for 'ScriptClasses' in backend modules.
- * See example comment above.
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @see t3lib_extobjbase
*/
class BaseScriptClass {
diff --git a/typo3/sysext/backend/Classes/Module/ModuleLoader.php b/typo3/sysext/backend/Classes/Module/ModuleLoader.php
index 8c2dba00f63e..410cc394c05c 100644
--- a/typo3/sysext/backend/Classes/Module/ModuleLoader.php
+++ b/typo3/sysext/backend/Classes/Module/ModuleLoader.php
@@ -26,23 +26,18 @@ namespace TYPO3\CMS\Backend\Module;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
* This document provides a class that loads the modules for the TYPO3 interface.
*
- * Modifications by René Fritz, 2001
- * Revised for TYPO3 3.6 July/2003 by Kasper Skårhøj
- *
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @internal
- */
-/**
* Load Backend Interface modules
*
* Typically instantiated like this:
- * $this->loadModules = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('t3lib_loadModules');
+ * $this->loadModules = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Backend\Module\ModuleLoader');
* $this->loadModules->load($TBE_MODULES);
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @internal
*/
class ModuleLoader {
diff --git a/typo3/sysext/backend/Classes/Module/ModuleSettings.php b/typo3/sysext/backend/Classes/Module/ModuleSettings.php
index 76b30c58e368..6ccce54f56dc 100644
--- a/typo3/sysext/backend/Classes/Module/ModuleSettings.php
+++ b/typo3/sysext/backend/Classes/Module/ModuleSettings.php
@@ -26,15 +26,11 @@ namespace TYPO3\CMS\Backend;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
* Manage storing and restoring of $GLOBALS['SOBE']->MOD_SETTINGS settings.
* Provides a presets box for BE modules.
*
- * inspired by t3lib_fullsearch
- *
- * @author René Fritz <r.fritz@colorcube.de>
- */
-/**
* usage inside of scbase class
*
* ....
@@ -49,7 +45,7 @@ namespace TYPO3\CMS\Backend;
*
* function main() {
* reStore settings
- * $store = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('t3lib_modSettings');
+ * $store = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\ModuleSettings');
* $store->init('tx_dam_select');
* $store->setStoreList('tx_dam_select');
* $store->processStoreControl();
@@ -71,10 +67,6 @@ namespace TYPO3\CMS\Backend;
* 'another id' => ...
*
* ) );
- */
-/**
- * Manage storing and restoring of $GLOBALS['SOBE']->MOD_SETTINGS settings.
- * Provides a presets box for BE modules.
*
* @author René Fritz <r.fritz@colorcube.de>
*/
diff --git a/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php b/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php
index 10be0601f295..7b828a9694fc 100644
--- a/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php
+++ b/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php
@@ -25,6 +25,7 @@ namespace TYPO3\CMS\Backend\RecordList;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
* Library with a single function addElement that returns table
* rows based on some input.
@@ -156,7 +157,7 @@ abstract class AbstractRecordList {
public $translateTools;
/**
- * Constructor for t3lib_recordList
+ * Constructor
*/
public function __construct() {
if (isset($GLOBALS['BE_USER']->uc['titleLen']) && $GLOBALS['BE_USER']->uc['titleLen'] > 0) {
@@ -420,7 +421,7 @@ abstract class AbstractRecordList {
}
/**
- * Gets an instance of t3lib_transl8tools.
+ * Gets an instance of TranslationConfigurationProvider
*
* @return \TYPO3\CMS\Backend\Configuration\TranslationConfigurationProvider
*/
diff --git a/typo3/sysext/backend/Classes/Search/LiveSearch/LiveSearch.php b/typo3/sysext/backend/Classes/Search/LiveSearch/LiveSearch.php
index f64fa41646fa..0a4ccfa5a15d 100644
--- a/typo3/sysext/backend/Classes/Search/LiveSearch/LiveSearch.php
+++ b/typo3/sysext/backend/Classes/Search/LiveSearch/LiveSearch.php
@@ -201,10 +201,7 @@ class LiveSearch {
* @param string $orderBy
* @param string $limit MySql Limit notation
* @return array
- * @see t3lib_db::exec_SELECT_queryArray()
- * @see t3lib_db::sql_num_rows()
- * @see t3lib_db::sql_fetch_assoc()
- * @see t3lib_iconWorks::getSpriteIconForRecord()
+ * @see \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIconForRecord()
* @see getTitleFromCurrentRow()
* @see getEditLink()
*/
@@ -369,7 +366,6 @@ class LiveSearch {
*
* @param string $tableName Record table name
* @return string
- * @see t3lib_db::stripOrderBy()
*/
protected function makeOrderByTable($tableName) {
$orderBy = '';
@@ -410,7 +406,6 @@ class LiveSearch {
*
* @param string $tableName
* @return string
- * @see t3lib_db::quoteStr()
*/
public function getQueryString($tableName = '') {
return $GLOBALS['TYPO3_DB']->quoteStr($this->queryString, $tableName);
@@ -451,8 +446,8 @@ class LiveSearch {
}
/**
- * Creates an instance of t3lib_pageTree which will select a page tree to
- * $depth and return the object. In that object we will find the ids of the tree.
+ * Creates an instance of \TYPO3\CMS\Backend\Tree\View\PageTreeView which will select a
+ * page tree to $depth and return the object. In that object we will find the ids of the tree.
*
* @param integer $id Page id.
* @param integer $depth Depth to go down.
diff --git a/typo3/sysext/backend/Classes/Sprite/AbstractSpriteHandler.php b/typo3/sysext/backend/Classes/Sprite/AbstractSpriteHandler.php
index 9142723abe46..57c2d8b85b69 100644
--- a/typo3/sysext/backend/Classes/Sprite/AbstractSpriteHandler.php
+++ b/typo3/sysext/backend/Classes/Sprite/AbstractSpriteHandler.php
@@ -27,7 +27,7 @@ namespace TYPO3\CMS\Backend\Sprite;
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
/**
- * An abstract class implementing t3lib_spritemanager_SpriteIconGenerator.
+ * An abstract class implementing SpriteIconGeneratorInterface.
* Provides base functionality for all handlers.
*
* @author Steffen Ritter <info@steffen-ritter.net>
@@ -68,11 +68,11 @@ abstract class AbstractSpriteHandler implements \TYPO3\CMS\Backend\Sprite\Sprite
/**
* Loads all stylesheet files registered through
- * t3lib_SpriteManager::addIconSprite
+ * \TYPO3\CMS\Backend\Sprite\SpriteManager::addIconSprite
*
- * In fact the stylesheet-files are copied to t3lib_SpriteManager::tempPath
+ * In fact the stylesheet-files are copied to \TYPO3\CMS\Backend\Sprite\SpriteManager::tempPath
* where they automatically will be included from via template.php and
- * t3lib_compressor.
+ * \TYPO3\CMS\Core\Resource\ResourceCompressor
*
* @return void
*/
@@ -114,7 +114,8 @@ abstract class AbstractSpriteHandler implements \TYPO3\CMS\Backend\Sprite\Sprite
}
/**
- * Returns the detected icon-names which may be used through t3lib_iconWorks::getSpriteIcon.
+ * Returns the detected icon-names which may be used through
+ * \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon.
*
* @return array all generated and registered sprite-icon-names, will be empty if there are none
*/
@@ -124,7 +125,8 @@ abstract class AbstractSpriteHandler implements \TYPO3\CMS\Backend\Sprite\Sprite
/**
* this method creates sprite icon names for all tables in TCA (including their possible type-icons)
- * where there is no "typeicon_classes" of this TCA table ctrl section (moved form t3lib_iconWorks)
+ * where there is no "typeicon_classes" of this TCA table ctrl section
+ * (moved form \TYPO3\CMS\Backend\Utility\IconUtility)
*
* @return array Array as $iconName => $fileName
*/
diff --git a/typo3/sysext/backend/Classes/Sprite/SimpleSpriteHandler.php b/typo3/sysext/backend/Classes/Sprite/SimpleSpriteHandler.php
index f2adcba29853..421810fc5358 100644
--- a/typo3/sysext/backend/Classes/Sprite/SimpleSpriteHandler.php
+++ b/typo3/sysext/backend/Classes/Sprite/SimpleSpriteHandler.php
@@ -26,12 +26,14 @@ namespace TYPO3\CMS\Backend\Sprite;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
- * A class with an concrete implementation of t3lib_spritemanager_SpriteIconGenerator.
+ * A class with an concrete implementation of AbspractSpriteHandler.
* It is the standard / fallback handler of the sprite manager.
* This implementation won't generate sprites at all. It will just render css-definitions
- * for all registered icons so that they may be used through t3lib_iconWorks::getSpriteIcon*
- * Without the css classes generated here, icons of for example tca records would be empty.
+ * for all registered icons so that they may be used through
+ * \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon* Without the css classes
+ * generated here, icons of for example tca records would be empty.
*
* @author Steffen Ritter <info@steffen-ritter.net>
*/
@@ -63,8 +65,10 @@ class SimpleSpriteHandler extends \TYPO3\CMS\Backend\Sprite\AbstractSpriteHandle
/**
* This function builds an css class for every single icon registered via
- * t3lib_SpriteManager::addSingleIcons to use them via t3lib_iconWorks::getSpriteIcon
- * and TCA-Icons for "classic" record Icons to be uses via t3lib_iconWorks::getSpriteIconForRecord
+ * \TYPO3\CMS\Backend\Utility\IconUtility::addSingleIcons to use them via
+ * \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon and TCA-Icons for
+ * "classic" record Icons to be uses via
+ * \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIconForRecord
* In the simpleHandler the icon just will be added as css-background-image.
*
* @return void
diff --git a/typo3/sysext/backend/Classes/Sprite/SpriteIconGeneratorInterface.php b/typo3/sysext/backend/Classes/Sprite/SpriteIconGeneratorInterface.php
index ccbcc5ac2975..a0d162cbc9da 100644
--- a/typo3/sysext/backend/Classes/Sprite/SpriteIconGeneratorInterface.php
+++ b/typo3/sysext/backend/Classes/Sprite/SpriteIconGeneratorInterface.php
@@ -27,7 +27,7 @@ namespace TYPO3\CMS\Backend\Sprite;
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
/**
- * Interface all handlers in t3lib_spritemanager have to implement.
+ * Interface all handlers in SpriteManager have to implement.
*
* @author Steffen Ritter <info@steffen-ritter.net>
*/
diff --git a/typo3/sysext/backend/Classes/Sprite/SpriteManager.php b/typo3/sysext/backend/Classes/Sprite/SpriteManager.php
index 35475f132700..906cb20908d4 100644
--- a/typo3/sysext/backend/Classes/Sprite/SpriteManager.php
+++ b/typo3/sysext/backend/Classes/Sprite/SpriteManager.php
@@ -149,7 +149,7 @@ class SpriteManager {
/**
* API for extensions to register new sprite images which can be used with
- * t3lib_iconWorks::getSpriteIcon('extensions-$extKey-iconName');
+ * \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('extensions-$extKey-iconName');
*
* @param array $icons Icons to be registered, $iconname => $iconFile, $iconFile must be relative to PATH_site
* @param string $extKey Extension key
diff --git a/typo3/sysext/backend/Classes/Template/DocumentTemplate.php b/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
index ab063b560987..e241066dbd18 100644
--- a/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
+++ b/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
@@ -141,7 +141,7 @@ class DocumentTemplate {
*/
public $form_rowsToStylewidth = 9.58;
- // Compensation for large documents (used in class.t3lib_tceforms.php)
+ // Compensation for large documents (used in \TYPO3\CMS\Backend\Form\FormEngine)
/**
* @todo Define visibility
*/
@@ -582,7 +582,7 @@ class DocumentTemplate {
$mMN = '';
}
$onClick = 'top.ShortcutManager.createShortcut(' . $GLOBALS['LANG']->JScharCode($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.makeBookmark')) . ', ' . '\'' . $backPath . '\', ' . '\'' . rawurlencode($modName) . '\', ' . '\'' . rawurlencode(($pathInfo['path'] . '?' . $storeUrl)) . $mMN . '\'' . ');return false;';
- $sIcon = '<a href="#" onclick="' . htmlspecialchars($onClick) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.makeBookmark', TRUE) . '">' . \t3lib_iconworks::getSpriteIcon('actions-system-shortcut-new') . '</a>';
+ $sIcon = '<a href="#" onclick="' . htmlspecialchars($onClick) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.makeBookmark', TRUE) . '">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-system-shortcut-new') . '</a>';
return $sIcon;
}
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/DataProvider.php b/typo3/sysext/backend/Classes/Tree/Pagetree/DataProvider.php
index 364ac274e223..17e42aca991b 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/DataProvider.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/DataProvider.php
@@ -26,6 +26,7 @@ namespace TYPO3\CMS\Backend\Tree\Pagetree;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
* Page tree data provider.
*
@@ -64,7 +65,7 @@ class DataProvider extends \TYPO3\CMS\Backend\Tree\AbstractTreeDataProvider {
/**
* Process collection hook objects
*
- * @var array<t3lib_tree_pagetree_interfaces_collectionprocessor>
+ * @var array<\TYPO3\CMS\Backend\Tree\Pagetree\CollectionProcessorInterface>
*/
protected $processCollectionHookObjects = array();
@@ -85,9 +86,9 @@ class DataProvider extends \TYPO3\CMS\Backend\Tree\AbstractTreeDataProvider {
$hookElements = $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/tree/pagetree/class.t3lib_tree_pagetree_dataprovider.php']['postProcessCollections'];
if (is_array($hookElements)) {
foreach ($hookElements as $classRef) {
- /** @var $hookObject t3lib_tree_pagetree_interfaces_collectionprocessor */
+ /** @var $hookObject \TYPO3\CMS\Backend\Tree\Pagetree\CollectionProcessorInterface */
$hookObject = \TYPO3\CMS\Core\Utility\GeneralUtility::getUserObj($classRef);
- if ($hookObject instanceof \t3lib_tree_pagetree_interfaces_collectionprocessor) {
+ if ($hookObject instanceof \TYPO3\CMS\Backend\Tree\Pagetree\CollectionProcessorInterface) {
$this->processCollectionHookObjects[] = $hookObject;
}
}
@@ -171,7 +172,7 @@ class DataProvider extends \TYPO3\CMS\Backend\Tree\AbstractTreeDataProvider {
}
}
foreach ($this->processCollectionHookObjects as $hookObject) {
- /** @var $hookObject t3lib_tree_pagetree_interfaces_collectionprocessor */
+ /** @var $hookObject \TYPO3\CMS\Backend\Tree\Pagetree\CollectionProcessorInterface */
$hookObject->postProcessGetNodes($node, $mountPoint, $level, $nodeCollection);
}
return $nodeCollection;
@@ -289,7 +290,7 @@ class DataProvider extends \TYPO3\CMS\Backend\Tree\AbstractTreeDataProvider {
}
}
foreach ($this->processCollectionHookObjects as $hookObject) {
- /** @var $hookObject t3lib_tree_pagetree_interfaces_collectionprocessor */
+ /** @var $hookObject \TYPO3\CMS\Backend\Tree\Pagetree\CollectionProcessorInterface */
$hookObject->postProcessFilteredNodes($node, $searchFilter, $mountPoint, $nodeCollection);
}
return $nodeCollection;
@@ -376,7 +377,7 @@ class DataProvider extends \TYPO3\CMS\Backend\Tree\AbstractTreeDataProvider {
$nodeCollection->append($subNode);
}
foreach ($this->processCollectionHookObjects as $hookObject) {
- /** @var $hookObject t3lib_tree_pagetree_interfaces_collectionprocessor */
+ /** @var $hookObject \TYPO3\CMS\Backend\Tree\Pagetree\CollectionProcessorInterface */
$hookObject->postProcessGetTreeMounts($searchFilter, $nodeCollection);
}
return $nodeCollection;
diff --git a/typo3/sysext/backend/Classes/Tree/TreeNodeCollection.php b/typo3/sysext/backend/Classes/Tree/TreeNodeCollection.php
index 36b1de323513..71ed09e3ad89 100644
--- a/typo3/sysext/backend/Classes/Tree/TreeNodeCollection.php
+++ b/typo3/sysext/backend/Classes/Tree/TreeNodeCollection.php
@@ -60,7 +60,7 @@ class TreeNodeCollection extends \ArrayObject {
/**
* Compares a node with another one
*
- * @see t3lib_tree_Node::compareTo
+ * @see \TYPO3\CMS\Backend\Tree\TreeNode::compareTo
* @return void
* @noapi
*/
diff --git a/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php b/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
index 3b7abe0f1629..08bf97833ca2 100644
--- a/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
@@ -26,14 +26,12 @@ namespace TYPO3\CMS\Backend\Tree\View;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
* Base class for creating a browsable array/page/folder tree in HTML
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
* @author René Fritz <r.fritz@colorcube.de>
- * @see t3lib_browsetree
- * @see t3lib_pagetree
- * @see t3lib_foldertree
*/
abstract class AbstractTreeView {
@@ -493,7 +491,7 @@ abstract class AbstractTreeView {
* @param boolean $exp The element was expanded to render subelements if this flag is set.
* @return string Image tag with the plus/minus icon.
* @access private
- * @see t3lib_pageTree::PMicon()
+ * @see \TYPO3\CMS\Backend\Tree\View\PageTreeView::PMicon()
* @todo Define visibility
*/
public function PMicon($row, $a, $c, $nextCount, $exp) {
@@ -600,7 +598,7 @@ abstract class AbstractTreeView {
* @param integer $id Record id/key
* @return boolean
* @access private
- * @see t3lib_pageTree::expandNext()
+ * @see \TYPO3\CMS\Backend\Tree\View\PageTreeView::expandNext()
* @todo Define visibility
*/
public function expandNext($id) {
diff --git a/typo3/sysext/backend/Classes/Tree/View/BrowseTreeView.php b/typo3/sysext/backend/Classes/Tree/View/BrowseTreeView.php
index e8f15fcb34c7..d84315f615d4 100644
--- a/typo3/sysext/backend/Classes/Tree/View/BrowseTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/BrowseTreeView.php
@@ -26,20 +26,12 @@ namespace TYPO3\CMS\Backend\Tree\View;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
* Generate a page-tree, browsable.
*
- * Revised for TYPO3 3.6 November/2003 by Kasper Skårhøj
- *
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @coauthor René Fritz <r.fritz@colorcube.de>
- */
-/**
- * Extension class for the t3lib_treeView class, specially made for browsing pages
- *
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
* @coauthor René Fritz <r.fritz@colorcube.de>
- * @see t3lib_treeView, t3lib_pageTree
*/
class BrowseTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
@@ -81,7 +73,7 @@ class BrowseTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
/**
* Creates title attribute content for pages.
- * Uses API function in t3lib_BEfunc which will retrieve lots of useful information for pages.
+ * Uses API function in \TYPO3\CMS\Backend\Utility\BackendUtility which will retrieve lots of useful information for pages.
*
* @param array $row The table row.
* @return string
@@ -123,7 +115,6 @@ class BrowseTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
* @todo Define visibility
*/
public function getTitleStr($row, $titleLen = 30) {
- // Get the basic title from the parent implementation in t3lib_treeview
$title = parent::getTitleStr($row, $titleLen);
if (isset($row['is_siteroot']) && $row['is_siteroot'] != 0 && $GLOBALS['BE_USER']->getTSConfigVal('options.pageTree.showDomainNameWithTitle')) {
$rows = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('domainName,sorting', 'sys_domain', 'pid=' . $GLOBALS['TYPO3_DB']->quoteStr(($row['uid'] . \TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('sys_domain') . \TYPO3\CMS\Backend\Utility\BackendUtility::BEenableFields('sys_domain')), 'sys_domain'), '', 'sorting', 1);
diff --git a/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php b/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php
index d2827f04f05d..d87bff3a2421 100644
--- a/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php
@@ -26,20 +26,13 @@ namespace TYPO3\CMS\Backend\Tree\View;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
- * Generate a folder tree
- *
- * Revised for TYPO3 3.6 November/2003 by Kasper Skårhøj
- *
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @coauthor René Fritz <r.fritz@colorcube.de>
- */
-/**
- * Extension class for the t3lib_treeView class, specially made for browsing folders in the File module
+ * Generate a folder tree,
+ * specially made for browsing folders in the File module
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
* @coauthor René Fritz <r.fritz@colorcube.de>
- * @see class t3lib_treeView
*/
class FolderTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
@@ -85,7 +78,7 @@ class FolderTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
* @param boolean $isExpanded The element was expanded to render subelements if this flag is set.
* @return string Image tag with the plus/minus icon.
* @internal
- * @see t3lib_pageTree::PMicon()
+ * @see \TYPO3\CMS\Backend\Tree\View\PageTreeView::PMicon()
*/
public function PMicon(\TYPO3\CMS\Core\Resource\Folder $folderObject, $subFolderCounter, $totalSubFolders, $nextCount, $isExpanded) {
$PM = $nextCount ? ($isExpanded ? 'minus' : 'plus') : 'join';
diff --git a/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php b/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php
index 3ea14e9ea9e1..8659d95d49c6 100644
--- a/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php
+++ b/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php
@@ -123,7 +123,8 @@ class PagePositionMap {
**************************************/
/**
* Creates a "position tree" based on the page tree.
- * Notice: A class, "localPageTree" must exist and probably it is an extension class of the t3lib_pageTree class. See "db_new.php" in the core for an example.
+ * Notice: A class, "localPageTree" must exist and probably it is an extension class of the
+ * \TYPO3\CMS\Backend\Tree\View\PageTreeView class. See "db_new.php" in the core for an example.
*
* @param integer $id Current page id
* @param array $pageinfo Current page record.
diff --git a/typo3/sysext/backend/Classes/Tree/View/PageTreeView.php b/typo3/sysext/backend/Classes/Tree/View/PageTreeView.php
index 670b8cd5e2b8..ff13e6dfce9f 100644
--- a/typo3/sysext/backend/Classes/Tree/View/PageTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/PageTreeView.php
@@ -29,17 +29,8 @@ namespace TYPO3\CMS\Backend\Tree\View;
/**
* Generate a page-tree, non-browsable.
*
- * Revised for TYPO3 3.6 November/2003 by Kasper Skårhøj
- *
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @coauthor René Fritz <r.fritz@colorcube.de>
- */
-/**
- * Class for generating a page tree.
- *
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
* @coauthor René Fritz <r.fritz@colorcube.de>
- * @see t3lib_treeView, t3lib_browseTree
*/
class PageTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
@@ -113,7 +104,7 @@ class PageTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
* @param boolean $exp The element was expanded to render subelements if this flag is set.
* @return string Image tag with the plus/minus icon.
* @access private
- * @see t3lib_treeView::PMicon()
+ * @see AbstarctTreeView::PMicon()
* @todo Define visibility
*/
public function PMicon($row, $a, $c, $nextCount, $exp) {
diff --git a/typo3/sysext/backend/Classes/Utility/BackendUtility.php b/typo3/sysext/backend/Classes/Utility/BackendUtility.php
index e173c3bdc784..9fb384ee9c43 100644
--- a/typo3/sysext/backend/Classes/Utility/BackendUtility.php
+++ b/typo3/sysext/backend/Classes/Utility/BackendUtility.php
@@ -562,8 +562,8 @@ class BackendUtility {
*
* Since TYPO3 4.5 the flagIcon is not returned as a filename in "gfx/flags/*" anymore,
* but as a string <flags-xx>. The calling party should call
- * t3lib_iconWorks::getSpriteIcon(<flags-xx>) to get an HTML which will represent
- * the flag of this language.
+ * \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon(<flags-xx>) to get an HTML
+ * which will represent the flag of this language.
*
* @return array Array with languages (title, uid, flagIcon)
*/
@@ -717,9 +717,10 @@ class BackendUtility {
* If no "type" field is configured in the "ctrl"-section of the $GLOBALS['TCA'] for the table, zero is used.
* If zero is not an index in the "types" section of $GLOBALS['TCA'] for the table, then the $fieldValue returned will default to 1 (no matter if that is an index or not)
*
- * Note: This method is very similar to t3lib_TCEforms::getRTypeNum(), however, it has two differences:
+ * Note: This method is very similar to \TYPO3\CMS\Backend\Form\FormEngine::getRTypeNum(),
+ * however, it has two differences:
* 1) The method in TCEForms also takes care of localization (which is difficult to do here as the whole infrastructure for language overlays is only in TCEforms).
- * 2) The $rec array looks different in TCEForms, as in there it's not the raw record but the t3lib_transferdata version of it, which changes e.g. how "select"
+ * 2) The $rec array looks different in TCEForms, as in there it's not the raw record but the \TYPO3\CMS\Backend\Form\DataPreprocessor version of it, which changes e.g. how "select"
* and "group" field values are stored, which makes different processing of the "foreign pointer field" type field variant necessary.
*
* @param string $table Table name present in TCA
@@ -836,7 +837,7 @@ class BackendUtility {
* @param boolean $WSOL Boolean; If set, workspace overlay is applied to records. This is correct behaviour for all presentation and export, but NOT if you want a TRUE reflection of how things are in the live workspace.
* @param integer $newRecordPidValue SPECIAL CASES: Use this, if the DataStructure may come from a parent record and the INPUT row doesn't have a uid yet (hence, the pid cannot be looked up). Then it is necessary to supply a PID value to search recursively in for the DS (used from TCEmain)
* @return mixed If array, the data structure was found and returned as an array. Otherwise (string) it is an error message.
- * @see t3lib_TCEforms::getSingleField_typeFlex()
+ * @see \TYPO3\CMS\Backend\Form\FormEngine::getSingleField_typeFlex()
*/
static public function getFlexFormDS($conf, $row, $table, $fieldName = '', $WSOL = TRUE, $newRecordPidValue = 0) {
// Get pointer field etc from TCA-config:
@@ -1088,13 +1089,12 @@ class BackendUtility {
*******************************************/
/**
* Returns the Page TSconfig for page with id, $id
- * Requires class "t3lib_TSparser"
*
* @param $id integer Page uid for which to create Page TSconfig
* @param $rootLine array If $rootLine is an array, that is used as rootline, otherwise rootline is just calculated
* @param boolean $returnPartArray If $returnPartArray is set, then the array with accumulated Page TSconfig is returned non-parsed. Otherwise the output will be parsed by the TypoScript parser.
* @return array Page TSconfig
- * @see t3lib_TSparser
+ * @see \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser
*/
static public function getPagesTSconfig($id, $rootLine = '', $returnPartArray = 0) {
$id = intval($id);
@@ -1116,7 +1116,7 @@ class BackendUtility {
// Parsing the page TS-Config (or getting from cache)
$pageTS = implode(LF . '[GLOBAL]' . LF, $TSdataArray);
if ($GLOBALS['TYPO3_CONF_VARS']['BE']['TSconfigConditions']) {
- /* @var $parseObj t3lib_TSparser_TSconfig */
+ /* @var $parseObj \TYPO3\CMS\Backend\Configuration\TsConfigParser */
$parseObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Configuration\\TsConfigParser');
$res = $parseObj->parseTSconfig($pageTS, 'PAGES', $id, $rootLine);
if ($res) {
@@ -2903,7 +2903,6 @@ class BackendUtility {
* @param integer $pid Record pid
* @return void
* @internal
- * @see t3lib_transferData::lockRecord(), alt_doc.php, db_layout.php, db_list.php, wizard_rte.php
*/
static public function lockRecords($table = '', $uid = 0, $pid = 0) {
if (isset($GLOBALS['BE_USER']->user['uid'])) {
@@ -2976,7 +2975,6 @@ class BackendUtility {
* @param string $prefix Prefix string for the key "*foreign_table_where" from $fieldValue array
* @return string Part of query
* @internal
- * @see t3lib_transferData::renderRecord(), t3lib_TCEforms::foreignTable()
*/
static public function exec_foreign_table_where_query($fieldValue, $field = '', $TSconfig = array(), $prefix = '') {
$foreign_table = $fieldValue['config'][$prefix . 'foreign_table'];
@@ -3052,7 +3050,6 @@ class BackendUtility {
* @param string $table Table name present in TCA
* @param array $row Row from table
* @return array
- * @see t3lib_transferData::renderRecord(), t3lib_TCEforms::setTSconfig(), SC_wizard_list::main(), SC_wizard_add::main()
*/
static public function getTCEFORM_TSconfig($table, $row) {
self::fixVersioningPid($table, $row);
@@ -3103,7 +3100,7 @@ class BackendUtility {
* @param integer $pid Record pid, could be negative then pointing to a record from same table whose pid to find and return.
* @return integer
* @internal
- * @see t3lib_TCEmain::copyRecord(), getTSCpid()
+ * @see \TYPO3\CMS\Core\DataHandling\DataHandler::copyRecord(), getTSCpid()
*/
static public function getTSconfig_pidValue($table, $uid, $pid) {
// If pid is an integer this takes precedence in our lookup.
@@ -3145,7 +3142,7 @@ class BackendUtility {
* @param integer $pid Record pid
* @return integer
* @internal
- * @see t3lib_TCEforms::getTSCpid()
+ * @see \TYPO3\CMS\Backend\Form\FormEngine::getTSCpid()
*/
static public function getPidForModTSconfig($table, $uid, $pid) {
$retVal = $table == 'pages' && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($uid) ? $uid : $pid;
@@ -3160,7 +3157,7 @@ class BackendUtility {
* @param integer $pid Record pid
* @return array Array of two integers; first is the REAL PID of a record and if its a new record negative values are resolved to the true PID, second value is the PID value for TSconfig (uid if table is pages, otherwise the pid)
* @internal
- * @see t3lib_TCEmain::setHistory(), t3lib_TCEmain::process_datamap()
+ * @see \TYPO3\CMS\Core\DataHandling\DataHandler::setHistory(), \TYPO3\CMS\Core\DataHandling\DataHandler::process_datamap()
*/
static public function getTSCpid($table, $uid, $pid) {
// If pid is negative (referring to another record) the pid of the other record is fetched and returned.
@@ -3282,7 +3279,9 @@ class BackendUtility {
// Set the object string to blank by default:
$GLOBALS['T3_VAR']['softRefParser'][$spKey] = '';
// Now, try to create parser object:
- $objRef = $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['softRefParser'][$spKey] ? $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['softRefParser'][$spKey] : $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['softRefParser_GL'][$spKey];
+ $objRef = $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['softRefParser'][$spKey]
+ ? $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['softRefParser'][$spKey]
+ : $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['softRefParser_GL'][$spKey];
if ($objRef) {
$softRefParserObj = \TYPO3\CMS\Core\Utility\GeneralUtility::getUserObj($objRef, '');
if (is_object($softRefParserObj)) {
diff --git a/typo3/sysext/backend/Classes/Utility/IconUtility.php b/typo3/sysext/backend/Classes/Utility/IconUtility.php
index 9db1cf683c95..f5b27b8f1225 100644
--- a/typo3/sysext/backend/Classes/Utility/IconUtility.php
+++ b/typo3/sysext/backend/Classes/Utility/IconUtility.php
@@ -26,6 +26,7 @@ namespace TYPO3\CMS\Backend\Utility;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
* Contains class for icon generation in the backend
* This library has functions that returns - and if necessary creates - the icon for an element in TYPO3
@@ -39,7 +40,7 @@ namespace TYPO3\CMS\Backend\Utility;
* Notes:
* These functions are strongly related to the interface of TYPO3.
* The class is included in eg. init.php
- * ALL functions called without making a class instance, eg. "t3lib_iconWorks::getIconImage()"
+ * Static class, functions called without making a class instance.
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
@@ -483,7 +484,8 @@ class IconUtility {
/**
* The necessity of using this function for combining two images if GD is version 2 is that
* GD2 cannot manage to combine two indexed-color images without totally spoiling everything.
- * In class.t3lib_stdgraphic this was solved by combining the images onto a first created true color image
+ * In class \TYPO3\CMS\Core\Imaging\GraphicalFunctions this was solved by combining the images
+ * onto a first created true color image.
* However it has turned out that this method will not work if the indexed png-files contains transparency.
* So I had to turn my attention to ImageMagick - my 'enemy of death'.
* And so it happend - ImageMagick is now used to combine my two indexed-color images with transparency. And that works.
@@ -502,7 +504,7 @@ class IconUtility {
* @param integer $sourceHeight Source height
* @return void
* @access private
- * @see t3lib_stdGraphic::imagecopyresized()
+ * @see \TYPO3\CMS\Core\Imaging\GraphicalFunctions::imagecopyresized()
*/
static public function imagecopyresized(&$destinationImage, $sourceImage, $destinationX, $destinationY, $sourceX, $sourceY, $destinationWidth, $destinationHeight, $sourceWidth, $sourceHeight) {
imagecopyresized($destinationImage, $sourceImage, $destinationX, $destinationY, $sourceX, $sourceY, $destinationWidth, $destinationHeight, $sourceWidth, $sourceHeight);
@@ -554,13 +556,13 @@ class IconUtility {
* There are three ways to use this API:
*
* 1) for any given TCA record
- * $spriteIconHtml = t3lib_iconWorks::getSpriteIconForRecord('pages', $row);
+ * $spriteIconHtml = \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIconForRecord('pages', $row);
*
* 2) for any given file
- * $spriteIconHtml = t3lib_iconWorks::getSpriteIconForFile('myimage.png');
+ * $spriteIconHtml = \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIconForFile('myimage.png');
*
* 3) for any other icon you know the name
- * $spriteIconHtml = t3lib_iconWorks::getSpriteIcon('actions-document-open');
+ * $spriteIconHtml = \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-document-open');
*
**********************************************/
/**
@@ -624,7 +626,7 @@ class IconUtility {
* usually called from getSpriteIconForFile or ExtJs Provider
*
* @param string $fileExtension FileExtension can be jpg, gif etc, but also be 'mount' or 'folder', but can also be a full path which will be resolved then
- * @return string The string of the CSS class, see t3lib_iconworks::$fileSpriteIconNames
+ * @return string The string of the CSS class, see \TYPO3\CMS\Backend\Utility\IconUtility::$fileSpriteIconNames
* @access private
*/
static public function mapFileExtensionToSpriteIconClass($fileExtension) {
@@ -636,7 +638,7 @@ class IconUtility {
* usually called from mapFileExtensionToSpriteIconClass and tceforms
*
* @param string $fileExtension FileExtension can be jpg, gif etc, but also be 'mount' or 'folder', but can also be a full path which will be resolved then
- * @return string The string of the CSS class, see t3lib_iconworks::$fileSpriteIconNames
+ * @return string The string of the CSS class, see \TYPO3\CMS\Backend\Utility\IconUtility::$fileSpriteIconNames
* @access private
*/
static public function mapFileExtensionToSpriteIconName($fileExtension) {
diff --git a/typo3/sysext/backend/Classes/View/BackendLayoutView.php b/typo3/sysext/backend/Classes/View/BackendLayoutView.php
index 169cacf3f2df..3aedd9e6e20e 100644
--- a/typo3/sysext/backend/Classes/View/BackendLayoutView.php
+++ b/typo3/sysext/backend/Classes/View/BackendLayoutView.php
@@ -76,8 +76,8 @@ class BackendLayoutView {
public function getColPosListItemsParsed($id) {
$tsConfig = \TYPO3\CMS\Backend\Utility\BackendUtility::getModTSconfig($id, 'TCEFORM.tt_content.colPos');
$tcaConfig = $GLOBALS['TCA']['tt_content']['columns']['colPos']['config'];
- /** @var $tceForms t3lib_TCEForms */
- $tceForms = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('t3lib_TCEForms');
+ /** @var $tceForms \TYPO3\CMS\Backend\Form\FormEngine */
+ $tceForms = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Form\\FormEngine');
$tcaItems = $tcaConfig['items'];
$tcaItems = $tceForms->addItems($tcaItems, $tsConfig['properties']['addItems.']);
if (isset($tcaConfig['itemsProcFunc']) && $tcaConfig['itemsProcFunc']) {
diff --git a/typo3/sysext/backend/Classes/View/PageTreeView.php b/typo3/sysext/backend/Classes/View/PageTreeView.php
index 27640ef228f6..3361ec9591ea 100644
--- a/typo3/sysext/backend/Classes/View/PageTreeView.php
+++ b/typo3/sysext/backend/Classes/View/PageTreeView.php
@@ -26,13 +26,12 @@ namespace TYPO3\CMS\Backend\View;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
- * Extension class for the t3lib_browsetree class, specially made
- * for browsing pages in the Web module
+ * Browse pages in Web module
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
* @author Benjamin Mack <bmack@xnos.org>
- * @see class t3lib_browseTree
*/
class PageTreeView extends \TYPO3\CMS\Backend\Tree\View\BrowseTreeView {
@@ -266,7 +265,7 @@ class PageTreeView extends \TYPO3\CMS\Backend\Tree\View\BrowseTreeView {
* @param boolean $exp The element was expanded to render subelements if this flag is set.
* @return string Image tag with the plus/minus icon.
* @access private
- * @see t3lib_pageTree::PMicon()
+ * @see \TYPO3\CMS\Backend\Tree\View\PageTreeView::PMicon()
* @todo Define visibility
*/
public function PMicon($row, $a, $c, $nextCount, $exp) {
diff --git a/typo3/sysext/backend/Tests/Unit/Tree/Pagetree/DataProviderTest.php b/typo3/sysext/backend/Tests/Unit/Tree/Pagetree/DataProviderTest.php
index 83d2e8a91e6a..8a9136e08980 100644
--- a/typo3/sysext/backend/Tests/Unit/Tree/Pagetree/DataProviderTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Tree/Pagetree/DataProviderTest.php
@@ -24,7 +24,7 @@ namespace TYPO3\CMS\Backend\Tests\Unit\Tree\Pagetree;
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
/**
- * Testcase for class t3lib_tree_pagetree_DataProvider.
+ * Testcase
*
* @author Stefan Galinski <stefan.galinski@gmail.com>
* @author Oliver Klee <typo3-coding@oliverklee.de>
diff --git a/typo3/sysext/cms/tslib/showpic.php b/typo3/sysext/cms/tslib/showpic.php
index 5253a1c860d1..ac5eac90bab7 100644
--- a/typo3/sysext/cms/tslib/showpic.php
+++ b/typo3/sysext/cms/tslib/showpic.php
@@ -24,6 +24,7 @@
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
* Shows a picture from uploads/* in enlarged format in a separate window.
* Picture file and settings is supplied by GET-parameters: file, width, height, sample, alternativeTempPath, effects, frame, bodyTag, title, wrap, md5
@@ -32,19 +33,23 @@
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
+
if (!defined('PATH_typo3conf')) {
die('The configuration path was not properly defined!');
}
-require_once PATH_t3lib . 'class.t3lib_stdgraphic.php';
+
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('core') . 'Classes/Imaging/GraphicalFunctions.php';
+
/*
* @deprecated since 6.0, the classname SC_tslib_showpic and this file is obsolete
* and will be removed with 6.2. The class was renamed and is now located at:
* typo3/sysext/frontend/Classes/Controller/ShowImageController.php
*/
require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('frontend') . 'Classes/Controller/ShowImageController.php';
+
// Make instance:
$SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Frontend\\Controller\\ShowImageController');
$SOBE->init();
$SOBE->main();
$SOBE->printContent();
-?>
\ No newline at end of file
+?>
diff --git a/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php b/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
index 3221b0846b9e..69ce83a72f82 100644
--- a/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
+++ b/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
@@ -1394,7 +1394,6 @@ abstract class AbstractUserAuthentication {
* @param integer $recuid Special field used by tce_main.php. These ($tablename, $recuid, $recpid) holds the reference to the record which the log-entry is about. (Was used in attic status.php to update the interface.)
* @param integer $recpid Special field used by tce_main.php. These ($tablename, $recuid, $recpid) holds the reference to the record which the log-entry is about. (Was used in attic status.php to update the interface.)
* @return void
- * @see t3lib_beUserAuth::writelog()
* @todo Define visibility
*/
public function writelog($type, $action, $error, $details_nr, $details, $data, $tablename, $recuid, $recpid) {
@@ -1438,7 +1437,7 @@ abstract class AbstractUserAuthentication {
*
* @param string $name The username to look up.
* @return void
- * @see t3lib_userAuth::setBeUserByUid()
+ * @see \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::setBeUserByUid()
* @internal
* @todo Define visibility
*/
@@ -1469,7 +1468,7 @@ abstract class AbstractUserAuthentication {
*
* @param string $name The username to look up.
* @return array user record or FALSE
- * @see t3lib_userAuth::getUserByUid()
+ * @see \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::getUserByUid()
* @internal
* @todo Define visibility
*/
diff --git a/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php b/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
index a874bb4b7fd4..5bc34e037c45 100644
--- a/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
+++ b/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
@@ -1216,12 +1216,12 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
/**
* Initializes a lot of stuff like the access-lists, database-mountpoints and filemountpoints
- * This method is called by ->backendCheckLogin() (from extending class t3lib_beuserauth) if the backend user login has verified OK.
+ * This method is called by ->backendCheckLogin() (from extending \TYPO3\CMS\Core\Authentication\BackendUserAuthentication) if the backend user login has verified OK.
* Generally this is required initialization of a backend user.
*
* @return void
* @access private
- * @see t3lib_TSparser
+ * @see \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser
* @todo Define visibility
*/
public function fetchGroupData() {
@@ -2281,7 +2281,6 @@ This is a dump of the failures:
}
// Saving if updated.
if ($U) {
- // Method from the t3lib_userauth class.
$this->writeUC();
}
}
diff --git a/typo3/sysext/core/Classes/Cache/Backend/AbstractBackend.php b/typo3/sysext/core/Classes/Cache/Backend/AbstractBackend.php
index af1f932c6472..00d86008485e 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/AbstractBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/AbstractBackend.php
@@ -53,7 +53,7 @@ abstract class AbstractBackend implements \TYPO3\CMS\Core\Cache\Backend\BackendI
* The current application context
*
* TYPO3 v4 note: This variable is currently unused in v4 context and set to
- * "production" always by t3lib_cache. It is only kept to stay in sync with
+ * "production" always. It is only kept to stay in sync with
* FLOW3 code.
*
* @var string
diff --git a/typo3/sysext/core/Classes/Cache/Backend/BackendInterface.php b/typo3/sysext/core/Classes/Cache/Backend/BackendInterface.php
index f84622ff0a30..24477a22d1e5 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/BackendInterface.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/BackendInterface.php
@@ -52,7 +52,7 @@ interface BackendInterface
* @param integer $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
* @return void
* @throws \TYPO3\CMS\Core\Cache\Exception if no cache frontend has been set.
- * @throws t3lib_cache_Exception_InvalidData if the data is not a string
+ * @throws \TYPO3\CMS\Core\Cache\Exception\InvalidDataException if the data is not a string
* @api
*/
public function set($entryIdentifier, $data, array $tags = array(), $lifetime = NULL);
diff --git a/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php b/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php
index 2f0b9d021ddf..f03fe9910af8 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php
@@ -138,14 +138,14 @@ class FileBackend extends \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend implem
* @param integer $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
* @return void
* @throws \RuntimeException
- * @throws \t3lib_cache_Exception_InvalidData if the directory does not exist or is not writable or exceeds the maximum allowed path length, or if no cache frontend has been set.
+ * @throws \TYPO3\CMS\Core\Cache\Exception\InvalidDataException if the directory does not exist or is not writable or exceeds the maximum allowed path length, or if no cache frontend has been set.
* @throws \TYPO3\CMS\Core\Cache\Exception if the directory does not exist or is not writable or exceeds the maximum allowed path length, or if no cache frontend has been set.
* @throws \InvalidArgumentException
* @api
*/
public function set($entryIdentifier, $data, array $tags = array(), $lifetime = NULL) {
if (!is_string($data)) {
- throw new \t3lib_cache_Exception_InvalidData('The specified data is of type "' . gettype($data) . '" but a string is expected.', 1204481674);
+ throw new \TYPO3\CMS\Core\Cache\Exception\InvalidDataException('The specified data is of type "' . gettype($data) . '" but a string is expected.', 1204481674);
}
if ($entryIdentifier !== basename($entryIdentifier)) {
throw new \InvalidArgumentException('The specified entry identifier must not contain a path segment.', 1282073032);
@@ -164,7 +164,7 @@ class FileBackend extends \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend implem
$result = file_put_contents($temporaryCacheEntryPathAndFilename, $data . $metaData);
\TYPO3\CMS\Core\Utility\GeneralUtility::fixPermissions($temporaryCacheEntryPathAndFilename);
if ($result === FALSE) {
- throw new \t3lib_cache_exception('The temporary cache file "' . $temporaryCacheEntryPathAndFilename . '" could not be written.', 1204026251);
+ throw new \TYPO3\CMS\Core\Cache\Exception('The temporary cache file "' . $temporaryCacheEntryPathAndFilename . '" could not be written.', 1204026251);
}
$i = 0;
$cacheEntryPathAndFilename = $this->cacheDirectory . $entryIdentifier . $this->cacheEntryFileExtension;
@@ -172,7 +172,7 @@ class FileBackend extends \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend implem
$i++;
}
if ($result === FALSE) {
- throw new \t3lib_cache_exception('The cache file "' . $cacheEntryPathAndFilename . '" could not be written.', 1222361632);
+ throw new \TYPO3\CMS\Core\Cache\Exception('The cache file "' . $cacheEntryPathAndFilename . '" could not be written.', 1222361632);
}
}
diff --git a/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php b/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php
index 51b180d0e232..b8f69c77f92f 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php
@@ -195,7 +195,7 @@ class MemcachedBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend imp
throw new \TYPO3\CMS\Core\Cache\Exception('No cache frontend has been set yet via setCache().', 1207149215);
}
if (!is_string($data)) {
- throw new \t3lib_cache_Exception_InvalidData('The specified data is of type "' . gettype($data) . '" but a string is expected.', 1207149231);
+ throw new \TYPO3\CMS\Core\Cache\Exception\InvalidDataException('The specified data is of type "' . gettype($data) . '" but a string is expected.', 1207149231);
}
$tags[] = '%MEMCACHEBE%' . $this->cacheIdentifier;
$expiration = $lifetime !== NULL ? $lifetime : $this->defaultLifetime;
diff --git a/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php b/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php
index 7d0779ff2c5a..63fa5d9ac881 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php
@@ -266,7 +266,7 @@ class RedisBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend impleme
* @param integer $lifetime Lifetime of this cache entry in seconds. If NULL is specified, default lifetime is used. "0" means unlimited lifetime.
* @return void
* @throws \InvalidArgumentException if identifier is not valid
- * @throws \t3lib_cache_Exception_InvalidData if data is not a string
+ * @throws \TYPO3\CMS\Core\Cache\Exception\InvalidDataException if data is not a string
* @api
*/
public function set($entryIdentifier, $data, array $tags = array(), $lifetime = NULL) {
@@ -274,7 +274,7 @@ class RedisBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend impleme
throw new \InvalidArgumentException('The specified identifier is of type "' . gettype($entryIdentifier) . '" but a string is expected.', 1279470252);
}
if (!is_string($data)) {
- throw new \t3lib_cache_Exception_InvalidData('The specified data is of type "' . gettype($data) . '" but a string is expected.', 1279469941);
+ throw new \TYPO3\CMS\Core\Cache\Exception\InvalidDataException('The specified data is of type "' . gettype($data) . '" but a string is expected.', 1279469941);
}
$lifetime = $lifetime === NULL ? $this->defaultLifetime : $lifetime;
if (!is_integer($lifetime)) {
diff --git a/typo3/sysext/core/Classes/Charset/CharsetConverter.php b/typo3/sysext/core/Classes/Charset/CharsetConverter.php
index 32bf02061b73..0b6b93ef7df7 100644
--- a/typo3/sysext/core/Classes/Charset/CharsetConverter.php
+++ b/typo3/sysext/core/Classes/Charset/CharsetConverter.php
@@ -1786,7 +1786,7 @@ class CharsetConverter {
* @param string $string
* @param string $case
* @return string
- * @see t3lib_cs::conv_case()
+ * @see \TYPO3\CMS\Core\Charset\CharsetConverter::conv_case()
*/
public function convCaseFirst($charset, $string, $case) {
$firstChar = $this->substr($charset, $string, 0, 1);
diff --git a/typo3/sysext/core/Classes/Configuration/FlexForm/FlexFormTools.php b/typo3/sysext/core/Classes/Configuration/FlexForm/FlexFormTools.php
index 69bff03b52e2..e45e28c837c4 100644
--- a/typo3/sysext/core/Classes/Configuration/FlexForm/FlexFormTools.php
+++ b/typo3/sysext/core/Classes/Configuration/FlexForm/FlexFormTools.php
@@ -303,7 +303,7 @@ class FlexFormTools {
}
/**
- * Call back function for t3lib_flexformtools class
+ * Call back function for \TYPO3\CMS\Core\Configuration\FlexForm\FlexFormTools class
* Basically just setting the value in a new array (thus cleaning because only values that are valid are visited!)
*
* @param array $dsArr Data structure for the current value
diff --git a/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php b/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php
index 7771562f4f48..05861b0682c5 100644
--- a/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php
+++ b/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php
@@ -595,7 +595,7 @@ abstract class AbstractConditionMatcher {
*
* @param string $string The condition to match against its criterias.
* @return boolean Whether the condition matched
- * @see t3lib_tsparser::parse()
+ * @see \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser::parse()
*/
abstract protected function evaluateCondition($string);
diff --git a/typo3/sysext/core/Classes/Core/Bootstrap.php b/typo3/sysext/core/Classes/Core/Bootstrap.php
index 961fe398ed6e..e5e2e031bd68 100644
--- a/typo3/sysext/core/Classes/Core/Bootstrap.php
+++ b/typo3/sysext/core/Classes/Core/Bootstrap.php
@@ -672,7 +672,7 @@ class Bootstrap {
}
/**
- * Initialize t3lib_db in $GLOBALS and connect if requested
+ * Initialize database connection in $GLOBALS and connect if requested
*
* @param boolean $connect Whether db should be connected
* @return \TYPO3\CMS\Core\Core\Bootstrap
@@ -912,7 +912,7 @@ class Bootstrap {
$backendUser->dontSetCookie = TRUE;
}
// The global must be available very early, because methods below
- // might triger code which relies on it. See: #45625
+ // might trigger code which relies on it. See: #45625
$GLOBALS['BE_USER'] = $backendUser;
$backendUser->start();
$backendUser->checkCLIuser();
diff --git a/typo3/sysext/core/Classes/Core/ClassLoader.php b/typo3/sysext/core/Classes/Core/ClassLoader.php
index 6aac08574a0d..28cde4d337a7 100644
--- a/typo3/sysext/core/Classes/Core/ClassLoader.php
+++ b/typo3/sysext/core/Classes/Core/ClassLoader.php
@@ -417,8 +417,8 @@ class ClassLoader {
/**
* Lowercase all keys of the class registry.
*
- * Use the multi byte safe version of strtolower from t3lib_div,
- * so array_change_key_case() can not be used
+ * Use the multi byte safe version of strtolower from
+ * GeneralUtility, so array_change_key_case() can not be used
*
* @param array $registry Given registry entries
* @return array with lower cased keys
diff --git a/typo3/sysext/core/Classes/Core/SystemEnvironmentBuilder.php b/typo3/sysext/core/Classes/Core/SystemEnvironmentBuilder.php
index 051b18df12ae..0c4f45d88c6d 100644
--- a/typo3/sysext/core/Classes/Core/SystemEnvironmentBuilder.php
+++ b/typo3/sysext/core/Classes/Core/SystemEnvironmentBuilder.php
@@ -207,7 +207,6 @@ class SystemEnvironmentBuilder {
*
* @return void
* @deprecated since 6.0, will be removed in 6.2
- * @see t3lib/class.t3lib_div.php, t3lib/class.t3lib_extmgm.php
*/
static public function setupClassAliasForLegacyBaseClasses() {
class_alias('TYPO3\\CMS\\Core\\Utility\\GeneralUtility', 't3lib_div');
@@ -233,7 +232,8 @@ class SystemEnvironmentBuilder {
* include path, because the shipped PEAR packages use
* relative paths to include their files.
*
- * This is required for t3lib_http_Request to work.
+ * This is required for \TYPO3\CMS\Core\Http\HttpRequest
+ * to work.
*
* Having the TYPO3 folder first will make sure that the
* shipped version is loaded before any local PEAR package,
diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandler.php b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
index a9ecf1a6b1dc..6ec6803efb88 100644
--- a/typo3/sysext/core/Classes/DataHandling/DataHandler.php
+++ b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
@@ -25,14 +25,10 @@ namespace TYPO3\CMS\Core\DataHandling;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
* Contains the TYPO3 Core Engine
*
- * Revised for TYPO3 3.9 October 2005 by Kasper Skårhøj
- *
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- */
-/**
* This is the TYPO3 Core Engine class for manipulation of the database
* This class is used by eg. the tce_db.php script which provides an the interface for POST forms to this class.
*
@@ -488,8 +484,8 @@ class DataHandler {
protected $version_remapMMForVersionSwap_reg;
/**
- * The outer most instance of t3lib_TCEmain
- * (t3lib_TCEmain instantiates itself on versioning and localization)
+ * The outer most instance of \TYPO3\CMS\Core\DataHandling\DataHandler:
+ * This object instantiates itself on versioning and localization ...
*
* @var \TYPO3\CMS\Core\DataHandling\DataHandler
*/
@@ -697,7 +693,7 @@ class DataHandler {
foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['checkModifyAccessList'] as $classData) {
$hookObject = \TYPO3\CMS\Core\Utility\GeneralUtility::getUserObj($classData);
if (!$hookObject instanceof \TYPO3\CMS\Core\DataHandling\DataHandlerCheckModifyAccessListHookInterface) {
- throw new \UnexpectedValueException('$hookObject must implement interface t3lib_TCEmain_checkModifyAccessListHook', 1251892472);
+ throw new \UnexpectedValueException('$hookObject must implement interface \\TYPO3\\CMS\\Core\\DataHandling\\DataHandlerCheckModifyAccessListHookInterface', 1251892472);
}
$this->checkModifyAccessListHookObjects[] = $hookObject;
}
@@ -2356,7 +2352,7 @@ class DataHandler {
* @param integer $id Record id, used for look-up of MM relations (local_uid)
* @param string $status Status string ('update' or 'new')
* @param string $type The type, either 'select', 'group' or 'inline'
- * @param string $currentTable Table name, needs to be passed to t3lib_loadDBGroup
+ * @param string $currentTable Table name, needs to be passed to \TYPO3\CMS\Core\Database\RelationHandler
* @param string $currentField field name, needs to be set for writing to sys_history
* @return array Modified value array
* @todo Define visibility
@@ -2419,14 +2415,14 @@ class DataHandler {
/**
* Starts the processing the input data for flexforms. This will traverse all sheets / languages and for each it will traverse the sub-structure.
* See checkValue_flex_procInData_travDS() for more details.
- * WARNING: Currently, it traverses based on the actual _data_ array and NOT the _structure_. This means that values for non-valid fields, lKey/vKey/sKeys will be accepted! For traversal of data with a call back function you should rather use class.t3lib_flexformtools.php
+ * WARNING: Currently, it traverses based on the actual _data_ array and NOT the _structure_. This means that values for non-valid fields, lKey/vKey/sKeys will be accepted! For traversal of data with a call back function you should rather use \TYPO3\CMS\Core\Configuration\FlexForm\FlexFormTools
*
* @param array $dataPart The 'data' part of the INPUT flexform data
* @param array $dataPart_current The 'data' part of the CURRENT flexform data
* @param array $uploadedFiles The uploaded files for the 'data' part of the INPUT flexform data
* @param array $dataStructArray Data structure for the form (might be sheets or not). Only values in the data array which has a configuration in the data structure will be processed.
* @param array $pParams A set of parameters to pass through for the calling of the evaluation functions
- * @param string $callBackFunc Optional call back function, see checkValue_flex_procInData_travDS() DEPRICATED, use class.t3lib_flexformtools.php instead for traversal!
+ * @param string $callBackFunc Optional call back function, see checkValue_flex_procInData_travDS() DEPRICATED, use \TYPO3\CMS\Core\Configuration\FlexForm\FlexFormTools instead for traversal!
* @return array The modified 'data' part.
* @see checkValue_flex_procInData_travDS()
* @todo Define visibility
@@ -2574,7 +2570,7 @@ class DataHandler {
* @param array $tcaFieldConf TCA field config
* @param integer $id Record id
* @param string $status Status string ('update' or 'new')
- * @param string $table Table name, needs to be passed to t3lib_loadDBGroup
+ * @param string $table Table name, needs to be passed to \TYPO3\CMS\Core\Database\RelationHandler
* @param string $field The current field the values are modified for
* @param array $additionalData Additional data to be forwarded to sub-processors
* @return string Modified values
@@ -2583,7 +2579,7 @@ class DataHandler {
$newValue = '';
$foreignTable = $tcaFieldConf['foreign_table'];
$valueArray = $this->applyFiltersToValues($tcaFieldConf, $valueArray);
- // Fetch the related child records by using t3lib_loadDBGroup:
+ // Fetch the related child records using \TYPO3\CMS\Core\Database\RelationHandler
/** @var $dbAnalysis \TYPO3\CMS\Core\Database\RelationHandler */
$dbAnalysis = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Database\\RelationHandler');
$dbAnalysis->start(implode(',', $valueArray), $foreignTable, '', 0, $table, $tcaFieldConf);
@@ -3139,7 +3135,7 @@ class DataHandler {
if ($language > 0 && $localizationMode == 'keep') {
$value = $inlineSubType == 'field' ? 0 : '';
} else {
- // Fetch the related child records by using t3lib_loadDBGroup:
+ // Fetch the related child records using \TYPO3\CMS\Core\Database\RelationHandler
/** @var $dbAnalysis \TYPO3\CMS\Core\Database\RelationHandler */
$dbAnalysis = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Database\\RelationHandler');
$dbAnalysis->start($value, $conf['foreign_table'], '', $uid, $table, $conf);
@@ -3315,7 +3311,7 @@ class DataHandler {
clearstatcache();
// Register this:
$this->RTEmagic_copyIndex[$rec['tablename']][$rec['recuid']][$rec['field']][$rec['ref_string']] = substr($copyDestName, strlen(PATH_site));
- // Check and update the record using the t3lib_refindex class:
+ // Check and update the record using \TYPO3\CMS\Core\Database\ReferenceIndex
if (@is_file($copyDestName)) {
$sysRefObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Database\\ReferenceIndex');
$error = $sysRefObj->setReferenceValue($rec['hash'], substr($copyDestName, strlen(PATH_site)), FALSE, TRUE);
@@ -6801,7 +6797,6 @@ class DataHandler {
* @param integer $event_pid The page_uid (pid) where the event occurred. Used to select log-content for specific pages.
* @param string $NEWid NEW id for new records
* @return integer Log entry UID
- * @see class.t3lib_beuserauth.php
* @todo Define visibility
*/
public function log($table, $recuid, $action, $recpid, $error, $details, $details_nr = -1, $data = array(), $event_pid = -1, $NEWid = '') {
@@ -6965,8 +6960,8 @@ class DataHandler {
}
/**
- * Gets the outer most instance of t3lib_TCEmain.
- * Since t3lib_TCEmain can create nested objects of itself,
+ * Gets the outer most instance of \TYPO3\CMS\Core\DataHandling\DataHandler
+ * Since \TYPO3\CMS\Core\DataHandling\DataHandler can create nested objects of itself,
* this method helps to determine the first (= outer most) one.
*
* @return \TYPO3\CMS\Core\DataHandling\DataHandler
@@ -6985,8 +6980,8 @@ class DataHandler {
}
/**
- * Determines whether the this object is the outer most instance of t3lib_TCEmain.
- * Since t3lib_TCEmain can create nested objects of itself,
+ * Determines whether the this object is the outer most instance of itself
+ * Since DataHandler can create nested objects of itself,
* this method helps to determine the first (= outer most) one.
*
* @return boolean
diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandlerCheckModifyAccessListHookInterface.php b/typo3/sysext/core/Classes/DataHandling/DataHandlerCheckModifyAccessListHookInterface.php
index fb3f68f64dee..b04ea8fe8496 100644
--- a/typo3/sysext/core/Classes/DataHandling/DataHandlerCheckModifyAccessListHookInterface.php
+++ b/typo3/sysext/core/Classes/DataHandling/DataHandlerCheckModifyAccessListHookInterface.php
@@ -26,12 +26,14 @@ namespace TYPO3\CMS\Core\DataHandling;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
- * Interface for hook in t3lib_TCEmain::checkModifyAccessList
+ * Interface for hook in \TYPO3\CMS\Core\DataHandling\DataHandler::checkModifyAccessList
*
* @author Oliver Hader <oliver@typo3.org>
*/
interface DataHandlerCheckModifyAccessListHookInterface {
+
/**
* Hook that determines whether a user has access to modify a table.
*
diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandlerProcessUploadHookInterface.php b/typo3/sysext/core/Classes/DataHandling/DataHandlerProcessUploadHookInterface.php
index 27a4d52d752a..22435470fbb7 100644
--- a/typo3/sysext/core/Classes/DataHandling/DataHandlerProcessUploadHookInterface.php
+++ b/typo3/sysext/core/Classes/DataHandling/DataHandlerProcessUploadHookInterface.php
@@ -37,11 +37,11 @@ interface DataHandlerProcessUploadHookInterface {
* Post-process a file upload.
*
* @param string $filename The uploaded file
- * @param \TYPO3\CMS\Core\DataHandling\DataHandler $parentObject Parent t3lib_TCEmain object
+ * @param \TYPO3\CMS\Core\DataHandling\DataHandler $parentObject
* @return void
*/
public function processUpload_postProcessAction(&$filename, \TYPO3\CMS\Core\DataHandling\DataHandler $parentObject);
}
-?>
\ No newline at end of file
+?>
diff --git a/typo3/sysext/core/Classes/Database/DatabaseConnection.php b/typo3/sysext/core/Classes/Database/DatabaseConnection.php
index 7ec95376d6ee..f60d9dadf900 100644
--- a/typo3/sysext/core/Classes/Database/DatabaseConnection.php
+++ b/typo3/sysext/core/Classes/Database/DatabaseConnection.php
@@ -654,7 +654,7 @@ class DatabaseConnection {
* @param string $groupBy See exec_SELECTquery()
* @param string $orderBy See exec_SELECTquery()
* @param string $limit See exec_SELECTquery()
- * @param array $input_parameters An array of values with as many elements as there are bound parameters in the SQL statement being executed. All values are treated as t3lib_db_PreparedStatement::PARAM_AUTOTYPE.
+ * @param array $input_parameters An array of values with as many elements as there are bound parameters in the SQL statement being executed. All values are treated as \TYPO3\CMS\Core\Database\PreparedStatement::PARAM_AUTOTYPE.
* @return \TYPO3\CMS\Core\Database\PreparedStatement Prepared statement
*/
public function prepare_SELECTquery($select_fields, $from_table, $where_clause, $groupBy = '', $orderBy = '', $limit = '', array $input_parameters = array()) {
@@ -673,7 +673,7 @@ class DatabaseConnection {
* Creates a SELECT prepared SQL statement based on input query parts array
*
* @param array $queryParts Query parts array
- * @param array $input_parameters An array of values with as many elements as there are bound parameters in the SQL statement being executed. All values are treated as t3lib_db_PreparedStatement::PARAM_AUTOTYPE.
+ * @param array $input_parameters An array of values with as many elements as there are bound parameters in the SQL statement being executed. All values are treated as \TYPO3\CMS\Core\Database\PreparedStatement::PARAM_AUTOTYPE.
* @return \TYPO3\CMS\Core\Database\PreparedStatement Prepared statement
*/
public function prepare_SELECTqueryArray(array $queryParts, array $input_parameters = array()) {
@@ -682,7 +682,7 @@ class DatabaseConnection {
/**
* Executes a prepared query.
- * This method may only be called by t3lib_db_PreparedStatement.
+ * This method may only be called by \TYPO3\CMS\Core\Database\PreparedStatement
*
* @param string $query The query to execute
* @param array $queryComponents The components of the query to execute
diff --git a/typo3/sysext/core/Classes/Database/PostProcessQueryHookInterface.php b/typo3/sysext/core/Classes/Database/PostProcessQueryHookInterface.php
index 30788b99794d..5bbd983f5e85 100644
--- a/typo3/sysext/core/Classes/Database/PostProcessQueryHookInterface.php
+++ b/typo3/sysext/core/Classes/Database/PostProcessQueryHookInterface.php
@@ -27,8 +27,8 @@ namespace TYPO3\CMS\Core\Database;
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
/**
- * Interface for classes which hook into t3lib_DB and do additional processing
- * after a query has been executed.
+ * Interface for classes which hook into \TYPO3\CMS\Core\Database\DatabaseConnection
+ * and do additional processing after a query has been executed.
*
* @author Xavier Perseguers <typo3@perseguers.ch>
*/
diff --git a/typo3/sysext/core/Classes/Database/PreProcessQueryHookInterface.php b/typo3/sysext/core/Classes/Database/PreProcessQueryHookInterface.php
index 5141c7d3574d..541275c16853 100644
--- a/typo3/sysext/core/Classes/Database/PreProcessQueryHookInterface.php
+++ b/typo3/sysext/core/Classes/Database/PreProcessQueryHookInterface.php
@@ -27,8 +27,8 @@ namespace TYPO3\CMS\Core\Database;
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
/**
- * Interface for classes which hook into t3lib_DB and do additional processing
- * before a query has been executed.
+ * Interface for classes which hook into \TYPO3\CMS\Core\Database\DatabaseConnection
+ * and do additional processing before a query has been executed.
*
* @author Xavier Perseguers <typo3@perseguers.ch>
*/
diff --git a/typo3/sysext/core/Classes/Database/PreparedStatement.php b/typo3/sysext/core/Classes/Database/PreparedStatement.php
index 6f6cf9beff67..3263fb1acaba 100644
--- a/typo3/sysext/core/Classes/Database/PreparedStatement.php
+++ b/typo3/sysext/core/Classes/Database/PreparedStatement.php
@@ -26,8 +26,9 @@ namespace TYPO3\CMS\Core\Database;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
- * TYPO3 prepared statement for t3lib_db class.
+ * TYPO3 prepared statement for DatabaseConnection
*
* USE:
* In all TYPO3 scripts when you need to create a prepared query:
@@ -77,7 +78,7 @@ class PreparedStatement {
/**
* Specifies that the fetch method shall return each row as an array indexed by
* column name as returned in the corresponding result set. If the result set
- * contains multiple columns with the same name, t3lib_db_PreparedStatement::FETCH_ASSOC
+ * contains multiple columns with the same name, \TYPO3\CMS\Core\Database\PreparedStatement::FETCH_ASSOC
* returns only a single value per column name.
*
* @var integer
@@ -146,7 +147,8 @@ class PreparedStatement {
* on a ready-to-be-executed query. On the other hand, DBAL will have
* parse the query and will be able to safely know where parameters are used
* and will use $queryComponents instead.
- * This constructor may only be used by t3lib_DB.
+ *
+ * This constructor may only be used by \TYPO3\CMS\Core\Database\DatabaseConnection
*
* @param string $query SQL query to be executed
* @param string $table FROM table, used to call $GLOBALS['TYPO3_DB']->fullQuoteStr().
@@ -210,7 +212,7 @@ class PreparedStatement {
*
* @param mixed $parameter Parameter identifier. For a prepared statement using named placeholders, this will be a parameter name of the form :name. For a prepared statement using question mark placeholders, this will be the 1-indexed position of the parameter.
* @param mixed $value The value to bind to the parameter.
- * @param integer $data_type Explicit data type for the parameter using the t3lib_db_PreparedStatement::PARAM_* constants. If not given, the PHP type of the value will be used instead (int, string, boolean).
+ * @param integer $data_type Explicit data type for the parameter using the \TYPO3\CMS\Core\Database\PreparedStatement::PARAM_* constants. If not given, the PHP type of the value will be used instead (int, string, boolean).
* @return \TYPO3\CMS\Core\Database\PreparedStatement The current prepared statement to allow method chaining
* @api
*/
@@ -244,12 +246,12 @@ class PreparedStatement {
* Executes the prepared statement. If the prepared statement included parameter
* markers, you must either:
* <ul>
- * <li>call {@link t3lib_db_PreparedStatement::bindParam()} to bind PHP variables
+ * <li>call {@link \TYPO3\CMS\Core\Database\PreparedStatement::bindParam()} to bind PHP variables
* to the parameter markers: bound variables pass their value as input</li>
* <li>or pass an array of input-only parameter values</li>
* </ul>
*
- * $input_parameters behave as in {@link t3lib_db_PreparedStatement::bindParams()}
+ * $input_parameters behave as in {@link \TYPO3\CMS\Core\Database\PreparedStatement::bindParams()}
* and work for both named parameters and question mark parameters.
*
* Example 1:
@@ -293,9 +295,9 @@ class PreparedStatement {
}
/**
- * Fetches a row from a result set associated with a t3lib_db_PreparedStatement object.
+ * Fetches a row from a result set associated with a \TYPO3\CMS\Core\Database\PreparedStatement object.
*
- * @param integer $fetch_style Controls how the next row will be returned to the caller. This value must be one of the t3lib_db_PreparedStatement::FETCH_* constants. If omitted, default fetch mode for this prepared query will be used.
+ * @param integer $fetch_style Controls how the next row will be returned to the caller. This value must be one of the \TYPO3\CMS\Core\Database\PreparedStatement::FETCH_* constants. If omitted, default fetch mode for this prepared query will be used.
* @return array Array of rows or FALSE if there are no more rows.
* @api
*/
@@ -330,7 +332,7 @@ class PreparedStatement {
/**
* Returns an array containing all of the result set rows.
*
- * @param integer $fetch_style Controls the contents of the returned array as documented in {@link t3lib_db_PreparedStatement::fetch()}.
+ * @param integer $fetch_style Controls the contents of the returned array as documented in {@link \TYPO3\CMS\Core\Database\PreparedStatement::fetch()}.
* @return array Array of rows.
* @api
*/
@@ -393,7 +395,7 @@ class PreparedStatement {
/**
* Sets the default fetch mode for this prepared query.
*
- * @param integer $mode One of the t3lib_db_PreparedStatement::FETCH_* constants
+ * @param integer $mode One of the \TYPO3\CMS\Core\Database\PreparedStatement::FETCH_* constants
* @return void
* @api
*/
@@ -413,7 +415,7 @@ class PreparedStatement {
* Guesses the type of a given value.
*
* @param mixed $value
- * @return integer One of the t3lib_db_PreparedStatement::PARAM_* constants
+ * @return integer One of the \TYPO3\CMS\Core\Database\PreparedStatement::PARAM_* constants
*/
protected function guessValueType($value) {
if (is_bool($value)) {
diff --git a/typo3/sysext/core/Classes/Database/ReferenceIndex.php b/typo3/sysext/core/Classes/Database/ReferenceIndex.php
index 8ee5b1d3cc36..9bac1a617367 100644
--- a/typo3/sysext/core/Classes/Database/ReferenceIndex.php
+++ b/typo3/sysext/core/Classes/Database/ReferenceIndex.php
@@ -419,7 +419,7 @@ class ReferenceIndex {
* @param string $structurePath Path of value in DS structure
* @param object $pObj Object reference to caller
* @return void
- * @see t3lib_TCEmain::checkValue_flex_procInData_travDS()
+ * @see \TYPO3\CMS\Core\DataHandling\DataHandler::checkValue_flex_procInData_travDS()
* @todo Define visibility
*/
public function getRelations_flexFormCallBack($dsArr, $dataValue, $PA, $structurePath, $pObj) {
diff --git a/typo3/sysext/core/Classes/Database/RelationHandler.php b/typo3/sysext/core/Classes/Database/RelationHandler.php
index e29f7a466b5e..caf875deccda 100644
--- a/typo3/sysext/core/Classes/Database/RelationHandler.php
+++ b/typo3/sysext/core/Classes/Database/RelationHandler.php
@@ -136,7 +136,7 @@ class RelationHandler {
*/
public $currentTable;
- // If a record should be undeleted (so do not use the $useDeleteClause on t3lib_BEfunc)
+ // If a record should be undeleted (so do not use the $useDeleteClause on \TYPO3\CMS\Backend\Utility\BackendUtility)
/**
* @todo Define visibility
*/
@@ -872,7 +872,6 @@ class RelationHandler {
* Prepare items from itemArray to be transferred to the TCEforms interface (as a comma list)
*
* @return string
- * @see t3lib_transferdata::renderRecord()
* @todo Define visibility
*/
public function readyForInterface() {
@@ -916,7 +915,7 @@ class RelationHandler {
*
* @param string $table Table name
* @param integer $id Record UID
- * @return array Information concerning modifications delivered by t3lib_refindex::updateRefIndexTable()
+ * @return array Information concerning modifications delivered by \TYPO3\CMS\Core\Database\ReferenceIndex::updateRefIndexTable()
* @todo Define visibility
*/
public function updateRefIndex($table, $id) {
diff --git a/typo3/sysext/core/Classes/Error/AbstractExceptionHandler.php b/typo3/sysext/core/Classes/Error/AbstractExceptionHandler.php
index 117a353395b1..2ac5062bdda6 100644
--- a/typo3/sysext/core/Classes/Error/AbstractExceptionHandler.php
+++ b/typo3/sysext/core/Classes/Error/AbstractExceptionHandler.php
@@ -127,8 +127,8 @@ abstract class AbstractExceptionHandler implements \TYPO3\CMS\Core\Error\Excepti
}
/**
- * Sends the HTTP Status 500 code, if $exception is *not* a t3lib_error_http_StatusException
- * and headers are not sent, yet.
+ * Sends the HTTP Status 500 code, if $exception is *not* a
+ * TYPO3\\CMS\\Core\\Error\\Http\\StatusException and headers are not sent, yet.
*
* @param Exception $exception
* @return void
diff --git a/typo3/sysext/core/Classes/Error/ErrorHandler.php b/typo3/sysext/core/Classes/Error/ErrorHandler.php
index 1d5be0043b64..9e48965529b7 100644
--- a/typo3/sysext/core/Classes/Error/ErrorHandler.php
+++ b/typo3/sysext/core/Classes/Error/ErrorHandler.php
@@ -102,8 +102,8 @@ class ErrorHandler implements \TYPO3\CMS\Core\Error\ErrorHandlerInterface {
// We need to manually require the exception classes in case the autoloader is not available at this point yet.
// @see http://forge.typo3.org/issues/23444
if (!class_exists('TYPO3\\CMS\\Core\\Error\\Exception', FALSE)) {
- require_once PATH_t3lib . 'class.t3lib_exception.php';
- require_once PATH_t3lib . 'error/class.t3lib_error_exception.php';
+ require_once PATH_site . 'typo3/sysext/core/Classes/Exception.php';
+ require_once PATH_site . 'typo3/sysext/core/Classes/Error/Exception.php';
}
throw new \TYPO3\CMS\Core\Error\Exception($message, 1);
} else {
diff --git a/typo3/sysext/core/Classes/FormProtection/AbstractFormProtection.php b/typo3/sysext/core/Classes/FormProtection/AbstractFormProtection.php
index 013da19ce0e6..d11340cad4c6 100644
--- a/typo3/sysext/core/Classes/FormProtection/AbstractFormProtection.php
+++ b/typo3/sysext/core/Classes/FormProtection/AbstractFormProtection.php
@@ -23,14 +23,13 @@ namespace TYPO3\CMS\Core\FormProtection;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
- * Class t3lib_formprotection_Abstract.
- *
* This class provides protection against cross-site request forgery (XSRF/CSRF)
* for forms.
*
* For documentation on how to use this class, please see the documentation of
- * the corresponding subclasses, e.g. t3lib_formprotection_BackendFormProtection.
+ * the corresponding subclasses
*
* @author Oliver Klee <typo3-coding@oliverklee.de>
* @author Helmut Hummel <helmut.hummel@typo3.org>
diff --git a/typo3/sysext/core/Classes/FormProtection/BackendFormProtection.php b/typo3/sysext/core/Classes/FormProtection/BackendFormProtection.php
index c831f95daf1e..66fffcde19ca 100644
--- a/typo3/sysext/core/Classes/FormProtection/BackendFormProtection.php
+++ b/typo3/sysext/core/Classes/FormProtection/BackendFormProtection.php
@@ -24,9 +24,8 @@ namespace TYPO3\CMS\Core\FormProtection;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
- * Class t3lib_formprotection_BackendFormProtection.
- *
* This class provides protection against cross-site request forgery (XSRF/CSRF)
* for forms in the BE.
*
@@ -37,7 +36,7 @@ namespace TYPO3\CMS\Core\FormProtection;
* matter; you only need it to get the form token for verifying it.
*
* <pre>
- * $formToken = t3lib_formprotection_Factory::get()
+ * $formToken = TYPO3\CMS\Core\FormProtection\BackendFormProtectionFactory::get()
* ->generateToken(
* 'BE user setup', 'edit'
* );
@@ -54,7 +53,7 @@ namespace TYPO3\CMS\Core\FormProtection;
* For editing a tt_content record, the call could look like this:
*
* <pre>
- * $formToken = t3lib_formprotection_Factory::get()
+ * $formToken = \TYPO3\CMS\Core\FormProtection\BackendFormProtectionFactory::get()
* ->getFormProtection()->generateToken(
* 'tt_content', 'edit', $uid
* );
@@ -65,7 +64,7 @@ namespace TYPO3\CMS\Core\FormProtection;
* that the form token is valid like this:
*
* <pre>
- * if ($dataHasBeenSubmitted && t3lib_formprotection_Factory::get()
+ * if ($dataHasBeenSubmitted && TYPO3\CMS\Core\FormProtection\BackendFormProtectionFactory::get()
* ->validateToken(
* \TYPO3\CMS\Core\Utility\GeneralUtility::_POST('formToken'),
* 'BE user setup', 'edit
diff --git a/typo3/sysext/core/Classes/FormProtection/DisabledFormProtection.php b/typo3/sysext/core/Classes/FormProtection/DisabledFormProtection.php
index 92d4a5a2f966..888cc44db717 100644
--- a/typo3/sysext/core/Classes/FormProtection/DisabledFormProtection.php
+++ b/typo3/sysext/core/Classes/FormProtection/DisabledFormProtection.php
@@ -23,9 +23,8 @@ namespace TYPO3\CMS\Core\FormProtection;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
- * Class t3lib_formprotection_DisabledFormProtection.
- *
* This class is a dummy implementation of the form protection,
* which is used when no authentication is used.
*
diff --git a/typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php b/typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php
index d823888ccb90..5f5281352c35 100644
--- a/typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php
+++ b/typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php
@@ -23,9 +23,8 @@ namespace TYPO3\CMS\Core\FormProtection;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
- * Class t3lib_formprotection_Factory.
- *
* This class creates and manages instances of the various form protection
* classes.
*
@@ -34,13 +33,13 @@ namespace TYPO3\CMS\Core\FormProtection;
* Usage for the back-end form protection:
*
* <pre>
- * $formProtection = t3lib_formprotection_Factory::get();
+ * $formProtection = \TYPO3\CMS\Core\FormProtection\FormProtectionFactory::get();
* </pre>
*
* Usage for the install tool form protection:
*
* <pre>
- * $formProtection = t3lib_formprotection_Factory::get();
+ * $formProtection = \TYPO3\CMS\Core\FormProtection\FormProtectionFactory::get();
* $formProtection->injectInstallTool($this);
* </pre>
*
@@ -53,7 +52,7 @@ class FormProtectionFactory {
/**
* created instances of form protections using the type as array key
*
- * @var array<t3lib_formProtectionAbstract>
+ * @var array<AbstracFormtProtection>
*/
static protected $instances = array();
diff --git a/typo3/sysext/core/Classes/FormProtection/InstallToolFormProtection.php b/typo3/sysext/core/Classes/FormProtection/InstallToolFormProtection.php
index 41834a2815b7..0debe8cd0e46 100644
--- a/typo3/sysext/core/Classes/FormProtection/InstallToolFormProtection.php
+++ b/typo3/sysext/core/Classes/FormProtection/InstallToolFormProtection.php
@@ -23,9 +23,8 @@ namespace TYPO3\CMS\Core\FormProtection;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
- * Class t3lib_formprotection_InstallToolFormProtection.
- *
* This class provides protection against cross-site request forgery (XSRF/CSRF)
* in the install tool.
*
diff --git a/typo3/sysext/core/Classes/FrontendEditing/FrontendEditingController.php b/typo3/sysext/core/Classes/FrontendEditing/FrontendEditingController.php
index ff81c1f5e22e..8c2a91ee2736 100644
--- a/typo3/sysext/core/Classes/FrontendEditing/FrontendEditingController.php
+++ b/typo3/sysext/core/Classes/FrontendEditing/FrontendEditingController.php
@@ -44,9 +44,7 @@ class FrontendEditingController {
public $TSFE_EDIT;
/**
- * TCEmain object.
- *
- * @var t3lib_tcemain
+ * @var \TYPO3\CMS\Core\DataHandling\DataHandler
*/
protected $tce;
@@ -568,7 +566,7 @@ class FrontendEditingController {
}
/**
- * Initializes t3lib_TCEmain since it is used on modification actions.
+ * Initializes \TYPO3\CMS\Core\DataHandling\DataHandler since it is used on modification actions.
*
* @return void
*/
diff --git a/typo3/sysext/core/Classes/Html/RteHtmlParser.php b/typo3/sysext/core/Classes/Html/RteHtmlParser.php
index e49442fa183d..083adf279e05 100644
--- a/typo3/sysext/core/Classes/Html/RteHtmlParser.php
+++ b/typo3/sysext/core/Classes/Html/RteHtmlParser.php
@@ -151,12 +151,12 @@ class RteHtmlParser extends \TYPO3\CMS\Core\Html\HtmlParser {
/**
* Evaluate the environment for editing a staticFileEdit file.
- * Called for almost all fields being saved in the database. Is called without an instance of the object: t3lib_parsehtml_proc::evalWriteFile()
+ * Called for almost all fields being saved in the database. Is called without
+ * an instance of \TYPO3\CMS\Core\Html\RteHtmlParser::evalWriteFile()
*
* @param array $pArr Parameters for the current field as found in types-config
* @param array $currentRecord Current record we are editing.
* @return mixed On success an array with various information is returned, otherwise a string with an error message
- * @see t3lib_TCEmain, t3lib_transferData
*/
static public function evalWriteFile($pArr, $currentRecord) {
// Write file configuration:
@@ -203,7 +203,6 @@ class RteHtmlParser extends \TYPO3\CMS\Core\Html\HtmlParser {
* @param string Direction of the transformation. Two keywords are allowed; "db" or "rte". If "db" it means the transformation will clean up content coming from the Rich Text Editor and goes into the database. The other direction, "rte", is of course when content is coming from database and must be transformed to fit the RTE.
* @param array Parsed TypoScript content configuring the RTE, probably coming from Page TSconfig.
* @return string Output value
- * @see t3lib_TCEmain::fillInFieldArray(), t3lib_transferData::renderRecord_typesProc()
* @todo Define visibility
*/
public function RTE_transform($value, $specConf, $direction = 'rte', $thisConfig = array()) {
diff --git a/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php b/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
index 6c7f0648f2c7..c7cea3315c8d 100644
--- a/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
+++ b/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
@@ -613,7 +613,7 @@ class GraphicalFunctions {
* @param integer $srcHeight Source height
* @return void
* @access private
- * @see t3lib_iconWorks::imagecopyresized()
+ * @see \TYPO3\CMS\Backend\Utility\IconUtility::imagecopyresized()
* @todo Define visibility
*/
public function imagecopyresized(&$dstImg, $srcImg, $dstX, $dstY, $srcX, $srcY, $dstWidth, $dstHeight, $srcWidth, $srcHeight) {
@@ -2011,7 +2011,7 @@ class GraphicalFunctions {
/**
* Checks if the $fontFile is already at an absolute path and if not, prepends the correct path.
* Use PATH_site unless we are in the backend.
- * Call it by t3lib_stdGraphic::prependAbsolutePath()
+ * Call it by \TYPO3\CMS\Core\Imaging\GraphicalFunctions::prependAbsolutePath()
*
* @param string $fontFile The font file
* @return string The font file with absolute path.
diff --git a/typo3/sysext/core/Classes/Localization/Locales.php b/typo3/sysext/core/Classes/Localization/Locales.php
index 3338a9d04944..943ade7b733c 100644
--- a/typo3/sysext/core/Classes/Localization/Locales.php
+++ b/typo3/sysext/core/Classes/Localization/Locales.php
@@ -31,10 +31,10 @@ namespace TYPO3\CMS\Core\Localization;
*
* Defining backend system languages
* When adding new keys, remember to:
- * - Add character encoding for lang. key in t3lib/class.t3lib_cs.php
+ * - Add character encoding for lang. key in \TYPO3\CMS\Core\Charset\CharsetConverter
* (default for new languages is "utf-8")
- * - Add mappings for language in t3lib/class.t3lib_cs.php (TYPO3/ISO,
- * language/script, script/charset)
+ * - Add mappings for language in \TYPO3\CMS\Core\Charset\CharsetConverter
+ * (TYPO3/ISO, language/script, script/charset)
* - Update 'setup' extension labels (sysext/setup/mod/locallang.xlf)
* That's it!
*
diff --git a/typo3/sysext/core/Classes/Locking/Locker.php b/typo3/sysext/core/Classes/Locking/Locker.php
index a5444e9cbc9d..f6a3dc280010 100644
--- a/typo3/sysext/core/Classes/Locking/Locker.php
+++ b/typo3/sysext/core/Classes/Locking/Locker.php
@@ -26,11 +26,7 @@ namespace TYPO3\CMS\Core\Locking;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
-/**
- * Class for providing locking features in TYPO3
- *
- * @author Michael Stucki <michael@typo3.org>
- */
+
/**
* TYPO3 locking class
* This class provides an abstract layer to various locking features for TYPO3
@@ -39,7 +35,6 @@ namespace TYPO3\CMS\Core\Locking;
* This is especially useful if two clients are requesting the same website short after each other. While the request of client 1 triggers building and caching of the website, client 2 will be waiting at this lock.
*
* @author Michael Stucki <michael@typo3.org>
- * @see class.t3lib_tstemplate.php, class.tslib_fe.php
*/
class Locker {
diff --git a/typo3/sysext/core/Classes/Mail/SwiftMailerAdapter.php b/typo3/sysext/core/Classes/Mail/SwiftMailerAdapter.php
index b48b37b28e49..88619feeee59 100644
--- a/typo3/sysext/core/Classes/Mail/SwiftMailerAdapter.php
+++ b/typo3/sysext/core/Classes/Mail/SwiftMailerAdapter.php
@@ -28,7 +28,7 @@ namespace TYPO3\CMS\Core\Mail;
***************************************************************/
/**
- * Hook subscriber for using Swift Mailer with the t3lib_utility_mail function
+ * Hook subscriber for using Swift Mailer with \TYPO3\CMS\Core\Utility\MailUtility
*
* @author Jigal van Hemert <jigal@xs4all.nl>
*/
diff --git a/typo3/sysext/core/Classes/Messaging/AbstractMessage.php b/typo3/sysext/core/Classes/Messaging/AbstractMessage.php
index 5934a51b9ef2..f65452e43b5e 100644
--- a/typo3/sysext/core/Classes/Messaging/AbstractMessage.php
+++ b/typo3/sysext/core/Classes/Messaging/AbstractMessage.php
@@ -102,7 +102,7 @@ abstract class AbstractMessage {
/**
* Gets the message' severity.
*
- * @return integer The message' severity, either of t3lib_message_AbstractMessage::INFO,
+ * @return integer The message' severity, must be one of AbstractMessage::INFO or similar contstants
*/
public function getSeverity() {
return $this->severity;
@@ -111,7 +111,7 @@ abstract class AbstractMessage {
/**
* Sets the message' severity
*
- * @param integer $severity The severity, must be either of t3lib_message_AbstractMessage::INFO,
+ * @param integer $severity The severity, must be one of AbstractMessage::INFO or similar constants
* @return void
*/
public function setSeverity($severity = self::OK) {
diff --git a/typo3/sysext/core/Classes/Messaging/AbstractStandaloneMessage.php b/typo3/sysext/core/Classes/Messaging/AbstractStandaloneMessage.php
index 027c1fdb2cdc..ff438d575981 100644
--- a/typo3/sysext/core/Classes/Messaging/AbstractStandaloneMessage.php
+++ b/typo3/sysext/core/Classes/Messaging/AbstractStandaloneMessage.php
@@ -60,7 +60,7 @@ abstract class AbstractStandaloneMessage extends \TYPO3\CMS\Core\Messaging\Abstr
*
* @param string $message Message
* @param string $title Title
- * @param integer $severity Severity, see class constants of t3lib_message_AbstractMessage
+ * @param integer $severity Severity, see class constants of AbstractMessage
*/
public function __construct($message = '', $title = '', $severity = \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR) {
if (!empty($message)) {
diff --git a/typo3/sysext/core/Classes/Messaging/ErrorpageMessage.php b/typo3/sysext/core/Classes/Messaging/ErrorpageMessage.php
index 8e1923961204..c71e02ae40ad 100644
--- a/typo3/sysext/core/Classes/Messaging/ErrorpageMessage.php
+++ b/typo3/sysext/core/Classes/Messaging/ErrorpageMessage.php
@@ -39,7 +39,7 @@ class ErrorpageMessage extends \TYPO3\CMS\Core\Messaging\AbstractStandaloneMessa
*
* @param string $message The error message
* @param string $title Title of the message, can be empty
- * @param integer $severity Optional severity, must be either of t3lib_message_AbstractMessage::INFO, t3lib_message_AbstractMessage::OK,
+ * @param integer $severity Optional severity, must be either of AbstractMessage::INFO or related constants
*/
public function __construct($message = '', $title = '', $severity = \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR) {
$this->setHtmlTemplate(TYPO3_mainDir . 'sysext/t3skin/templates/errorpage-message.html');
diff --git a/typo3/sysext/core/Classes/Messaging/FlashMessage.php b/typo3/sysext/core/Classes/Messaging/FlashMessage.php
index 3df3fbe99255..5d28faa18ad8 100644
--- a/typo3/sysext/core/Classes/Messaging/FlashMessage.php
+++ b/typo3/sysext/core/Classes/Messaging/FlashMessage.php
@@ -56,7 +56,7 @@ class FlashMessage extends \TYPO3\CMS\Core\Messaging\AbstractMessage {
*
* @param string $message The message.
* @param string $title Optional message title.
- * @param integer $severity Optional severity, must be either of t3lib_FlashMessage::INFO, t3lib_FlashMessage::OK,
+ * @param integer $severity Optional severity, must be either of one of \TYPO3\CMS\Core\Messaging\FlashMessage constants
* @param boolean $storeInSession Optional, defines whether the message should be stored in the session or only for one request (default)
* @return void
*/
diff --git a/typo3/sysext/core/Classes/Page/PageRenderer.php b/typo3/sysext/core/Classes/Page/PageRenderer.php
index e2ec040760a2..4cc6aa142f18 100644
--- a/typo3/sysext/core/Classes/Page/PageRenderer.php
+++ b/typo3/sysext/core/Classes/Page/PageRenderer.php
@@ -2626,9 +2626,9 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
}
/**
- * Returns instance of t3lib_Compressor
+ * Returns instance of \TYPO3\CMS\Core\Resource\ResourceCompressor
*
- * @return \TYPO3\CMS\Core\Resource\ResourceCompressor Instance of t3lib_Compressor
+ * @return \TYPO3\CMS\Core\Resource\ResourceCompressor
*/
protected function getCompressor() {
if ($this->compressor === NULL) {
diff --git a/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php b/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php
index f0a9931f0a0d..1f413616a278 100644
--- a/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php
+++ b/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php
@@ -253,7 +253,7 @@ class LocalDriver extends \TYPO3\CMS\Core\Resource\Driver\AbstractDriver {
* substituted by '_'
* Trailing dots are removed
*
- * previously in t3lib_basicFileFunctions::cleanFileName()
+ * Previously in \TYPO3\CMS\Core\Utility\File\BasicFileUtility::cleanFileName()
*
* @param string $fileName Input string, typically the body of a fileName
* @param string $charset Charset of the a fileName (defaults to current charset; depending on context)
diff --git a/typo3/sysext/core/Classes/Resource/ResourceFactory.php b/typo3/sysext/core/Classes/Resource/ResourceFactory.php
index de81336a8354..ccc4dd613ec5 100644
--- a/typo3/sysext/core/Classes/Resource/ResourceFactory.php
+++ b/typo3/sysext/core/Classes/Resource/ResourceFactory.php
@@ -326,7 +326,7 @@ class ResourceFactory implements \TYPO3\CMS\Core\SingletonInterface {
return $this->getObjectFromCombinedIdentifier($input);
} elseif ($prefix == 'EXT') {
$input = \TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName($input);
- $input = PathUtility::getRelativePath(PATH_site, PathUtility::dirname($input)) . PathUtility::basename($input);
+ $input = \TYPO3\CMS\Core\Utility\PathUtility::getRelativePath(PATH_site, dirname($input)) . basename($input);
return $this->getFileObjectFromCombinedIdentifier($input);
}
// this is a backwards-compatible way to access "0-storage" files or folders
diff --git a/typo3/sysext/core/Classes/Resource/ResourceStorage.php b/typo3/sysext/core/Classes/Resource/ResourceStorage.php
index 52f80fcb0f9e..721916fb5faf 100644
--- a/typo3/sysext/core/Classes/Resource/ResourceStorage.php
+++ b/typo3/sysext/core/Classes/Resource/ResourceStorage.php
@@ -60,9 +60,6 @@ use TYPO3\CMS\Core\Utility\PathUtility;
* Check 2: "File Mounts" of the User (act as subsets / filters to the identifiers) [is the user allowed to do something in this folder?]
* Check 3: "Capabilities" of Storage (then: of Driver) [is the storage/driver writable?]
* Check 4: "File permissions" of the Driver [is the folder writable?]
- */
-/**
- * File storage
*
* @author Andreas Wolf <andreas.wolf@typo3.org>
* @author Ingmar Schlecht <ingmar@typo3.org>
@@ -960,7 +957,7 @@ class ResourceStorage {
/**
* Creates a new file
*
- * previously in t3lib_extFileFunc::func_newfile()
+ * previously in \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility::func_newfile()
*
* @param string $fileName
* @param Folder $targetFolderObject
@@ -976,7 +973,7 @@ class ResourceStorage {
}
/**
- * Previously in t3lib_extFileFunc::deleteFile()
+ * Previously in \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility::deleteFile()
*
* @param $fileObject FileInterface
*
@@ -1004,7 +1001,7 @@ class ResourceStorage {
}
/**
- * Previously in t3lib_extFileFunc::func_copy()
+ * Previously in \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility::func_copy()
* copies a source file (from any location) in to the target
* folder, the latter has to be part of this storage
*
@@ -1130,7 +1127,7 @@ class ResourceStorage {
* Moves a $file into a $targetFolder
* the target folder has to be part of this storage
*
- * previously in t3lib_extFileFunc::func_move()
+ * previously in \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility::func_move()
*
* @param FileInterface $file
* @param Folder $targetFolder
@@ -1241,7 +1238,7 @@ class ResourceStorage {
}
/**
- * Previously in t3lib_extFileFunc::func_rename()
+ * Previously in \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility::func_rename()
*
* @param FileInterface $file
* @param string $targetFileName
@@ -1308,7 +1305,7 @@ class ResourceStorage {
}
/**
- * Adds an uploaded file into the Storage. Previously in t3lib_extFileFunc::file_upload()
+ * Adds an uploaded file into the Storage. Previously in \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility::file_upload()
*
* @param array $uploadedFileData contains information about the uploaded file given by $_FILES['file1']
* @param Folder $targetFolder the target folder
@@ -1458,7 +1455,7 @@ class ResourceStorage {
}
/**
- * Previously in t3lib_extFileFunc::folder_move()
+ * Previously in \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility::folder_move()
*
* @param Folder $folderObject
* @param string $newName
@@ -1500,7 +1497,7 @@ class ResourceStorage {
}
/**
- * Previously in t3lib_extFileFunc::folder_delete()
+ * Previously in \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility::folder_delete()
*
* @param Folder $folderObject
* @param bool $deleteRecursively
@@ -1586,7 +1583,7 @@ class ResourceStorage {
/**
* Creates a new folder.
*
- * previously in t3lib_extFileFunc::func_newfolder()
+ * previously in \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility::func_newfolder()
*
* @param string $folderName The new folder name
* @param Folder $parentFolder (optional) the parent folder to create the new folder inside of. If not given, the root folder is used
@@ -1898,7 +1895,7 @@ class ResourceStorage {
*
* @throws \RuntimeException
* @return string A unique fileName inside $folder, based on $theFile.
- * @see t3lib_basicFileFunc::getUniqueName()
+ * @see \TYPO3\CMS\Core\Utility\File\BasicFileUtility::getUniqueName()
*/
// TODO check if this should be moved back to Folder
protected function getUniqueName(Folder $folder, $theFile, $dontCheckForUnique = FALSE) {
diff --git a/typo3/sysext/core/Classes/Resource/Service/UserFileMountService.php b/typo3/sysext/core/Classes/Resource/Service/UserFileMountService.php
index 6838eefa3d15..e44733fc3898 100644
--- a/typo3/sysext/core/Classes/Resource/Service/UserFileMountService.php
+++ b/typo3/sysext/core/Classes/Resource/Service/UserFileMountService.php
@@ -26,11 +26,13 @@ namespace TYPO3\CMS\Core\Resource\Service;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
* Service class for implementing the user filemounts,
- * used for BE_USER (t3lib_beUserAuth) and TCEforms hooks
+ * used for BE_USER (\TYPO3\CMS\Core\Authentication\BackendUserAuthentication)
+ * and TCEforms hooks
*
- * Note: This is now also used by sys_file_category table (fieldname "folder")! (Ingmar Schlecht, 19 November 2011)
+ * Note: This is now also used by sys_file_category table (fieldname "folder")!
*
* @author Benjamin Mack <benni@typo3.org>
*/
@@ -42,7 +44,7 @@ class UserFileMountService {
* of a selected mount
*
* @param array $PA the array with additional configuration options.
- * @param t3lib_tceforms $tceformsObj the TCEforms parent object
+ * @param \TYPO3\CMS\Backend\Form\FormEngine $tceformsObj Parent object
* @return string The HTML code for the TCEform field
*/
public function renderTceformsSelectDropdown(&$PA, &$tceformsObj) {
diff --git a/typo3/sysext/core/Classes/TimeTracker/TimeTracker.php b/typo3/sysext/core/Classes/TimeTracker/TimeTracker.php
index bc0dec39ced3..29a9c21a0e9d 100644
--- a/typo3/sysext/core/Classes/TimeTracker/TimeTracker.php
+++ b/typo3/sysext/core/Classes/TimeTracker/TimeTracker.php
@@ -26,22 +26,13 @@ namespace TYPO3\CMS\Core\TimeTracker;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
-/**
- * Contains class with time tracking functions
- *
- * Revised for TYPO3 3.6 July/2003 by Kasper Skårhøj
- * XHTML compliant
- *
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- */
+
/**
* Frontend Timetracking functions
*
* Is used to register how much time is used with operations in TypoScript
- * Used by index_ts
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @see t3lib_tsfeBeUserAuth, tslib_fe, tslib_cObj, TSpagegen
*/
class TimeTracker {
@@ -280,7 +271,6 @@ class TimeTracker {
* Print TypoScript parsing log
*
* @return string HTML table with the information about parsing times.
- * @see t3lib_tsfeBeUserAuth::extGetCategory_tsdebug()
*/
public function printTSlog() {
// Calculate times and keys for the tsStackLog
diff --git a/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php b/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
index 2dc4cdd65f05..507f8124a94d 100644
--- a/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
+++ b/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
@@ -58,7 +58,7 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
/**
* @var integer
*/
- protected $lookupMode = \t3lib_tree_tca_DatabaseTreeDataProvider::MODE_CHILDREN;
+ protected $lookupMode = \TYPO3\CMS\Core\Tree\TableConfiguration\DatabaseTreeDataProvider::MODE_CHILDREN;
/**
* @var string
diff --git a/typo3/sysext/core/Classes/Tree/TableConfiguration/TreeDataProviderFactory.php b/typo3/sysext/core/Classes/Tree/TableConfiguration/TreeDataProviderFactory.php
index 0cb987261f2d..2985a4284550 100644
--- a/typo3/sysext/core/Classes/Tree/TableConfiguration/TreeDataProviderFactory.php
+++ b/typo3/sysext/core/Classes/Tree/TableConfiguration/TreeDataProviderFactory.php
@@ -27,7 +27,8 @@ namespace TYPO3\CMS\Core\Tree\TableConfiguration;
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
/**
- * Builds a t3lib_tree_Tca_DatabaseTreeDataProvider object based on some TCA configuration
+ * Builds a \TYPO3\CMS\Core\Tree\TableConfiguration\DatabaseTreeDataProvider
+ * object based on some TCA configuration
*
* @author Steffen Ritter <info@steffen-ritter.net>
*/
@@ -94,10 +95,10 @@ class TreeDataProviderFactory {
$dataProvider->setNonSelectableLevelList('');
}
if (isset($treeConfiguration['childrenField'])) {
- $dataProvider->setLookupMode(\t3lib_tree_tca_DatabaseTreeDataProvider::MODE_CHILDREN);
+ $dataProvider->setLookupMode(\TYPO3\CMS\Core\Tree\TableConfiguration\DatabaseTreeDataProvider::MODE_CHILDREN);
$dataProvider->setLookupField($treeConfiguration['childrenField']);
} elseif (isset($treeConfiguration['parentField'])) {
- $dataProvider->setLookupMode(\t3lib_tree_tca_DatabaseTreeDataProvider::MODE_PARENT);
+ $dataProvider->setLookupMode(\TYPO3\CMS\Core\Tree\TableConfiguration\DatabaseTreeDataProvider::MODE_PARENT);
$dataProvider->setLookupField($treeConfiguration['parentField']);
} else {
throw new \InvalidArgumentException('TCA Tree configuration is invalid: neither "childrenField" nor "parentField" is set', 1288215889);
diff --git a/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php b/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
index 08b97a2b628e..44e0b043a0a8 100644
--- a/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
+++ b/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
@@ -27,7 +27,7 @@ namespace TYPO3\CMS\Core\TypoScript;
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
/**
- * TSParser extension class to t3lib_TStemplate
+ * TSParser extension class to TemplateService
* Contains functions for the TS module in TYPO3 backend
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
diff --git a/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php b/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
index a7edc7ddb7c0..6b7a0722882d 100644
--- a/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
+++ b/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
@@ -26,18 +26,11 @@ namespace TYPO3\CMS\Core\TypoScript\Parser;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
-/**
- * Contains the TypoScript parser class
- *
- * Revised for TYPO3 3.6 July/2003 by Kasper Skårhøj
- *
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- */
+
/**
* The TypoScript parser
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @see t3lib_tstemplate, \TYPO3\CMS\Backend\Utility\BackendUtility::getPagesTSconfig(), t3lib_beUserAuth::fetchGroupData(), t3lib_TStemplate::generateConfig()
*/
class TypoScriptParser {
@@ -214,7 +207,7 @@ class TypoScriptParser {
*/
public $highLightBlockStyles_basecolor = '#cccccc';
- //Instance of parentObject, used by t3lib_tsparser_ext
+ //Instance of parentObject, used by \TYPO3\CMS\Core\TypoScript\ExtendedTemplateService
public $parentObject;
/**
@@ -695,7 +688,7 @@ class TypoScriptParser {
/**
* Checks the input string (un-parsed TypoScript) for include-commands ("<INCLUDE_TYPOSCRIPT: ....")
- * Use: t3lib_TSparser::checkIncludeLines()
+ * Use: \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser::checkIncludeLines()
*
* @param string $string Unparsed TypoScript
* @param integer $cycle_counter Counter for detecting endless loops
@@ -840,7 +833,8 @@ class TypoScriptParser {
$skipNextLineIfEmpty = FALSE;
$openingCommentedIncludeStatement = NULL;
foreach ($lines as $line) {
- // t3lib_TSparser::checkIncludeLines inserts an additional empty line, remove this again
+ // \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser::checkIncludeLines inserts
+ // an additional empty line, remove this again
if ($skipNextLineIfEmpty) {
if (trim($line) == '') {
continue;
@@ -898,7 +892,8 @@ class TypoScriptParser {
$fileName = NULL;
$inIncludePart = FALSE;
$openingCommentedIncludeStatement = NULL;
- // t3lib_TSparser::checkIncludeLines inserts an additional empty line, remove this again
+ // \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser::checkIncludeLines inserts
+ // an additional empty line, remove this again
$skipNextLineIfEmpty = TRUE;
} else {
// If this is not a ending commented include statement this line goes into the file content
diff --git a/typo3/sysext/core/Classes/TypoScript/TemplateService.php b/typo3/sysext/core/Classes/TypoScript/TemplateService.php
index 300278e99e88..56bb9dd6dcb8 100644
--- a/typo3/sysext/core/Classes/TypoScript/TemplateService.php
+++ b/typo3/sysext/core/Classes/TypoScript/TemplateService.php
@@ -37,7 +37,8 @@ namespace TYPO3\CMS\Core\TypoScript;
* Template object that is responsible for generating the TypoScript template based on template records.
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @see t3lib_tsparser, t3lib_matchcondition_abstract
+ * @see \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser
+ * @see \TYPO3\CMS\Core\Configuration\TypoScript\ConditionMatching\AbstractConditionMatcher
*/
class TemplateService {
@@ -851,7 +852,7 @@ class TemplateService {
* Depends on $this->config and $this->constants to be set prior to this! (done by processTemplate/runThroughTemplates)
*
* @return void
- * @see t3lib_TSparser, start()
+ * @see \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser, start()
* @todo Define visibility
*/
public function generateConfig() {
@@ -979,7 +980,7 @@ class TemplateService {
* if needed.
*
* @return void
- * @see t3lib_TSparser, generateConfig()
+ * @see \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser, generateConfig()
*/
public function processIncludes() {
$files = array();
@@ -1326,7 +1327,7 @@ class TemplateService {
/**
* Takes a TypoScript array as input and returns an array which contains all integer properties found which had a value (not only properties). The output array will be sorted numerically.
- * Call it like t3lib_TStemplate::sortedKeyList()
+ * Call it like \TYPO3\CMS\Core\TypoScript\TemplateService::sortedKeyList()
*
* @param array $setupArr TypoScript array with numerical array in
* @param boolean $acceptOnlyProperties If set, then a value is not required - the properties alone will be enough.
diff --git a/typo3/sysext/core/Classes/Utility/CommandUtility.php b/typo3/sysext/core/Classes/Utility/CommandUtility.php
index e35d5abcefce..7c7124def184 100644
--- a/typo3/sysext/core/Classes/Utility/CommandUtility.php
+++ b/typo3/sysext/core/Classes/Utility/CommandUtility.php
@@ -261,7 +261,7 @@ class CommandUtility {
}
/**
- * Extend the preset paths. This way an extension can install an executable and provide the path to t3lib_exec.
+ * Extend the preset paths. This way an extension can install an executable and provide the path to \TYPO3\CMS\Core\Utility\CommandUtility
*
* @param string $paths Comma separated list of extra paths where a command should be searched. Relative paths (without leading "/") are prepend with site root path (PATH_site).
* @return void
diff --git a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
index d1a090885d17..ca12dedb8ef9 100644
--- a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
+++ b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
@@ -753,7 +753,8 @@ class ExtensionManagementUtility {
}
/**
- * This method is called from t3lib_loadModules::checkMod and it replaces old conf.php.
+ * This method is called from \TYPO3\CMS\Backend\Module\ModuleLoader::checkMod
+ * and it replaces old conf.php.
*
* The original function for is called
* Tx_Extbase_Utility_Extension::configureModule, the refered function can
@@ -889,7 +890,7 @@ class ExtensionManagementUtility {
* @param string $MM_key Menu array key - default is "function
* @param string $WS Workspace conditions. Blank means all workspaces, any other string can be a comma list of "online", "offline" and "custom
* @return void
- * @see t3lib_SCbase::mergeExternalItems()
+ * @see \TYPO3\CMS\Backend\Module\BaseScriptClass::mergeExternalItems()
*/
static public function insertModuleFunction($modname, $className, $classPath, $title, $MM_key = 'function', $WS = '') {
$GLOBALS['TBE_MODULES_EXT'][$modname]['MOD_MENU'][$MM_key][$className] = array(
diff --git a/typo3/sysext/core/Classes/Utility/File/BasicFileUtility.php b/typo3/sysext/core/Classes/Utility/File/BasicFileUtility.php
index a11a3da592de..44ab443c0f43 100644
--- a/typo3/sysext/core/Classes/Utility/File/BasicFileUtility.php
+++ b/typo3/sysext/core/Classes/Utility/File/BasicFileUtility.php
@@ -26,18 +26,15 @@ namespace TYPO3\CMS\Core\Utility\File;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
* Contains class with basic file management functions
*
- * Revised for TYPO3 3.6 July/2003 by Kasper Skårhøj
- *
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- */
-/**
- * Contains functions for management, validation etc of files in TYPO3, using the concepts of web- and ftp-space. Please see the comment for the init() function
+ * Contains functions for management, validation etc of files in TYPO3,
+ * using the concepts of web- and ftp-space. Please see the comment for the
+ * init() function
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @see t3lib_basicFileFunctions::init()
*/
class BasicFileUtility {
@@ -130,7 +127,7 @@ class BasicFileUtility {
* @param array Contains the paths of the file mounts for the current BE user. Normally $GLOBALS['FILEMOUNTS'] is passed. This variable is set during backend user initialization; $FILEMOUNTS = $GLOBALS['BE_USER']->returnFilemounts(); (see typo3/init.php)
* @param array Array with information about allowed and denied file extensions. Typically passed: $GLOBALS['TYPO3_CONF_VARS']['BE']['fileExtensions']
* @return void
- * @see typo3/init.php, t3lib_beUserAuth::returnFilemounts()
+ * @see typo3/init.php, \TYPO3\CMS\Core\Authentication\BackendUserAuthentication::returnFilemounts()
* @todo Define visibility
*/
public function init($mounts, $f_ext) {
@@ -318,7 +315,7 @@ class BasicFileUtility {
* @param string The directory for which to return a unique filename for $theFile. $theDest MUST be a valid directory. Should be absolute.
* @param boolean If set the filename is returned with the path prepended without checking whether it already existed!
* @return string The destination absolute filepath (not just the name!) of a unique filename/foldername in that path.
- * @see t3lib_TCEmain::checkValue()
+ * @see \TYPO3\CMS\Core\DataHandling\DataHandler::checkValue()
* @todo Define visibility
*/
public function getUniqueName($theFile, $theDest, $dontCheckForUnique = 0) {
diff --git a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
index bad7d79f2462..ab2fb8e1593b 100644
--- a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
+++ b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
@@ -367,7 +367,6 @@ class ExtendedFileUtility extends \TYPO3\CMS\Core\Utility\File\BasicFileUtility
* @param string $details This is the default, raw error message in english
* @param array $data Array with special information that may go into $details by "%s" marks / sprintf() when the log is shown
* @return void
- * @see class.t3lib_beuserauth.php
* @todo Define visibility
*/
public function writeLog($action, $error, $details_nr, $details, $data) {
diff --git a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtilityProcessDataHookInterface.php b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtilityProcessDataHookInterface.php
index 3910ba388e62..4b569b5c6138 100644
--- a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtilityProcessDataHookInterface.php
+++ b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtilityProcessDataHookInterface.php
@@ -38,11 +38,11 @@ interface ExtendedFileUtilityProcessDataHookInterface {
* @param string $action The action
* @param array $cmdArr The parameter sent to the action handler
* @param array $result The results of all calls to the action handler
- * @param \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility $parentObject Parent t3lib_extFileFunctions object
+ * @param \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility $parentObject Parent object
* @return void
*/
public function processData_postProcessAction($action, array $cmdArr, array $result, \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility $parentObject);
}
-?>
\ No newline at end of file
+?>
diff --git a/typo3/sysext/core/Classes/Utility/GeneralUtility.php b/typo3/sysext/core/Classes/Utility/GeneralUtility.php
index 2974e5042702..44c38279e046 100644
--- a/typo3/sysext/core/Classes/Utility/GeneralUtility.php
+++ b/typo3/sysext/core/Classes/Utility/GeneralUtility.php
@@ -52,7 +52,7 @@ class GeneralUtility {
* Singleton instances returned by makeInstance, using the class names as
* array keys
*
- * @var array<t3lib_Singleton>
+ * @var array<\TYPO3\CMS\Core\SingletonInterface>
*/
static protected $singletonInstances = array();
@@ -4224,7 +4224,7 @@ Connection: close
* Warning: This is a helper method for unit tests. Do not call this directly in production code!
*
* @see makeInstance
- * @throws \InvalidArgumentException if class extends t3lib_Singleton
+ * @throws \InvalidArgumentException if class extends \TYPO3\CMS\Core\SingletonInterface
* @param string $className
* @param object $instance
* @return void
@@ -4776,7 +4776,7 @@ Connection: close
if (stripos($log, 'file') !== FALSE) {
// In case lock is acquired before autoloader was defined:
if (class_exists('TYPO3\\CMS\\Core\\Locking\\Locker') === FALSE) {
- require_once PATH_t3lib . 'class.t3lib_lock.php';
+ require_once ExtensionManagementUtility::extPath('core') . 'Classes/Locking/Locker.php';
}
// Write a longer message to the deprecation log
$destination = self::getDeprecationLogFileName();
diff --git a/typo3/sysext/core/Configuration/DefaultConfiguration.php b/typo3/sysext/core/Configuration/DefaultConfiguration.php
index b40c0660682e..c6703c111c80 100644
--- a/typo3/sysext/core/Configuration/DefaultConfiguration.php
+++ b/typo3/sysext/core/Configuration/DefaultConfiguration.php
@@ -44,7 +44,7 @@ return array(
'im_negate_mask' => FALSE, // Boolean: Indicates if the mask images should be inverted first. This depends of the ImageMagick version. Below ver. 5.1 this should be FALSE. Above ImageMagick version 5.2+ it should be TRUE. Just set the flag if the masks works opposite the intension!
'im_imvMaskState' => FALSE, // Boolean: If set, the 'im_negate_mask' state is inverted. This is very useful with newer versions of IM5 (at least 5.4.3+) where the 'im_version_5' setting will set 'im_negate_mask' which will eventually be wrong... Halleluja for ImageMagick - have I ever regreted using that package...
'im_no_effects' => FALSE, // Boolean: This is necessary if using ImageMagick 5+. Effects in Imagemagick 5+ tends to render very slowly! Therefore this must be disabled in order not to perform sharpen, blurring and such. (However lately IM5 is allowed for effects again, but syntax has changed!)
- 'im_v5effects' => 0, // <p>Integer (-1, 0, 1)</p><dl><dt>0</dt><dd>disabled</dd><dt>-1</dt><dd>Do not sharpen images by default</dd><dt>1</dt><dd>All; blur and sharpening is allowed in ImageMagick again and the 'im_no_effects' flag is cancelled.</dd></dl><p>Blurring and sharpening has new syntaxes though. See class.t3lib_stdgraphic.php for details.</p>
+ 'im_v5effects' => 0, // <p>Integer (-1, 0, 1)</p><dl><dt>0</dt><dd>disabled</dd><dt>-1</dt><dd>Do not sharpen images by default</dd><dt>1</dt><dd>All; blur and sharpening is allowed in ImageMagick again and the 'im_no_effects' flag is cancelled.</dd></dl><p>Blurring and sharpening has new syntaxes though. See \TYPO3\CMS\Core\Imaging\GraphicalFunctions for details.</p>
'im_mask_temp_ext_gif' => FALSE, // Boolean: This should be set if ImageMagick is version 5+. This is used in class.tslib_content.php for masking images and the extension png is normally used because it's faster than gif for temporary files. But png seems not to work with some IM 5+ versions, so...
'im_mask_temp_ext_noloss' => 'miff', // String: Loss-less ImageMagick extension to use for mask processing in temporary filenames. Normally 'miff' (ImageMagick's OWN format) will do fine. However at least IM 5.4.9 has proved not to be able to write to its own file format which forced me to add this option. You can try and set this to tif/png/jpg if some masking doesn't work the way it should.
'im_noScaleUp' => FALSE, // Boolean: If set, images are not being scaled up if told so (in t3lib/stdgraphics.php)
@@ -179,11 +179,11 @@ return array(
),
'defaultCategorizedTables' => 'pages,tt_content', // List of comma separated tables that are categorizable by default.
'displayErrors' => -1, // <p>Integer (-1, 0, 1, 2). Configures whether PHP errors should be displayed.</p><dl><dt>0</dt><dd>Do not display any PHP error messages. Overrides the value of "exceptionalErrors" and sets it to 0 (= no errors are turned into exceptions), the configured "productionExceptionHandler" is used as exception handler</dd><dt>1</dt><dd>Display error messages with the registered errorhandler. The configured "debugExceptionHandler" is used as exception handler</dd><dt>2</dt><dd>Display errors only if client matches <a href="#SYS-devIPmask">[SYS][devIPmask]</a>. If devIPmask matches the users IP address the configured "debugExceptionHandler" is used for exceptions, if not "productionExceptionHandler" will be used</dd><dt>-1</dt><dd>Default setting. With this option, you can override the PHP setting "display_errors". If devIPmask matches the users IP address the configured "debugExceptionHandler" is used for exceptions, if not "productionExceptionHandler" will be used.</dd></dl>
- 'productionExceptionHandler' => 'TYPO3\\CMS\\Core\\Error\\ProductionExceptionHandler', // String: Classname to handle exceptions that might happen in the TYPO3-code. Leave empty to disable exception handling. Default: "t3lib_error_ProductionExceptionHandler". This exception handler displays a nice error message when something went wrong. The error message is logged to the configured logs. Note: The configured "productionExceptionHandler" is used if displayErrors is set to "0" or to "-1" and devIPmask doesn't match the users IP.
- 'debugExceptionHandler' => 'TYPO3\\CMS\\Core\\Error\\DebugExceptionHandler', // String: Classname to handle exceptions that might happen in the TYPO3-code. Leave empty to disable exception handling. Default: "t3lib_error_DebugExceptionHandler". This exception handler displays the complete stack trace of any encountered exception. The error message and the stack trace is logged to the configured logs. Note: The configured "debugExceptionHandler" is used if displayErrors is set to "1" and if displayErrors is "-1" or "2" and the devIPmask matches the users IP.
+ 'productionExceptionHandler' => 'TYPO3\\CMS\\Core\\Error\\ProductionExceptionHandler', // String: Classname to handle exceptions that might happen in the TYPO3-code. Leave empty to disable exception handling. Default: "TYPO3\\CMS\\Core\\Error\\ProductionExceptionHandler". This exception handler displays a nice error message when something went wrong. The error message is logged to the configured logs. Note: The configured "productionExceptionHandler" is used if displayErrors is set to "0" or to "-1" and devIPmask doesn't match the users IP.
+ 'debugExceptionHandler' => 'TYPO3\\CMS\\Core\\Error\\DebugExceptionHandler', // String: Classname to handle exceptions that might happen in the TYPO3-code. Leave empty to disable exception handling. Default: "TYPO3\\CMS\\Core\\Error\\DebugExceptionHandler". This exception handler displays the complete stack trace of any encountered exception. The error message and the stack trace is logged to the configured logs. Note: The configured "debugExceptionHandler" is used if displayErrors is set to "1" and if displayErrors is "-1" or "2" and the devIPmask matches the users IP.
'errorHandler' => 'TYPO3\\CMS\\Core\\Error\\ErrorHandler', // String: Classname to handle PHP errors. E.g.: t3lib_error_ErrorHandler. This class displays and logs all errors that are registered as "errorHandlerErrors" (<a href="#SYS-errorHandlerErrors">[SYS][errorHandlerErrors]</a>). Leave empty to disable error handling. Errors can be logged to syslog (see: <a href="#SYS-systemLog">[SYS][systemLog]</a>) to the installed developer log and to the "syslog" table. If an error is registered in "exceptionalErrors" ([SYS][exceptionalErrors]) it will be turned into an exception to be handled by the configured exceptionHandler.
'errorHandlerErrors' => E_ALL & ~(E_STRICT | E_NOTICE | E_COMPILE_WARNING | E_COMPILE_ERROR | E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR), // Integer: The E_* constant that will be handled by the errorhandler. Not all PHP error types can be handled! Default is <tt>E_ALL & ~(E_STRICT | E_NOTICE | E_COMPILE_WARNING | E_COMPILE_ERROR | E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR)</tt>.
- 'exceptionalErrors' => E_ALL & ~(E_STRICT | E_NOTICE | E_COMPILE_WARNING | E_COMPILE_ERROR | E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR | E_DEPRECATED | E_WARNING | E_USER_ERROR | E_USER_NOTICE | E_USER_WARNING), // Integer: The E_* constant that will be handled as an exception by t3lib_error_ErrorHandler. Default is <tt>E_ALL & ~(E_STRICT | E_NOTICE | E_COMPILE_WARNING | E_COMPILE_ERROR | E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR | E_DEPRECATED | E_WARNING | E_USER_ERROR | E_USER_NOTICE | E_USER_WARNING)</tt> (see <a href="http://php.net/manual/en/errorfunc.constants.php" target="_blank">PHP documentation</a>).
+ 'exceptionalErrors' => E_ALL & ~(E_STRICT | E_NOTICE | E_COMPILE_WARNING | E_COMPILE_ERROR | E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR | E_DEPRECATED | E_WARNING | E_USER_ERROR | E_USER_NOTICE | E_USER_WARNING), // Integer: The E_* constant that will be handled as an exception by TYPO3\\CMS\\Core\\Error\\ErrorHandler. Default is <tt>E_ALL & ~(E_STRICT | E_NOTICE | E_COMPILE_WARNING | E_COMPILE_ERROR | E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR | E_DEPRECATED | E_WARNING | E_USER_ERROR | E_USER_NOTICE | E_USER_WARNING)</tt> (see <a href="http://php.net/manual/en/errorfunc.constants.php" target="_blank">PHP documentation</a>).
'enable_errorDLOG' => 0, // Boolean: If set, errors are written to the developer log (requires an installed *devlog* extension).
'enable_exceptionDLOG' => 0,// Boolean: If set, exceptions are written to the developer log (requires an installed *devlog* extension).
'syslogErrorReporting' => E_ALL & ~(E_STRICT | E_NOTICE), // Integer: Configures which PHP errors should be logged to the configured syslogs (see: [SYS][systemLog]). If set to "0" no PHP errors are logged to the syslog. Default is "E_ALL & ~(E_STRICT | E_NOTICE)" (22519).
@@ -561,7 +561,7 @@ return array(
'flexformForceCDATA' => 0, // Boolean: If set, will add CDATA to Flexform XML. Some versions of libxml have a bug that causes HTML entities to be stripped from any XML content and this setting will avoid the bug by adding CDATA.
'explicitConfirmationOfTranslation' => FALSE, // If set, then the diff-data of localized records is not saved automatically when updated but requires that a translator clicks the special finish_translation/save/close button that becomes available.
'versionNumberInFilename' => FALSE, // <p>Boolean: If TRUE, included CSS and JS files will have the timestamp embedded in the filename, ie. filename.1269312081.js. This will make browsers and proxies reload the files if they change (thus avoiding caching issues). IMPORTANT: this feature requires extra .htaccess rules to work (please refer to _.htaccess or the _.htaccess file from the dummy package)</p><p>If FALSE the filemtime will be appended as a query-string.</p>
- 'spriteIconGenerator_handler' => 'TYPO3\\CMS\\Backend\\Sprite\\SimpleSpriteHandler', // String: Used to register own/other spriteGenerating Handler, they have to implement the interface t3lib_spritemanager_SpriteIconGenerator. If set to "t3lib_spritemanager_SpriteBuildingHandler" icons from extensions will automatically merged into sprites.
+ 'spriteIconGenerator_handler' => 'TYPO3\\CMS\\Backend\\Sprite\\SimpleSpriteHandler', // String: Used to register own/other spriteGenerating Handler, they have to implement the interface \TYPO3\CMS\Backend\Sprite\SpriteIconGeneratorInterface. If set to "\TYPO3\CMS\Backend\Sprite\SpriteBuildingHandler" icons from extensions will automatically merged into sprites.
'debug' => FALSE, // Boolean: If set, the loginrefresh is disabled and pageRenderer is set to debug mode. Use this to debug the backend only!
'AJAX' => array( // array of key-value pairs for a unified use of AJAX calls in the TYPO3 backend. Keys are the unique ajaxIDs where the value will be resolved to call a method in an object. See ajax.php and the classes/class.typo3ajax.php for more information.
'SC_alt_db_navframe::expandCollapse' => 'TYPO3\\CMS\\Backend\\Controller\\PageTreeNavigationController->ajaxExpandCollapse',
@@ -596,7 +596,7 @@ return array(
'tidy_option' => 'cached', // options [all, cached, output]. "all" = the content is always passed through "tidy" before it may be stored in cache. "cached" = only if the page is put into the cache, "output" = only the output code just before it's echoed out.
'tidy_path' => 'tidy -i --quiet true --tidy-mark true -wrap 0 -raw', // Path with options for tidy. For XHTML output, add " --output-xhtml true"
'logfile_dir' => '', // Path where TYPO3 should write webserver-style logfiles to. This path must be write-enabled for the webserver. If this path is outside of PATH_site, you have to allow it using <a href="#BE-lockRootPath">[BE][lockRootPath]</a>
- 'addAllowedPaths' => '', // Additional relative paths (comma-list) to allow TypoScript resources be in. Should be prepended with '/'. If not, then any path where the first part is like this path will match. That is: 'myfolder/ , myarchive' will match eg. 'myfolder/', 'myarchive/', 'myarchive_one/', 'myarchive_2/' ... No check is done to see if this directory actually exists in the root of the site. Paths are matched by simply checking if these strings equals the first part of any TypoScript resource filepath. (See class template, function init() in t3lib/class.t3lib_tsparser.php)
+ 'addAllowedPaths' => '', // Additional relative paths (comma-list) to allow TypoScript resources be in. Should be prepended with '/'. If not, then any path where the first part is like this path will match. That is: 'myfolder/ , myarchive' will match eg. 'myfolder/', 'myarchive/', 'myarchive_one/', 'myarchive_2/' ... No check is done to see if this directory actually exists in the root of the site. Paths are matched by simply checking if these strings equals the first part of any TypoScript resource filepath. (See class template, function init() in \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser)
'allowedTempPaths' => '', // Additional paths allowed for temporary images. Used with imgResource. Eg. 'alttypo3temp/,another_temp_dir/';
'debug' => FALSE, // Boolean: If set, some debug HTML-comments may be output somewhere. Can also be set by TypoScript.
'noPHPscriptInclude' => FALSE, // Boolean: If set, PHP-scripts are not included by TypoScript configurations, unless they reside in the folders typo3/ext/, typo3/sysext/ or typo3conf/ext. This is a security option to ensure that users with template-access do not terrorize
@@ -646,7 +646,7 @@ return array(
'versionNumberInFilename' => 'querystring', // String: embed,querystring,''. Allows to automatically include a version number (timestamp of the file) to referred CSS and JS filenames on the rendered page. This will make browsers and proxies reload the files if they change (thus avoiding caching issues). Set to 'embed' will have the timestamp embedded in the filename, ie. filename.1269312081.js. IMPORTANT: 'embed' requires extra .htaccess rules to work (please refer to _.htaccess or the _.htaccess file from the dummy package)<p>Set to 'querystring' (default setting) to append the version number as a query parameter (doesn't require mod_rewrite). Set to '' will turn this functionality off (behaves like TYPO3 < v4.4).</p>
'XCLASS' => array(), // See 'Inside TYPO3' document for more information.
),
- 'MAIL' => array( // Mail configurations to tune how t3lib_mail classes will send their mails.
+ 'MAIL' => array( // Mail configurations to tune how \TYPO3\CMS\Core\Mail\ classes will send their mails.
'transport' => 'mail', // <p>String:</p><dl><dt>mail</dt><dd>Sends messages by delegating to PHP's internal mail() function. No further settings required. This is the most unreliable option. If you are serious about sending mails, consider using "smtp" or "sendmail".</dd><dt>smtp</dt><dd>Sends messages over the (standardized) Simple Message Transfer Protocol. It can deal with encryption and authentication. Most flexible option, requires a mail server and configurations in transport_smtp_* settings below. Works the same on Windows, Unix and MacOS.</dd><dt>sendmail</dt><dd>Sends messages by communicating with a locally installed MTA - such as sendmail. See setting transport_sendmail_command bellow.<dd><dt>mbox</dt><dd>This doesn't send any mail out, but instead will write every outgoing mail to a file adhering to the RFC 4155 mbox format, which is a simple text file where the mails are concatenated. Useful for debugging the mail sending process and on development machines which cannot send mails to the outside. Configure the file to write to in the 'transport_mbox_file' setting below</dd><dt><classname></dt><dd>Custom class which implements Swift_Transport. The constructor receives all settings from the MAIL section to make it possible to add custom settings.</dd></dl>
'transport_smtp_server' => 'localhost:25', // String: <em>only with transport=smtp</em>: <server:port> of mailserver to connect to. <port> defaults to "25".
'transport_smtp_encrypt' => '', // String: <em>only with transport=smtp</em>: Connect to the server using the specified transport protocol. Requires openssl library. Usually available: <em>ssl, sslv2, sslv3, tls</em>. Check <a href="http://www.php.net/stream_get_transports" target="_blank">stream_get_transports()</a>.
@@ -719,7 +719,7 @@ return array(
),
't3lib/class.t3lib_tsfebeuserauth.php' => array(
'frontendEditingController' => array(
- 'default' => 't3lib/class.t3lib_frontendedit.php:t3lib_frontendedit'
+ 'default' => 'typo3/sysext/core/Classes/FrontendEditing/FrontendEditingController.php:t3lib_frontendedit'
)
)
),
diff --git a/typo3/sysext/core/Migrations/Code/LegacyClassesForIde.php b/typo3/sysext/core/Migrations/Code/LegacyClassesForIde.php
index a817e6c10720..a4a2eba7195b 100644
--- a/typo3/sysext/core/Migrations/Code/LegacyClassesForIde.php
+++ b/typo3/sysext/core/Migrations/Code/LegacyClassesForIde.php
@@ -1476,11 +1476,6 @@ class tx_dbal_module1 extends \TYPO3\CMS\Dbal\Controller\ModuleController {}
*/
class tx_dbal_tsparserext extends \TYPO3\CMS\Dbal\ExtensionManager\MessageDisplay {}
-/**
- * @deprecated since 6.0 will be removed in 7.0
- */
-class tx_dbal_em extends \TYPO3\CMS\Dbal\Hooks\ExtensionManagerHooks {}
-
/**
* @deprecated since 6.0 will be removed in 7.0
*/
diff --git a/typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php b/typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php
index 4cd6b4bdbbe0..c86262c53517 100644
--- a/typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php
+++ b/typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php
@@ -144,7 +144,7 @@ class AbstractUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
* @dataProvider processLoginDataProvider
*/
public function processLoginReturnsCorrectData($loginType, $passwordSubmissionStrategy, $passwordCompareStrategy, $originalData, $processedData) {
- /** @var $mock t3lib_userauth */
+ /** @var $mock \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication */
$mock = $this->getMock('TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication', array('_dummy'));
$mock->security_level = $passwordCompareStrategy;
$mock->loginType = $loginType;
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php
index 5a82a47d67da..23777d16d1b4 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php
@@ -50,7 +50,7 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
/**
* @test
- * @expectedException \t3lib_cache_Exception
+ * @expectedException \TYPO3\CMS\Core\Cache\Exception
*/
public function setCacheDirectoryThrowsExceptionOnNonWritableDirectory() {
$mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
@@ -79,7 +79,7 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
* @test
*/
public function aDedicatedCacheDirectoryIsUsedForCodeCaches() {
- $mockCache = $this->getMock('t3lib_cache_frontend_PhpFrontend', array(), array(), '', FALSE);
+ $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\PhpFrontend', array(), array(), '', FALSE);
$mockCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('SomeCache'));
$backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('dummy'), array(), '', FALSE);
@@ -91,7 +91,7 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
/**
* @test
- * @expectedException t3lib_cache_exception_InvalidData
+ * @expectedException \TYPO3\CMS\Core\Cache\Exception\InvalidDataException
*/
public function setThrowsExceptionIfDataIsNotAString() {
$mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/RedisBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/RedisBackendTest.php
index 4d880511db53..6b14a7616b5f 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/RedisBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/RedisBackendTest.php
@@ -163,7 +163,7 @@ class RedisBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
/**
* @test Functional
- * @expectedException t3lib_cache_Exception_InvalidData
+ * @expectedException \TYPO3\CMS\Core\Cache\Exception\InvalidDataException
*/
public function setThrowsExceptionIfDataIsNotAString() {
$this->setUpBackend();
diff --git a/typo3/sysext/core/Tests/Unit/Core/ClassLoaderTest.php b/typo3/sysext/core/Tests/Unit/Core/ClassLoaderTest.php
index 5754a1265c81..085142092a9a 100644
--- a/typo3/sysext/core/Tests/Unit/Core/ClassLoaderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Core/ClassLoaderTest.php
@@ -42,7 +42,7 @@ class ClassLoaderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
protected $fakedExtensions = array();
/**
- * Fix a race condition that t3lib_div is not available
+ * Fix a race condition that GeneralUtility is not available
* during tearDown if fiddling with the autoloader where
* backupGlobals is not set up again yet
*/
@@ -106,8 +106,6 @@ class ClassLoaderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
*/
public function unregisterAutoloaderSetsCacheEntryWithT3libNoTags() {
$mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'), array(), '', FALSE);
- // Expect the mock cache set method to be called
- // once with t3lib_autoloader as third parameter
$mockCache->expects($this->once())->method('set')->with($this->anything(), $this->anything(), array());
$GLOBALS['typo3CacheManager'] = $this->getMock('TYPO3\\CMS\\Core\\Cache\\CacheManager', array('getCache'));
$GLOBALS['typo3CacheManager']->expects($this->any())->method('getCache')->will($this->returnValue($mockCache));
diff --git a/typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php b/typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php
index a79efd4b2ea4..c25deeecd1a5 100644
--- a/typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php
+++ b/typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php
@@ -190,12 +190,12 @@ class DataHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
///////////////////////////////////////////
// Tests concerning checkModifyAccessList
///////////////////////////////////////////
+ //
/**
* Tests whether a wrong interface on the 'checkModifyAccessList' hook throws an exception.
*
* @test
* @expectedException UnexpectedValueException
- * @see t3lib_TCEmain::checkModifyAccessList()
*/
public function doesCheckModifyAccessListThrowExceptionOnWrongHookInterface() {
$hookClass = uniqid('tx_coretest');
@@ -208,7 +208,6 @@ class DataHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
* Tests whether the 'checkModifyAccessList' hook is called correctly.
*
* @test
- * @see t3lib_TCEmain::checkModifyAccessList()
*/
public function doesCheckModifyAccessListHookGetsCalled() {
$hookClass = uniqid('tx_coretest');
@@ -223,7 +222,6 @@ class DataHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
* Tests whether the 'checkModifyAccessList' hook modifies the $accessAllowed variable.
*
* @test
- * @see t3lib_TCEmain::checkModifyAccessList()
*/
public function doesCheckModifyAccessListHookModifyAccessAllowed() {
$hookClass = uniqid('tx_coretest');
diff --git a/typo3/sysext/core/Tests/Unit/Database/PreparedStatementTest.php b/typo3/sysext/core/Tests/Unit/Database/PreparedStatementTest.php
index 6e6244abff9c..8141e5b1bba8 100644
--- a/typo3/sysext/core/Tests/Unit/Database/PreparedStatementTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/PreparedStatementTest.php
@@ -25,9 +25,9 @@ namespace TYPO3\CMS\Core\Tests\Unit\Database;
***************************************************************/
/**
- * Testcase for the prepared statement database class
+ * Testcase
*
- * @author Helmut Hummel <helmut@typo3.org>
+ * @author Helmut Hummel <helmut@typo3.org>
*/
class PreparedStatementTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
@@ -39,9 +39,7 @@ class PreparedStatementTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
protected $backupGlobalsArray = array();
/**
- * Mock object of t3lib_db
- *
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Database\DatabaseConnection
*/
private $databaseStub;
@@ -93,20 +91,16 @@ class PreparedStatementTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
////////////////////////////////////
// Tests for the utility functions
////////////////////////////////////
+
/**
- * Checks if setUpAndReturnDatabaseStub() really returns
- * a mock of t3lib_DB.
- *
* @test
* @return void
*/
- public function setUpAndReturnDatabaseStubReturnsMockObjectOf_t3lib_DB() {
+ public function setUpAndReturnDatabaseStubReturnsMockObjectOfDatabaseConnection() {
$this->assertTrue($this->setUpAndReturnDatabaseStub() instanceof \TYPO3\CMS\Core\Database\DatabaseConnection);
}
/**
- * Checks if createPreparedStatement() really returns an instance of t3lib_db_PreparedStatement.
- *
* @test
* @return void
*/
@@ -115,7 +109,7 @@ class PreparedStatementTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
}
///////////////////////////////////////
- // Tests for t3lib_db_PreparedStatement
+ // Tests for \TYPO3\CMS\Core\Database\PreparedStatement
///////////////////////////////////////
/**
* Data Provider for two tests, providing sample queries, parameters and expected result queries.
diff --git a/typo3/sysext/core/Tests/Unit/FormProtection/AbstractFormProtectionTest.php b/typo3/sysext/core/Tests/Unit/FormProtection/AbstractFormProtectionTest.php
index 6bea919fd37a..b013cf40fe8d 100644
--- a/typo3/sysext/core/Tests/Unit/FormProtection/AbstractFormProtectionTest.php
+++ b/typo3/sysext/core/Tests/Unit/FormProtection/AbstractFormProtectionTest.php
@@ -27,7 +27,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\FormProtection;
require_once 'Fixtures/FormProtectionTesting.php';
/**
- * Testcase for the t3lib_formprotection_Abstract class.
+ * Testcase
*
* @author Oliver Klee <typo3-coding@oliverklee.de>
*/
@@ -54,7 +54,7 @@ class AbstractFormProtectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
* @test
*/
public function constructionRetrievesToken() {
- $className = uniqid('t3lib_formProtection');
+ $className = uniqid('FormProtection');
eval('class ' . $className . ' extends \TYPO3\CMS\Core\Tests\Unit\FormProtection\Fixtures\FormProtectionTesting {' . 'public $tokenHasBeenRetrieved = FALSE; ' . 'protected function retrieveSessionToken() {' . '$this->tokenHasBeenRetrieved = TRUE;' . '}' . '}');
$fixture = new $className();
$this->assertTrue($fixture->tokenHasBeenRetrieved);
diff --git a/typo3/sysext/core/Tests/Unit/FormProtection/BackendFormProtectionTest.php b/typo3/sysext/core/Tests/Unit/FormProtection/BackendFormProtectionTest.php
index 4a961dee50e1..878d812efcbe 100644
--- a/typo3/sysext/core/Tests/Unit/FormProtection/BackendFormProtectionTest.php
+++ b/typo3/sysext/core/Tests/Unit/FormProtection/BackendFormProtectionTest.php
@@ -46,7 +46,7 @@ class BackendFormProtectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
*/
public function setUp() {
$GLOBALS['BE_USER'] = $this->getMock(
- 't3lib_beUserAuth',
+ 'TYPO3\\CMS\\Core\\Authentication\\BackendUserAuthentication',
array('getSessionData', 'setAndSaveSessionData')
);
$GLOBALS['BE_USER']->user['uid'] = 1;
diff --git a/typo3/sysext/core/Tests/Unit/FormProtection/FormProtectionFactoryTest.php b/typo3/sysext/core/Tests/Unit/FormProtection/FormProtectionFactoryTest.php
index e35cc0bef957..b3a9f24965c6 100644
--- a/typo3/sysext/core/Tests/Unit/FormProtection/FormProtectionFactoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/FormProtection/FormProtectionFactoryTest.php
@@ -27,7 +27,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\FormProtection;
require_once 'Fixtures/FormProtectionTesting.php';
/**
- * Testcase for the t3lib_formprotection_Factory class.
+ * Testcase
*
* @author Oliver Klee <typo3-coding@oliverklee.de>
* @author Ernesto Baschny <ernst@cron-it.de>
diff --git a/typo3/sysext/core/Tests/Unit/Locking/LockerTest.php b/typo3/sysext/core/Tests/Unit/Locking/LockerTest.php
index 02c1f845f580..fbdfbc7a9159 100644
--- a/typo3/sysext/core/Tests/Unit/Locking/LockerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Locking/LockerTest.php
@@ -244,7 +244,7 @@ class LockerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
if (!is_file($file)) {
$this->markTestSkipped('releaseDoesNotRemoveFilesNotWithinTypo3TempLocksDirectory() skipped: Test file could not be created');
}
- // Create t3lib_lock instance, set lockfile to invalid path
+ // Create instance, set lockfile to invalid path
$instance = new \TYPO3\CMS\Core\Locking\Locker(999999999, $lockMethod);
$instance->setEnableLogging(FALSE);
$t3libLockReflection = new \ReflectionClass('TYPO3\\CMS\\Core\\Locking\\Locker');
diff --git a/typo3/sysext/core/Tests/Unit/Log/Writer/DatabaseTest.php b/typo3/sysext/core/Tests/Unit/Log/Writer/DatabaseTest.php
index 0c64adf11bf1..4392d8a61e18 100644
--- a/typo3/sysext/core/Tests/Unit/Log/Writer/DatabaseTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/Writer/DatabaseTest.php
@@ -39,9 +39,7 @@ class DatabaseTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
protected $backupGlobalsArray = array();
/**
- * Mock object of t3lib_db
- *
- * @var PHPUnit_Framework_MockObject_MockObject
+ * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Database\DatabaseConnection
*/
private $databaseStub;
diff --git a/typo3/sysext/core/Tests/Unit/Mail/MailerTest.php b/typo3/sysext/core/Tests/Unit/Mail/MailerTest.php
index 0c8e8d125844..32a1092181ad 100644
--- a/typo3/sysext/core/Tests/Unit/Mail/MailerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Mail/MailerTest.php
@@ -51,9 +51,6 @@ class MailerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
$GLOBALS['TYPO3_CONF_VARS']['MAIL'] = $this->globalMailSettings;
}
- //////////////////////////
- // Tests concerning t3lib_mail_Mailer
- //////////////////////////
/**
* @test
*/
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Utility/FileExtensionFilterTest.php b/typo3/sysext/core/Tests/Unit/Resource/Utility/FileExtensionFilterTest.php
index 3555d6955b80..0079dded4d91 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Utility/FileExtensionFilterTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Utility/FileExtensionFilterTest.php
@@ -50,7 +50,7 @@ class FileExtensionFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
protected $parameters;
/**
- * @var t3lib_TCEmain|PHPUnit_Framework_MockObject_MockObject
+ * @var \TYPO3\CMS\Core\DataHandling\DataHandler|PHPUnit_Framework_MockObject_MockObject
*/
protected $tceMainMock;
diff --git a/typo3/sysext/core/Tests/Unit/Utility/ClientUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/ClientUtilityTest.php
index d8e7a15fdb27..44270ce1cf0d 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/ClientUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/ClientUtilityTest.php
@@ -78,7 +78,7 @@ class ClientUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
}
//////////////////////////////////////////////////////////
- // Tests concerning t3lib_utility_Client::getBrowserInfo
+ // Tests concerning getBrowserInfo
//////////////////////////////////////////////////////////
/**
* @test
diff --git a/typo3/sysext/core/Tests/Unit/Utility/Fixtures/MathUtilityTestClassWithStringRepresentationFixture.php b/typo3/sysext/core/Tests/Unit/Utility/Fixtures/MathUtilityTestClassWithStringRepresentationFixture.php
index c8edc961d5fb..8a79333c6cf4 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/Fixtures/MathUtilityTestClassWithStringRepresentationFixture.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/Fixtures/MathUtilityTestClassWithStringRepresentationFixture.php
@@ -28,10 +28,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Utility\Fixtures;
***************************************************************/
/**
- * Class t3lib_utility_math_fixture_classWithStringRepresentation.
- *
- * This is a fixture subclass for t3lib_utility_math
- *
+ * This is a fixture subclass for \TYPO3\CMS\Core\Utility\MathUtility
*/
class MathUtilityTestClassWithStringRepresentationFixture {
diff --git a/typo3/sysext/core/ext_tables.php b/typo3/sysext/core/ext_tables.php
index 97abbdff74b5..c795faf9d260 100644
--- a/typo3/sysext/core/ext_tables.php
+++ b/typo3/sysext/core/ext_tables.php
@@ -133,7 +133,7 @@ if (
}
// Populate available languages
-/** @var $locales t3lib_l10n_locales */
+/** @var $locales \TYPO3\CMS\Core\Localization\Locales */
$locales = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Localization\\Locales');
$languageItems = $locales->getLanguages();
unset($languageItems['default']);
diff --git a/typo3/sysext/cshmanual/Classes/Controller/HelpModuleController.php b/typo3/sysext/cshmanual/Classes/Controller/HelpModuleController.php
index c747d179cd56..bf0d99a958d5 100644
--- a/typo3/sysext/cshmanual/Classes/Controller/HelpModuleController.php
+++ b/typo3/sysext/cshmanual/Classes/Controller/HelpModuleController.php
@@ -694,7 +694,8 @@ class HelpModuleController {
/**
* Substituting glossary words in the CSH
- * (This is a call-back function from "class local_t3lib_parsehtml extends t3lib_parsehtml", see top of this script)
+ * This is a call-back function from "class local_t3lib_parsehtml
+ * extends \TYPO3\CMS\Core\Html\HtmlParser", see top of this script
*
* @param string $code Input HTML string
* @return string HTML with substituted words in.
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/Be/ContainerViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/Be/ContainerViewHelper.php
index 3c3d5be65931..5e54dc117fe1 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/Be/ContainerViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/Be/ContainerViewHelper.php
@@ -68,7 +68,7 @@ class ContainerViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBacken
* @param array $triggers Defined triggers to be forwarded to client (e.g. refreshing backend widgets)
* @return string
* @see template
- * @see t3lib_PageRenderer
+ * @see \TYPO3\CMS\Core\Page\PageRenderer
*/
public function render($pageTitle = '', $enableJumpToUrl = TRUE, $enableClickMenu = TRUE, $loadPrototype = TRUE, $loadScriptaculous = FALSE, $scriptaculousModule = '', $loadExtJs = FALSE, $loadExtJsTheme = TRUE, $extJsAdapter = '', $enableExtJsDebug = FALSE, $addCssFiles = array(), $addJsFiles = array(), $triggers = array()) {
$doc = $this->getDocInstance();
diff --git a/typo3/sysext/extensionmanager/ext_tables.php b/typo3/sysext/extensionmanager/ext_tables.php
index 713a6006fc55..25804d3eefd0 100644
--- a/typo3/sysext/extensionmanager/ext_tables.php
+++ b/typo3/sysext/extensionmanager/ext_tables.php
@@ -28,9 +28,9 @@ if (TYPO3_MODE === 'BE') {
'TYPO3\\CMS\\Extensionmanager\\Report\\ExtensionStatus';
// Register specific icon for update script button
- t3lib_SpriteManager::addSingleIcons(
+ \TYPO3\CMS\Backend\Sprite\SpriteManager::addSingleIcons(
array(
- 'update-script' => t3lib_extMgm::extRelPath($_EXTKEY) . 'Resources/Public/Images/Icons/ExtensionUpdateScript.png'
+ 'update-script' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($_EXTKEY) . 'Resources/Public/Images/Icons/ExtensionUpdateScript.png'
),
$_EXTKEY
);
diff --git a/typo3/sysext/feedit/Classes/FrontendEditPanel.php b/typo3/sysext/feedit/Classes/FrontendEditPanel.php
index 77227d0eb863..81a292a20461 100644
--- a/typo3/sysext/feedit/Classes/FrontendEditPanel.php
+++ b/typo3/sysext/feedit/Classes/FrontendEditPanel.php
@@ -220,7 +220,6 @@ class FrontendEditPanel {
* @param string $confirm Text string with confirmation message; If set a confirm box will be displayed before carrying out the action (if Yes is pressed)
* @param integer $nPid "New pid" - for new records
* @return string A <a> tag wrapped string.
- * @see editPanel(), editIcons(), t3lib_tsfeBeUserAuth::extEditAction()
*/
protected function editPanelLinkWrap($string, $formName, $cmd, $currentRecord = '', $confirm = '', $nPid = '') {
// Editing forms on page only supported in Live workspace (because of incomplete implementation)
diff --git a/typo3/sysext/filelist/Classes/FileList.php b/typo3/sysext/filelist/Classes/FileList.php
index 15633d0601a6..87920f12f660 100644
--- a/typo3/sysext/filelist/Classes/FileList.php
+++ b/typo3/sysext/filelist/Classes/FileList.php
@@ -316,9 +316,6 @@ class FileList extends \TYPO3\CMS\Backend\RecordList\AbstractRecordList {
// Adds the code of files/dirs
$out = '';
$titleCol = 'file';
- // @todo: fix this: go up one level with FAL
- // $upLevelDir = dirname(substr($files['files'][0]['path'], 0, -1)) . '/';
- // $levelUp = $GLOBALS['SOBE']->basicFF->checkPathAgainstMounts($upLevelDir) ? $this->linkWrapDir(t3lib_iconWorks::getSpriteIcon('actions-view-go-up', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.upOneLevel', TRUE))), $upLevelDir) : '';
// Cleaning rowlist for duplicates and place the $titleCol as the first column always!
$rowlist = \TYPO3\CMS\Core\Utility\GeneralUtility::rmFromList($titleCol, $rowlist);
$rowlist = \TYPO3\CMS\Core\Utility\GeneralUtility::uniqueList($rowlist);
diff --git a/typo3/sysext/frontend/Classes/Authentication/FrontendUserAuthentication.php b/typo3/sysext/frontend/Classes/Authentication/FrontendUserAuthentication.php
index 5e2deadb1b60..18fb1834f318 100644
--- a/typo3/sysext/frontend/Classes/Authentication/FrontendUserAuthentication.php
+++ b/typo3/sysext/frontend/Classes/Authentication/FrontendUserAuthentication.php
@@ -164,7 +164,7 @@ class FrontendUserAuthentication extends \TYPO3\CMS\Core\Authentication\Abstract
* Starts a user session
*
* @return void
- * @see t3lib_userAuth::start()
+ * @see \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::start()
* @todo Define visibility
*/
public function start() {
@@ -218,7 +218,7 @@ class FrontendUserAuthentication extends \TYPO3\CMS\Core\Authentication\Abstract
* Returns an info array with Login/Logout data submitted by a form or params
*
* @return array
- * @see t3lib_userAuth::getLoginFormData()
+ * @see \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::getLoginFormData()
* @todo Define visibility
*/
public function getLoginFormData() {
diff --git a/typo3/sysext/frontend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php b/typo3/sysext/frontend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
index a40b1bbd2c22..3da157cf2252 100644
--- a/typo3/sysext/frontend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
+++ b/typo3/sysext/frontend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
@@ -41,7 +41,7 @@ class ConditionMatcher extends \TYPO3\CMS\Core\Configuration\TypoScript\Conditio
*
* @param string $string The condition to match against its criterias.
* @return boolean Whether the condition matched
- * @see t3lib_tsparser::parse()
+ * @see \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser::parse()
*/
protected function evaluateCondition($string) {
list($key, $value) = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode('=', $string, FALSE, 2);
diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
index 02d2d87cc3d7..7e93b6f13fc0 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
@@ -1646,12 +1646,11 @@ class ContentObjectRenderer {
* " World. How are ". The input content string could just as well have
* been "Hello ###sub1### World. How are ###sub1### you?" and the result
* would be the same
- * Wrapper for t3lib_parsehtml::getSubpart which behaves identical
+ * Wrapper for \TYPO3\CMS\Core\Html\HtmlParser::getSubpart which behaves identical
*
* @param string $content The content stream, typically HTML template content.
* @param string $marker The marker string, typically on the form "###[the marker string]###
* @return string The subpart found, if found.
- * @see substituteSubpart(), t3lib_parsehtml::getSubpart()
*/
public function getSubpart($content, $marker) {
return \TYPO3\CMS\Core\Html\HtmlParser::getSubpart($content, $marker);
@@ -1661,14 +1660,13 @@ class ContentObjectRenderer {
* Substitute subpart in input template stream.
* This function substitutes a subpart in $content with the content of
* $subpartContent.
- * Wrapper for t3lib_parsehtml::substituteSubpart which behaves identical
+ * Wrapper for \TYPO3\CMS\Core\Html\HtmlParser::substituteSubpart which behaves identical
*
* @param string $content The content stream, typically HTML template content.
* @param string $marker The marker string, typically on the form "###[the marker string]###
* @param mixed $subpartContent The content to insert instead of the subpart found. If a string, then just plain substitution happens (includes removing the HTML comments of the subpart if found). If $subpartContent happens to be an array, it's [0] and [1] elements are wrapped around the EXISTING content of the subpart (fetched by getSubpart()) thereby not removing the original content.
* @param boolean $recursive If $recursive is set, the function calls itself with the content set to the remaining part of the content after the second marker. This means that proceding subparts are ALSO substituted!
* @return string The processed HTML content string.
- * @see getSubpart(), t3lib_parsehtml::substituteSubpart()
*/
public function substituteSubpart($content, $marker, $subpartContent, $recursive = 1) {
return \TYPO3\CMS\Core\Html\HtmlParser::substituteSubpart($content, $marker, $subpartContent, $recursive);
@@ -1871,7 +1869,6 @@ class ContentObjectRenderer {
* @param boolean $uppercase
* @param boolean $deleteUnused
* @return string
- * @see t3lib_parsehtml::substituteMarkerAndSubpartArrayRecursive()
*/
public function substituteMarkerAndSubpartArrayRecursive($content, array $markersAndSubparts, $wrap = '', $uppercase = FALSE, $deleteUnused = FALSE) {
return \TYPO3\CMS\Core\Html\HtmlParser::substituteMarkerAndSubpartArrayRecursive($content, $markersAndSubparts, $wrap, $uppercase, $deleteUnused);
@@ -3676,12 +3673,14 @@ class ContentObjectRenderer {
}
/**
- * Passes the input value, $theValue, to an instance of "t3lib_parsehtml" together with the TypoScript options which are first converted from a TS style array to a set of arrays with options for the t3lib_parsehtml class.
+ * Passes the input value, $theValue, to an instance of "\TYPO3\CMS\Core\Html\HtmlParser"
+ * together with the TypoScript options which are first converted from a TS style array
+ * to a set of arrays with options for the \TYPO3\CMS\Core\Html\HtmlParser class.
*
- * @param string $theValue The value to parse by the class "t3lib_parsehtml
+ * @param string $theValue The value to parse by the class \TYPO3\CMS\Core\Html\HtmlParser
* @param array $conf TypoScript properties for the parser. See link.
* @return string Return value.
- * @see stdWrap(), t3lib_parsehtml::HTMLparserConfig(), t3lib_parsehtml::HTMLcleaner()
+ * @see stdWrap(), \TYPO3\CMS\Core\Html\HtmlParser::HTMLparserConfig(), \TYPO3\CMS\Core\Html\HtmlParser::HTMLcleaner()
* @todo Define visibility
*/
public function HTMLparser_TSbridge($theValue, $conf) {
@@ -5927,7 +5926,7 @@ class ContentObjectRenderer {
if (isset($conf['forceAbsoluteUrl.']['scheme']) && $conf['forceAbsoluteUrl.']['scheme']) {
$absoluteUrlScheme = $conf['forceAbsoluteUrl.']['scheme'];
} elseif ($page['url_scheme'] > 0) {
- $absoluteUrlScheme = (int) $page['url_scheme'] === \t3lib_utility_http::SCHEME_HTTP ? 'http' : 'https';
+ $absoluteUrlScheme = (int) $page['url_scheme'] === \TYPO3\CMS\Core\Utility\HttpUtility::SCHEME_HTTP ? 'http' : 'https';
}
// If no domain records are defined, use current domain:
$currentUrlScheme = parse_url(\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_REQUEST_URL'), PHP_URL_SCHEME);
@@ -7117,13 +7116,12 @@ class ContentObjectRenderer {
* THIS IS A VERY IMPORTANT FUNCTION: Basically you must add the output from this function for EVERY select query you create
* for selecting records of tables in your own applications - thus they will always be filtered according to the "enablefields"
* configured in TCA
- * Simply calls t3lib_pageSelect::enableFields() BUT will send the show_hidden flag along!
+ * Simply calls \TYPO3\CMS\Frontend\Page\PageRepository::enableFields() BUT will send the show_hidden flag along!
* This means this function will work in conjunction with the preview facilities of the frontend engine/Admin Panel.
*
* @param string $table The table for which to get the where clause
* @param boolean $show_hidden If set, then you want NOT to filter out hidden records. Otherwise hidden record are filtered based on the current preview settings.
* @return string The part of the where clause on the form " AND [fieldname]=0 AND ...". Eg. " AND hidden=0 AND starttime < 123345567
- * @see t3lib_pageSelect::enableFields()
* @todo Define visibility
*/
public function enableFields($table, $show_hidden = 0) {
@@ -7779,7 +7777,7 @@ class ContentObjectRenderer {
if (!count($dataArr)) {
$dataArr = $this->data;
}
- // Delegate rendering of the edit panel to the t3lib_frontendedit class.
+ // Delegate rendering of the edit panel to the frontend edit
$content = $GLOBALS['BE_USER']->frontendEdit->displayEditPanel($content, $conf, $currentRecord, $dataArr);
}
return $content;
@@ -7806,7 +7804,7 @@ class ContentObjectRenderer {
if (!count($dataArr)) {
$dataArr = $this->data;
}
- // Delegate rendering of the edit panel to the t3lib_frontendedit class.
+ // Delegate rendering of the edit panel to frontend edit class.
$content = $GLOBALS['BE_USER']->frontendEdit->displayEditIcons($content, $params, $conf, $currentRecord, $dataArr, $addUrlParamStr);
}
return $content;
diff --git a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
index b113a3720fa5..f59bd4a75221 100644
--- a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
+++ b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
@@ -26,8 +26,10 @@ namespace TYPO3\CMS\Frontend\Controller;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
* Class for the built TypoScript based Front End
+ * Main frontend class, instantiated in the index_ts.php script as the global object TSFE
*
* This class has a lot of functions and internal variable which are use from index_ts.php.
* The class is instantiated as $GLOBALS['TSFE'] in index_ts.php.
@@ -38,11 +40,6 @@ namespace TYPO3\CMS\Frontend\Controller;
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
-/**
- * Main frontend class, instantiated in the index_ts.php script as the global object TSFE
- *
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- */
class TypoScriptFrontendController {
// CURRENT PAGE:
@@ -730,17 +727,17 @@ class TypoScriptFrontendController {
protected $pageRenderer;
/**
- * the page cache object, use this to save pages to the cache and to
+ * The page cache object, use this to save pages to the cache and to
* retrieve them again
*
- * @var t3lib_cache_AbstractBackend
+ * @var \TYPO3\CMS\Cache\Backend\AbstractBackend
*/
protected $pageCache;
protected $pageCacheTags = array();
/**
- * @var t3lib_cacheHash The cHash Service class used for cHash related functionality
+ * @var \TYPO3\CMS\Frontend\Page\CacheHashCalculator The cHash Service class used for cHash related functionality
*/
protected $cacheHash;
@@ -1067,8 +1064,8 @@ class TypoScriptFrontendController {
$GLOBALS['TYPO3_MISC']['microtime_BE_USER_start'] = microtime(TRUE);
$GLOBALS['TT']->push('Back End user initialized', '');
// TODO: validate the comment below: is this necessary? if so,
- // formfield_status should be set to "" in t3lib_tsfeBeUserAuth
- // which is a subclass of t3lib_beUserAuth
+ // formfield_status should be set to "" in \TYPO3\CMS\Backend\FrontendBackendUserAuthentication
+ // which is a subclass of \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
// ----
// the value this->formfield_status is set to empty in order to
// disable login-attempts to the backend account through this script
@@ -1351,9 +1348,9 @@ class TypoScriptFrontendController {
if ($this->page['url_scheme'] > 0) {
$newUrl = '';
$requestUrlScheme = parse_url(\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_REQUEST_URL'), PHP_URL_SCHEME);
- if ((int) $this->page['url_scheme'] === \t3lib_utility_http::SCHEME_HTTP && $requestUrlScheme == 'https') {
+ if ((int) $this->page['url_scheme'] === \TYPO3\CMS\Core\Utility\HttpUtility::SCHEME_HTTP && $requestUrlScheme == 'https') {
$newUrl = 'http://' . substr(\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_REQUEST_URL'), 8);
- } elseif ((int) $this->page['url_scheme'] === \t3lib_utility_http::SCHEME_HTTPS && $requestUrlScheme == 'http') {
+ } elseif ((int) $this->page['url_scheme'] === \TYPO3\CMS\Core\Utility\HttpUtility::SCHEME_HTTPS && $requestUrlScheme == 'http') {
$newUrl = 'https://' . substr(\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_REQUEST_URL'), 7);
}
if ($newUrl !== '') {
@@ -1362,7 +1359,7 @@ class TypoScriptFrontendController {
} else {
$headerCode = \TYPO3\CMS\Core\Utility\HttpUtility::HTTP_STATUS_301;
}
- \t3lib_utility_http::redirect($newUrl, $headerCode);
+ \TYPO3\CMS\Core\Utility\HttpUtility::redirect($newUrl, $headerCode);
}
}
// Set no_cache if set
@@ -1844,7 +1841,7 @@ class TypoScriptFrontendController {
/**
* Page unavailable handler. Acts a wrapper for the pageErrorHandler method.
*
- * @param mixed $code Which type of handling; If a true PHP-boolean or TRUE then a ->t3lib_message_ErrorPageMessage is outputted. If integer an error message with that number is shown. Otherwise the $code value is expected to be a "Location:" header value.
+ * @param mixed $code Which type of handling; If a true PHP-boolean or TRUE then a \TYPO3\CMS\Core\Messaging\ErrorpageMessage is outputted. If integer an error message with that number is shown. Otherwise the $code value is expected to be a "Location:" header value.
* @param string $header If set, this is passed directly to the PHP function, header()
* @param string $reason If set, error messages will also mention this as the reason for the page-not-found.
* @return void (The function exits!)
@@ -1857,7 +1854,7 @@ class TypoScriptFrontendController {
/**
* Page not found handler. Acts a wrapper for the pageErrorHandler method.
*
- * @param mixed $code Which type of handling; If a true PHP-boolean or TRUE then a ->t3lib_message_ErrorPageMessage is outputted. If integer an error message with that number is shown. Otherwise the $code value is expected to be a "Location:" header value.
+ * @param mixed $code Which type of handling; If a true PHP-boolean or TRUE then a \TYPO3\CMS\Core\Messaging\ErrorpageMessage is outputted. If integer an error message with that number is shown. Otherwise the $code value is expected to be a "Location:" header value.
* @param string $header If set, this is passed directly to the PHP function, header()
* @param string $reason If set, error messages will also mention this as the reason for the page-not-found.
* @return void (The function exits!)
@@ -1871,7 +1868,7 @@ class TypoScriptFrontendController {
* Generic error page handler.
* Exits.
*
- * @param mixed $code Which type of handling; If a true PHP-boolean or TRUE then a ->t3lib_message_ErrorPageMessage is outputted. If integer an error message with that number is shown. Otherwise the $code value is expected to be a "Location:" header value.
+ * @param mixed $code Which type of handling; If a true PHP-boolean or TRUE then a \TYPO3\CMS\Core\Messaging\ErrorpageMessage is outputted. If integer an error message with that number is shown. Otherwise the $code value is expected to be a "Location:" header value.
* @param string $header If set, this is passed directly to the PHP function, header()
* @param string $reason If set, error messages will also mention this as the reason for the page-not-found.
* @return void (The function exits!)
@@ -3231,7 +3228,8 @@ class TypoScriptFrontendController {
* @todo Define visibility
*/
public function generatePage_preProcessing() {
- // Same codeline as in getFromCache(). But $this->all has been changed by t3lib_TStemplate::start() in the meantime, so this must be called again!
+ // Same codeline as in getFromCache(). But $this->all has been changed by
+ // \TYPO3\CMS\Core\TypoScript\TemplateService::start() in the meantime, so this must be called again!
$this->newHash = $this->getHash();
// For cache management informational purposes.
$this->config['hash_base'] = $this->hash_base;
@@ -3239,7 +3237,7 @@ class TypoScriptFrontendController {
// Here we put some temporary stuff in the cache in order to let the first hit generate the page. The temporary cache will expire after a few seconds (typ. 30) or will be cleared by the rendered page, which will also clear and rewrite the cache.
$this->tempPageCacheContent();
}
- // Setting cache_timeout_default. May be overridden by PHP include scritps.
+ // Setting cache_timeout_default. May be overridden by PHP include scripts.
$this->cacheTimeOutDefault = intval($this->config['config']['cache_period']);
// Page is generated
$this->no_cacheBeforePageGen = $this->no_cache;
@@ -4094,7 +4092,6 @@ if (version == "n3") {
* @param string $typoScriptProperty Deprecated object or property
* @param string $explanation Message or additional information
* @return void
- * @see \TYPO3\CMS\Core\Utility\GeneralUtility::deprecationLog(), t3lib_timeTrack::setTSlogMessage()
* @todo Define visibility
*/
public function logDeprecatedTyposcript($typoScriptProperty, $explanation = '') {
@@ -4631,7 +4628,7 @@ if (version == "n3") {
* @param string $str String to convert charset for
* @param string $from Optional "from" charset.
* @return string Output string, converted if needed.
- * @see t3lib_cs
+ * @see \TYPO3\CMS\Core\Charset\CharsetConverter
* @todo Define visibility
*/
public function csConv($str, $from = '') {
@@ -4760,7 +4757,7 @@ if (version == "n3") {
*/
protected function getSysDomainCache() {
$entryIdentifier = 'core-database-sys_domain-complete';
- /** @var $runtimeCache t3lib_cache_frontend_AbstractFrontend */
+ /** @var $runtimeCache \TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend */
$runtimeCache = $GLOBALS['typo3CacheManager']->getCache('cache_runtime');
$sysDomainData = array();
diff --git a/typo3/sysext/frontend/Classes/Imaging/GifBuilder.php b/typo3/sysext/frontend/Classes/Imaging/GifBuilder.php
index 32b5423f2a20..74e5a0b2d8cb 100644
--- a/typo3/sysext/frontend/Classes/Imaging/GifBuilder.php
+++ b/typo3/sysext/frontend/Classes/Imaging/GifBuilder.php
@@ -26,20 +26,17 @@ namespace TYPO3\CMS\Frontend\Imaging;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
+ * GIFBUILDER
+ *
* Generating gif/png-files from TypoScript
* Used by the menu-objects and imgResource in TypoScript.
*
- * Revised for TYPO3 3.6 June/2003 by Kasper Skårhøj
- *
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- */
-/**
- * GIFBUILDER extension class.
* This class allows for advanced rendering of images with various layers of images, text and graphical primitives.
* The concept is known from TypoScript as "GIFBUILDER" where you can define a "numerical array" (TypoScript term as well) of "GIFBUILDER OBJECTS" (like "TEXT", "IMAGE", etc.) and they will be rendered onto an image one by one.
* The name "GIFBUILDER" comes from the time where GIF was the only file format supported. PNG is just as well to create today (configured with TYPO3_CONF_VARS[GFX])
- * Not all instances of this class is truely building gif/png files by layers; You may also see the class instantiated for the purpose of using the scaling functions in the parent class, t3lib_stdGraphic.
+ * Not all instances of this class is truely building gif/png files by layers; You may also see the class instantiated for the purpose of using the scaling functions in the parent class.
*
* Here is an example of how to use this class (from tslib_content.php, function getImgResource):
*
@@ -550,7 +547,7 @@ class GifBuilder extends \TYPO3\CMS\Core\Imaging\GraphicalFunctions {
}
$conf['fontFile'] = $this->checkFile($conf['fontFile']);
if (!$conf['fontFile']) {
- $conf['fontFile'] = 't3lib/fonts/nimbus.ttf';
+ $conf['fontFile'] = 'typo3/sysext/core/Resources/Private/Font/nimbus.ttf';
}
if (!$conf['iterations']) {
$conf['iterations'] = 1;
@@ -673,7 +670,7 @@ class GifBuilder extends \TYPO3\CMS\Core\Imaging\GraphicalFunctions {
* @param string $file The resource value.
* @return string Returns the relative filepath
* @access private
- * @see t3lib_TStemplate::getFileName()
+ * @see \TYPO3\CMS\Core\TypoScript\TemplateService::getFileName()
* @todo Define visibility
*/
public function checkFile($file) {
diff --git a/typo3/sysext/frontend/Classes/Page/FramesetRenderer.php b/typo3/sysext/frontend/Classes/Page/FramesetRenderer.php
index 8c8fd326071e..f87dda0dce26 100644
--- a/typo3/sysext/frontend/Classes/Page/FramesetRenderer.php
+++ b/typo3/sysext/frontend/Classes/Page/FramesetRenderer.php
@@ -75,7 +75,6 @@ class FramesetRenderer {
* @return string String with attributes for the frame-tag. With a prefixed space character.
* @access private
* @link http://typo3.org/documentation/document-library/references/doc_core_tsref/current/view/7/9/
- * @see make(), t3lib_TStemplate::linkData()
* @todo Define visibility
*/
public function frameParams($setup, $typeNum) {
diff --git a/typo3/sysext/frontend/Classes/Page/PageGenerator.php b/typo3/sysext/frontend/Classes/Page/PageGenerator.php
index 8fb6fb4a7652..dabc719b10ae 100644
--- a/typo3/sysext/frontend/Classes/Page/PageGenerator.php
+++ b/typo3/sysext/frontend/Classes/Page/PageGenerator.php
@@ -253,7 +253,6 @@ class PageGenerator {
* @return void
*/
static public function renderContentWithHeader($pageContent) {
- // get instance of t3lib_PageRenderer
/** @var $pageRenderer \TYPO3\CMS\Core\Page\PageRenderer */
$pageRenderer = $GLOBALS['TSFE']->getPageRenderer();
if ($GLOBALS['TSFE']->config['config']['moveJsFromHeaderToFooter']) {
diff --git a/typo3/sysext/frontend/Classes/Page/PageRepository.php b/typo3/sysext/frontend/Classes/Page/PageRepository.php
index 012d7a7fa709..019aec12d7c1 100644
--- a/typo3/sysext/frontend/Classes/Page/PageRepository.php
+++ b/typo3/sysext/frontend/Classes/Page/PageRepository.php
@@ -788,7 +788,7 @@ class PageRepository {
* Can be used to retrieved a cached value
* Can be used from your frontend plugins if you like. It is also used to
* store the parsed TypoScript template structures. You can call it directly
- * like t3lib_pageSelect::getHash()
+ * like \TYPO3\CMS\Frontend\Page\PageRepository::getHash()
*
* @param string $hash The hash-string which was used to store the data value
* @param integer The expiration time (not used anymore)
@@ -810,7 +810,7 @@ class PageRepository {
/**
* Stores a string value in the cache_hash cache identified by $hash.
* Can be used from your frontend plugins if you like. You can call it
- * directly like t3lib_pageSelect::storeHash()
+ * directly like \TYPO3\CMS\Frontend\Page\PageRepository::storeHash()
*
* @param string $hash 32 bit hash string (eg. a md5 hash of a serialized array identifying the data being stored)
* @param string $data The data string. If you want to store an array, then just serialize it first.
diff --git a/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageHookInterface.php b/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageHookInterface.php
index 968cf58d55af..7196fcc3c7d6 100644
--- a/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageHookInterface.php
+++ b/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageHookInterface.php
@@ -26,18 +26,20 @@ namespace TYPO3\CMS\Frontend\Page;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
* Interface for classes which hook into pageSelect and do additional getPage processing
*
* @author Christian Kuhn <lolli@schwarzbu.ch>
*/
interface PageRepositoryGetPageHookInterface {
+
/**
* Modifies the DB params
*
* @param integer $uid The page ID
* @param boolean $disableGroupAccessCheck If set, the check for group access is disabled. VERY rarely used
- * @param \TYPO3\CMS\Frontend\Page\PageRepository $parentObject Parent t3lib_pageSelect object
+ * @param \TYPO3\CMS\Frontend\Page\PageRepository $parentObject Parent object
* @return void
*/
public function getPage_preProcess(&$uid, &$disableGroupAccessCheck, \TYPO3\CMS\Frontend\Page\PageRepository $parentObject);
diff --git a/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageOverlayHookInterface.php b/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageOverlayHookInterface.php
index 6e7f27f7efb6..48ed398346ee 100644
--- a/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageOverlayHookInterface.php
+++ b/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageOverlayHookInterface.php
@@ -26,12 +26,14 @@ namespace TYPO3\CMS\Frontend\Page;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
- * interface for classes which hook into t3lib_pageSelect
+ * Interface for classes which hook into \TYPO3\CMS\Frontend\Page\PageRepository
*
* @author Tolleiv Nietsch <nietsch@aoemedia.de>
*/
interface PageRepositoryGetPageOverlayHookInterface {
+
/**
* enables to preprocess the pageoverlay
*
diff --git a/typo3/sysext/frontend/Classes/Page/PageRepositoryGetRecordOverlayHookInterface.php b/typo3/sysext/frontend/Classes/Page/PageRepositoryGetRecordOverlayHookInterface.php
index d96f707a588d..60abd4aa9497 100644
--- a/typo3/sysext/frontend/Classes/Page/PageRepositoryGetRecordOverlayHookInterface.php
+++ b/typo3/sysext/frontend/Classes/Page/PageRepositoryGetRecordOverlayHookInterface.php
@@ -26,8 +26,9 @@ namespace TYPO3\CMS\Frontend\Page;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
- * interface for classes which hook into t3lib_pageSelect
+ * Interface for classes which hook into \TYPO3\CMS\Frontend\Page\PageRepository
*
* @author Tolleiv Nietsch <nietsch@aoemedia.de>
*/
diff --git a/typo3/sysext/frontend/Classes/View/AdminPanelView.php b/typo3/sysext/frontend/Classes/View/AdminPanelView.php
index 85fca70b0036..531c2f390b82 100644
--- a/typo3/sysext/frontend/Classes/View/AdminPanelView.php
+++ b/typo3/sysext/frontend/Classes/View/AdminPanelView.php
@@ -74,7 +74,7 @@ class AdminPanelView {
$GLOBALS['TSFE']->displayEditIcons = $this->extGetFeAdminValue('edit', 'displayIcons');
$GLOBALS['TSFE']->displayFieldEditIcons = $this->extGetFeAdminValue('edit', 'displayFieldIcons');
if ($this->extGetFeAdminValue('tsdebug', 'displayQueries')) {
- // do not override if the value is already set in t3lib_db
+ // Do not override if the value is already set in \TYPO3\CMS\Core\Database\DatabaseConnection
if ($GLOBALS['TYPO3_DB']->explainOutput == 0) {
// Enable execution of EXPLAIN SELECT queries
$GLOBALS['TYPO3_DB']->explainOutput = 3;
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php
index 50cc3917c3de..13cf7cd761d6 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php
@@ -49,7 +49,7 @@ class AbstractMenuContentObjectTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTe
$proxy = $this->buildAccessibleProxy('TYPO3\\CMS\\Frontend\\ContentObject\\Menu\\AbstractMenuContentObject');
$this->fixture = new $proxy();
$this->databaseBackup = $GLOBALS['TYPO3_DB'];
- $GLOBALS['TYPO3_DB'] = $this->getMock('t3lib_db');
+ $GLOBALS['TYPO3_DB'] = $this->getMock('TYPO3\\CMS\\Core\\Database\\DatabaseConnection');
$GLOBALS['TSFE'] = $this->getMock('TYPO3\\CMS\\Frontend\\Controller\\TypoScriptFrontendController', array(), array($GLOBALS['TYPO3_CONF_VARS'], 1, 1));
$GLOBALS['TSFE']->cObj = new \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer();
}
diff --git a/typo3/sysext/frontend/Tests/Unit/Page/CacheHashCalculatorTest.php b/typo3/sysext/frontend/Tests/Unit/Page/CacheHashCalculatorTest.php
index c47f95a4a020..6e05af23a7f9 100644
--- a/typo3/sysext/frontend/Tests/Unit/Page/CacheHashCalculatorTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/Page/CacheHashCalculatorTest.php
@@ -25,7 +25,7 @@ namespace TYPO3\CMS\Frontend\Tests\Unit\Page;
***************************************************************/
/**
- * Testcase for class t3lib_cacheHeash
+ * Testcase
*
* @author 2012 Tolleiv Nietsch <typo3@tolleiv.de>
*/
diff --git a/typo3/sysext/func_wizards/Classes/Controller/WebFunctionWizardsBaseController.php b/typo3/sysext/func_wizards/Classes/Controller/WebFunctionWizardsBaseController.php
index 546374a025da..e21680d6ca39 100644
--- a/typo3/sysext/func_wizards/Classes/Controller/WebFunctionWizardsBaseController.php
+++ b/typo3/sysext/func_wizards/Classes/Controller/WebFunctionWizardsBaseController.php
@@ -47,8 +47,6 @@ class WebFunctionWizardsBaseController extends \TYPO3\CMS\Backend\Module\Abstrac
* @param object $pObj A reference to the parent (calling) object (which is probably an instance of an extension class to \TYPO3\CMS\Backend\Module\BaseScriptClass)
* @param array $conf The configuration set for this module - from global array TBE_MODULES_EXT
* @return void
- * @see \TYPO3\CMS\Backend\Module\AbstractFunctionModule::handleExternalFunctionValue()
- * @see \TYPO3\CMS\Backend\Module\AbstractFunctionModule::init()
* @todo Define visibility
*/
public function init(&$pObj, $conf) {
@@ -63,7 +61,6 @@ class WebFunctionWizardsBaseController extends \TYPO3\CMS\Backend\Module\Abstrac
* Modifies parent objects internal MOD_MENU array, adding items this module needs.
*
* @return array Items merged with the parent objects.
- * @see \TYPO3\CMS\Backend\Module\AbstractFunctionModule::init()
* @todo Define visibility
*/
public function modMenu() {
@@ -84,7 +81,6 @@ class WebFunctionWizardsBaseController extends \TYPO3\CMS\Backend\Module\Abstrac
* Creation of the main content. Calling extObjContent() to trigger content generation from the sub-sub modules
*
* @return string The content
- * @see \TYPO3\CMS\Backend\Module\AbstractFunctionModule::extObjContent()
* @todo Define visibility
*/
public function main() {
diff --git a/typo3/sysext/impexp/Classes/Controller/ImportExportController.php b/typo3/sysext/impexp/Classes/Controller/ImportExportController.php
index b72bd6ca48cc..e0a8be10c875 100644
--- a/typo3/sysext/impexp/Classes/Controller/ImportExportController.php
+++ b/typo3/sysext/impexp/Classes/Controller/ImportExportController.php
@@ -489,7 +489,7 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
$row[] = '
<tr class="bgColor4">
<td><strong>' . $LANG->getLL('makeconfig_record', 1) . '</strong></td>
- <td>' . \t3lib_iconworks::getSpriteIconForRecord($tName, $rec) . \TYPO3\CMS\Backend\Utility\BackendUtility::getRecordTitle($tName, $rec, TRUE) . '<input type="hidden" name="tx_impexp[record][]" value="' . htmlspecialchars(($tName . ':' . $rUid)) . '" /></td>
+ <td>' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIconForRecord($tName, $rec) . \TYPO3\CMS\Backend\Utility\BackendUtility::getRecordTitle($tName, $rec, TRUE) . '<input type="hidden" name="tx_impexp[record][]" value="' . htmlspecialchars(($tName . ':' . $rUid)) . '" /></td>
</tr>';
}
}
@@ -511,7 +511,7 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
$iconAndTitle = \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('apps-pagetree-root') . $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'];
} else {
$record = \TYPO3\CMS\Backend\Utility\BackendUtility::getRecordWSOL('pages', $referenceParts[1]);
- $iconAndTitle = \t3lib_iconworks::getSpriteIconForRecord('pages', $record) . \TYPO3\CMS\Backend\Utility\BackendUtility::getRecordTitle('pages', $record, TRUE);
+ $iconAndTitle = \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIconForRecord('pages', $record) . \TYPO3\CMS\Backend\Utility\BackendUtility::getRecordTitle('pages', $record, TRUE);
}
$tblList .= 'Table "' . $tableName . '" from ' . $iconAndTitle . '<input type="hidden" name="tx_impexp[list][]" value="' . htmlspecialchars($reference) . '" /><br/>';
}
diff --git a/typo3/sysext/impexp/Classes/ImportExport.php b/typo3/sysext/impexp/Classes/ImportExport.php
index a69fe5fea963..136501c23a0c 100644
--- a/typo3/sysext/impexp/Classes/ImportExport.php
+++ b/typo3/sysext/impexp/Classes/ImportExport.php
@@ -2575,7 +2575,7 @@ class ImportExport {
}
}
}
- $pInfo['preCode'] = $preCode . \t3lib_iconworks::getSpriteIconForRecord($table, (array) $this->dat['records'][($table . ':' . $uid)]['data'], array('title' => htmlspecialchars(($table . ':' . $uid))));
+ $pInfo['preCode'] = $preCode . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIconForRecord($table, (array) $this->dat['records'][($table . ':' . $uid)]['data'], array('title' => htmlspecialchars(($table . ':' . $uid))));
$pInfo['title'] = htmlspecialchars($record['title']);
// View page:
if ($table === 'pages') {
diff --git a/typo3/sysext/indexed_search/Classes/Controller/IndexingStatisticsController.php b/typo3/sysext/indexed_search/Classes/Controller/IndexingStatisticsController.php
index ddb665550b36..d5bf6bd2e8de 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/IndexingStatisticsController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/IndexingStatisticsController.php
@@ -129,8 +129,8 @@ class IndexingStatisticsController extends \TYPO3\CMS\Backend\Module\AbstractFun
}
/**
- * Calls t3lib_tsfeBeUserAuth::extGetTreeList.
- * Although this duplicates the function t3lib_tsfeBeUserAuth::extGetTreeList
+ * Calls \TYPO3\CMS\Backend\FrontendBackendUserAuthentication::extGetTreeList.
+ * Although this duplicates the function \TYPO3\CMS\Backend\FrontendBackendUserAuthentication::extGetTreeList
* this is necessary to create the object that is used recursively by the original function.
*
* Generates a list of Page-uid's from $id. List does not include $id itself
diff --git a/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php b/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
index 557dba091b80..976c9e9beaf5 100644
--- a/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
+++ b/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
@@ -719,13 +719,13 @@ class IndexSearchRepository {
* THIS IS A VERY IMPORTANT FUNCTION: Basically you must add the output from this function for EVERY select query you create
* for selecting records of tables in your own applications - thus they will always be filtered according to the "enablefields"
* configured in TCA
- * Simply calls t3lib_pageSelect::enableFields() BUT will send the show_hidden flag along!
+ * Simply calls \TYPO3\CMS\Frontend\Page\PageRepository::enableFields() BUT will send the show_hidden flag along!
* This means this function will work in conjunction with the preview facilities of the frontend engine/Admin Panel.
*
* @param string The table for which to get the where clause
* @param boolean If set, then you want NOT to filter out hidden records. Otherwise hidden record are filtered based on the current preview settings.
* @return string The part of the where clause on the form " AND [fieldname]=0 AND ...". Eg. " AND hidden=0 AND starttime < 123345567
- * @see t3lib_pageSelect::enableFields()
+ * @see \TYPO3\CMS\Frontend\Page\PageRepository::enableFields()
*/
protected function enableFields($table) {
return $GLOBALS['TSFE']->sys_page->enableFields($table, $table == 'pages' ? $GLOBALS['TSFE']->showHiddenPage : $GLOBALS['TSFE']->showHiddenRecords);
diff --git a/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php b/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
index a81bdf3b0229..f7d4f317b7b2 100644
--- a/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
+++ b/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
@@ -704,7 +704,7 @@ class CrawlerHook {
*
* @param string TCEmain command
* @param string Table name
- * @param string Record ID. If new record its a string pointing to index inside t3lib_tcemain::substNEWwithIDs
+ * @param string Record ID. If new record its a string pointing to index inside \TYPO3\CMS\Core\DataHandling\DataHandler::substNEWwithIDs
* @param mixed Target value (ignored)
* @param object Reference to tcemain calling object
* @return void
@@ -722,7 +722,7 @@ class CrawlerHook {
*
* @param string Status "new" or "update
* @param string Table name
- * @param string Record ID. If new record its a string pointing to index inside t3lib_tcemain::substNEWwithIDs
+ * @param string Record ID. If new record its a string pointing to index inside \TYPO3\CMS\Core\DataHandling\DataHandler::substNEWwithIDs
* @param array Field array of updated fields in the operation
* @param object Reference to tcemain calling object
* @return void
diff --git a/typo3/sysext/indexed_search/Classes/Indexer.php b/typo3/sysext/indexed_search/Classes/Indexer.php
index 0e5281f29c02..cf6b8bc2cb04 100644
--- a/typo3/sysext/indexed_search/Classes/Indexer.php
+++ b/typo3/sysext/indexed_search/Classes/Indexer.php
@@ -834,7 +834,7 @@ class Indexer {
* @todo Define visibility
*/
public function extractHyperLinks($html) {
- $htmlParser = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('t3lib_parseHtml');
+ $htmlParser = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Core\Html\HtmlParser');
$htmlParts = $htmlParser->splitTags('a', $html);
$hyperLinksData = array();
foreach ($htmlParts as $index => $tagData) {
@@ -863,7 +863,7 @@ class Indexer {
*/
public function extractBaseHref($html) {
$href = '';
- $htmlParser = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('t3lib_parseHtml');
+ $htmlParser = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Core\Html\HtmlParser');
$htmlParts = $htmlParser->splitTags('base', $html);
foreach ($htmlParts as $index => $tagData) {
if ($index % 2 !== 0) {
diff --git a/typo3/sysext/indexed_search/Classes/Lexer.php b/typo3/sysext/indexed_search/Classes/Lexer.php
index 62d94bc4b90f..8825314f000e 100644
--- a/typo3/sysext/indexed_search/Classes/Lexer.php
+++ b/typo3/sysext/indexed_search/Classes/Lexer.php
@@ -71,7 +71,7 @@ class Lexer {
);
/**
- * Constructor: Initializes the charset class, t3lib_cs
+ * Constructor: Initializes the charset class
*
* @return void
* @todo Define visibility
diff --git a/typo3/sysext/install/Classes/InstallBootstrap.php b/typo3/sysext/install/Classes/InstallBootstrap.php
index 4f82972318b0..332c50452931 100644
--- a/typo3/sysext/install/Classes/InstallBootstrap.php
+++ b/typo3/sysext/install/Classes/InstallBootstrap.php
@@ -25,6 +25,7 @@ namespace TYPO3\CMS\Install;
* GNU General Public License for more details.
*
* This copyright notice MUST APPEAR in all copies of the script!
+ *
***************************************************************/
/**
* Encapsulate install tool specific bootstrap methods.
@@ -95,7 +96,7 @@ class InstallBootstrap {
* @return void
*/
static protected function dieWithLockedInstallToolMessage() {
- require_once PATH_site . 't3lib/class.t3lib_parsehtml.php';
+ require_once PATH_site . 'typo3/sysext/core/Classes/Html/HtmlParser.php';
// Define the stylesheet
$stylesheet = '<link rel="stylesheet" type="text/css" href="' . '../stylesheets/install/install.css" />';
$javascript = '<script type="text/javascript" src="' . '../contrib/prototype/prototype.js"></script>';
diff --git a/typo3/sysext/install/Classes/Installer.php b/typo3/sysext/install/Classes/Installer.php
index 455d93866624..b6eaba340a1c 100644
--- a/typo3/sysext/install/Classes/Installer.php
+++ b/typo3/sysext/install/Classes/Installer.php
@@ -387,7 +387,7 @@ class Installer {
if ($this->redirect_url) {
\TYPO3\CMS\Core\Utility\HttpUtility::redirect($this->redirect_url);
}
- $this->formProtection = \t3lib_formProtection_Factory::get('TYPO3\\CMS\\Core\\FormProtection\\InstallToolFormProtection');
+ $this->formProtection = \TYPO3\CMS\Core\FormProtection\FormProtectionFactory::get('TYPO3\\CMS\\Core\\FormProtection\\InstallToolFormProtection');
$this->formProtection->injectInstallTool($this);
} else {
$this->loginForm();
diff --git a/typo3/sysext/install/Classes/Session.php b/typo3/sysext/install/Classes/Session.php
index 52aa1d679e4c..82e38db74b19 100644
--- a/typo3/sysext/install/Classes/Session.php
+++ b/typo3/sysext/install/Classes/Session.php
@@ -367,8 +367,8 @@ class Session {
* Writes the session data in a proper context that is not affected by the APC bug:
* http://pecl.php.net/bugs/bug.php?id=16721.
*
- * This behaviour was introduced in #17511, where self::write() made use of t3lib_div
- * which due to the APC bug throws a "Fatal error: Class 't3lib_div' not found"
+ * This behaviour was introduced in #17511, where self::write() made use of GeneralUtility
+ * which due to the APC bug throws a "Fatal error: Class 'GeneralUtility' not found"
* (and the session data is not saved). Calling session_write_close() at this point
* seems to be the most easy solution, according to PHP author.
*
diff --git a/typo3/sysext/install/Classes/Sql/SchemaMigrator.php b/typo3/sysext/install/Classes/Sql/SchemaMigrator.php
index 1f9fb038ad3e..a50a4cdd68e4 100644
--- a/typo3/sysext/install/Classes/Sql/SchemaMigrator.php
+++ b/typo3/sysext/install/Classes/Sql/SchemaMigrator.php
@@ -26,6 +26,7 @@ namespace TYPO3\CMS\Install\Sql;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
* Verify TYPO3 DB table structure. Mainly used in install tool
* compare wizard and extension manager.
@@ -693,7 +694,7 @@ class SchemaMigrator {
* Returns list of tables in the database
*
* @return array List of tables.
- * @see t3lib_db::admin_get_tables()
+ * @see \TYPO3\CMS\Core\Database\DatabaseConnection::admin_get_tables()
*/
public function getListOfTables() {
$whichTables = $GLOBALS['TYPO3_DB']->admin_get_tables(TYPO3_db);
diff --git a/typo3/sysext/install/Classes/Updates/AbstractUpdate.php b/typo3/sysext/install/Classes/Updates/AbstractUpdate.php
index af18dccd6467..71671343ae76 100644
--- a/typo3/sysext/install/Classes/Updates/AbstractUpdate.php
+++ b/typo3/sysext/install/Classes/Updates/AbstractUpdate.php
@@ -53,7 +53,7 @@ abstract class AbstractUpdate {
/**
* current TYPO3 version number, set from outside
- * version number coming from t3lib_utility_VersionNumber::convertVersionNumberToInteger()
+ * version number coming from \TYPO3\CMS\Core\Utility\VersionNumberUtility::convertVersionNumberToInteger()
*/
public $versionNumber;
diff --git a/typo3/sysext/install/Classes/Updates/FilemountUpdateWizard.php b/typo3/sysext/install/Classes/Updates/FilemountUpdateWizard.php
index 61b97b9e7c56..ab193cb97de6 100644
--- a/typo3/sysext/install/Classes/Updates/FilemountUpdateWizard.php
+++ b/typo3/sysext/install/Classes/Updates/FilemountUpdateWizard.php
@@ -41,7 +41,7 @@ class FilemountUpdateWizard extends \TYPO3\CMS\Install\Updates\AbstractUpdate {
protected $title = 'Migrate existing filemounts to be file abstraction layer compatible.';
/**
- * @var t3lib_db
+ * @var \TYPO3\CMS\Core\Database\DatabaseConnection
*/
protected $db;
diff --git a/typo3/sysext/lang/Classes/ViewHelpers/Be/ContainerViewHelper.php b/typo3/sysext/lang/Classes/ViewHelpers/Be/ContainerViewHelper.php
index 3762b63502cb..b5d847ce16c3 100644
--- a/typo3/sysext/lang/Classes/ViewHelpers/Be/ContainerViewHelper.php
+++ b/typo3/sysext/lang/Classes/ViewHelpers/Be/ContainerViewHelper.php
@@ -65,7 +65,7 @@ class ContainerViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBacken
* @param array $addJsInlineLabels Custom labels to add to JavaScript inline labels
* @return string
* @see template
- * @see t3lib_PageRenderer
+ * @see \TYPO3\CMS\Core\Page\PageRenderer
*/
public function render($pageTitle = '', $enableJumpToUrl = TRUE, $enableClickMenu = TRUE, $loadPrototype = TRUE, $loadScriptaculous = FALSE, $scriptaculousModule = '', $loadExtJs = FALSE, $loadExtJsTheme = TRUE, $extJsAdapter = '', $enableExtJsDebug = FALSE, $loadJQuery = FALSE, $addCssFiles = NULL, $addJsFiles = NULL, $addJsInlineLabels = NULL) {
$doc = $this->getDocInstance();
diff --git a/typo3/sysext/lang/locallang_core.xlf b/typo3/sysext/lang/locallang_core.xlf
index 76354570f924..645e5cb8d028 100644
--- a/typo3/sysext/lang/locallang_core.xlf
+++ b/typo3/sysext/lang/locallang_core.xlf
@@ -943,7 +943,7 @@ Check also the following points:\n
<source>Extension "%s" is not installed.</source>
</trans-unit>
<trans-unit id="link.to.dblist.correctly" xml:space="preserve">
- <source>Please, do not link to this page. Use t3lib_BEfunc::getListViewLink() for link generation.</source>
+ <source>Please, do not link to this page. Use \TYPO3\CMS\Backend\Utility\BackendUtility::getListViewLink() for link generation.</source>
</trans-unit>
<trans-unit id="link.to.filefile.correctly" xml:space="preserve">
<source>Please, do not link to this page.</source>
diff --git a/typo3/sysext/lowlevel/Classes/DoubleFilesCommand.php b/typo3/sysext/lowlevel/Classes/DoubleFilesCommand.php
index 733076fb4903..f1f81198e6de 100644
--- a/typo3/sysext/lowlevel/Classes/DoubleFilesCommand.php
+++ b/typo3/sysext/lowlevel/Classes/DoubleFilesCommand.php
@@ -75,7 +75,8 @@ This will check the system for double files relations.';
/**
* Find managed files which are referred to more than one time
- * Fix methods: API in t3lib_refindex that allows to change the value of a reference (we could copy the file) or remove reference
+ * Fix methods: API in \TYPO3\CMS\Core\Database\ReferenceIndex that allows to
+ * change the value of a reference (we could copy the file) or remove reference
*
* @return array
* @todo Define visibility
diff --git a/typo3/sysext/lowlevel/Classes/MissingFilesCommand.php b/typo3/sysext/lowlevel/Classes/MissingFilesCommand.php
index 583017a67735..a5987ecebea4 100644
--- a/typo3/sysext/lowlevel/Classes/MissingFilesCommand.php
+++ b/typo3/sysext/lowlevel/Classes/MissingFilesCommand.php
@@ -76,7 +76,8 @@ This will show you missing files in the TYPO3 system and only report back if err
/**
* Find file references that points to non-existing files in system
- * Fix methods: API in t3lib_refindex that allows to change the value of a reference (or remove it)
+ * Fix methods: API in \TYPO3\CMS\Core\Database\ReferenceIndex that allows to
+ * change the value of a reference (or remove it)
*
* @return array
* @todo Define visibility
diff --git a/typo3/sysext/lowlevel/Classes/MissingRelationsCommand.php b/typo3/sysext/lowlevel/Classes/MissingRelationsCommand.php
index 4442d241d21f..3bea2b14182e 100644
--- a/typo3/sysext/lowlevel/Classes/MissingRelationsCommand.php
+++ b/typo3/sysext/lowlevel/Classes/MissingRelationsCommand.php
@@ -78,7 +78,8 @@ Reports missing relations';
/**
* Find relations pointing to non-existing records
- * Fix methods: API in t3lib_refindex that allows to change the value of a reference (or remove it) [Only for managed relations!]
+ * Fix methods: API in \TYPO3\CMS\Core\Database\ReferenceIndex that allows to
+ * change the value of a reference (or remove it) [Only for managed relations!]
*
* @return array
* @todo Define visibility
diff --git a/typo3/sysext/lowlevel/Classes/RteImagesCommand.php b/typo3/sysext/lowlevel/Classes/RteImagesCommand.php
index bf8c21f358ee..126819f47940 100644
--- a/typo3/sysext/lowlevel/Classes/RteImagesCommand.php
+++ b/typo3/sysext/lowlevel/Classes/RteImagesCommand.php
@@ -76,7 +76,8 @@ Reports problems with RTE images';
/**
* Analyse situation with RTE magic images. (still to define what the most useful output is).
- * Fix methods: API in t3lib_refindex that allows to change the value of a reference (we could copy the files) or remove reference
+ * Fix methods: API in \TYPO3\CMS\Core\Database\ReferenceIndex that allows to
+ * change the value of a reference (we could copy the files) or remove reference
*
* @return array
* @todo Define visibility
diff --git a/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php b/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php
index 69664921131f..da40ce748c8d 100644
--- a/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php
+++ b/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php
@@ -291,7 +291,7 @@ class DatabaseIntegrityView {
$functionUrl = \TYPO3\CMS\Backend\Utility\BackendUtility::getModuleUrl('tools_dbint') . '&SET[function]=' . $modFunc;
$title = $GLOBALS['LANG']->getLL($modFunc);
$description = $GLOBALS['LANG']->getLL($modFunc . '_description');
- $icon = '<img src="' . \t3lib_iconworks::skinImg($GLOBALS['BACK_PATH'], 'MOD:tools_dbint/db.gif', '', 1) . '" width="16" height="16" title="' . $title . '" alt="' . $title . '" />';
+ $icon = '<img src="' . \TYPO3\CMS\Backend\Utility\IconUtility::skinImg($GLOBALS['BACK_PATH'], 'MOD:tools_dbint/db.gif', '', 1) . '" width="16" height="16" title="' . $title . '" alt="' . $title . '" />';
$content .= '
<dt><a href="' . htmlspecialchars($functionUrl) . '">' . $icon . $title . '</a></dt>
<dd>' . $description . '</dd>
diff --git a/typo3/sysext/lowlevel/HOWTO_clean_up_TYPO3_installations.txt b/typo3/sysext/lowlevel/HOWTO_clean_up_TYPO3_installations.txt
index 2d6039b2b485..bc1089cab09f 100644
--- a/typo3/sysext/lowlevel/HOWTO_clean_up_TYPO3_installations.txt
+++ b/typo3/sysext/lowlevel/HOWTO_clean_up_TYPO3_installations.txt
@@ -182,4 +182,4 @@ STEP2: Build your cleaner class:
STEP3: Develop your tool to do something...
- You should now be able to see your tool appear in the list of tools and you should see output from it when you choose it.
- Make sure to study the bundled tools from EXT:lowlevel/clmods/. Try to deliver the same high quality of documentation and coding style from there. In particular how the constructor is used to set help-message information.
-- Also, take a look at t3lib_cli which is the very base class - you can use the functions in there in your script.
+- Also, take a look at \TYPO3\CMS\Backend\Clipboard\Clipboard which is the very base class - you can use the functions in there in your script.
\ No newline at end of file
diff --git a/typo3/sysext/openid/Classes/OpenidService.php b/typo3/sysext/openid/Classes/OpenidService.php
index 188e68290144..7285bff717ed 100644
--- a/typo3/sysext/openid/Classes/OpenidService.php
+++ b/typo3/sysext/openid/Classes/OpenidService.php
@@ -55,8 +55,8 @@ class OpenidService extends \TYPO3\CMS\Core\Service\AbstractService {
protected $loginData = array();
/**
- * Additional authentication information provided by t3lib_userAuth. We use
- * it to decide what database table contains user records.
+ * Additional authentication information provided by \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication.
+ * We use it to decide what database table contains user records.
*/
protected $authenticationInformation = array();
@@ -69,14 +69,14 @@ class OpenidService extends \TYPO3\CMS\Core\Service\AbstractService {
* OpenID response object. It is initialized when OpenID provider returns
* with success/failure response to us.
*
- * @var Auth_OpenID_ConsumerResponse
+ * @var \Auth_OpenID_ConsumerResponse
*/
protected $openIDResponse = NULL;
/**
* A reference to the calling object
*
- * @var t3lib_userAuth
+ * @var \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication
*/
protected $parentObject;
@@ -126,11 +126,11 @@ class OpenidService extends \TYPO3\CMS\Core\Service\AbstractService {
/**
* Initializes authentication for this service.
*
- * @param string $subType: Subtype for authentication (either "getUserFE" or "getUserBE")
- * @param array $loginData: Login data submitted by user and preprocessed by t3lib/class.t3lib_userauth.php
- * @param array $authenticationInformation: Additional TYPO3 information for authentication services (unused here)
- * @param t3lib_userAuth $parentObject: Calling object
- * @return void
+ * @param string $subType: Subtype for authentication (either "getUserFE" or "getUserBE")
+ * @param array $loginData: Login data submitted by user and preprocessed by AbstractUserAuthentication
+ * @param array $authenticationInformation: Additional TYPO3 information for authentication services (unused here)
+ * @param \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication $parentObject Calling object
+ * @return void
*/
public function initAuth($subType, array $loginData, array $authenticationInformation, \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication &$parentObject) {
// Store login and authetication data
@@ -148,8 +148,8 @@ class OpenidService extends \TYPO3\CMS\Core\Service\AbstractService {
}
/**
- * This function returns the user record back to the t3lib_userAuth. it does not
- * mean that user is authenticated, it means only that user is found. This
+ * This function returns the user record back to the \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication.
+ * It does not mean that user is authenticated, it means only that user is found. This
* function makes sure that user cannot be authenticated by any other service
* if user tries to use OpenID to authenticate.
*
@@ -194,9 +194,8 @@ class OpenidService extends \TYPO3\CMS\Core\Service\AbstractService {
/**
* Authenticates user using OpenID.
*
- * @param array $userRecord User record
- * @return int Code that shows if user is really authenticated.
- * @see t3lib_userAuth::checkAuthentication()
+ * @param array $userRecord User record
+ * @return int Code that shows if user is really authenticated.
*/
public function authUser(array $userRecord) {
$result = 100;
diff --git a/typo3/sysext/openid/sv1/class.tx_openid_sv1.php b/typo3/sysext/openid/sv1/class.tx_openid_sv1.php
index 68642df25b1a..6b0aa8ffb249 100644
--- a/typo3/sysext/openid/sv1/class.tx_openid_sv1.php
+++ b/typo3/sysext/openid/sv1/class.tx_openid_sv1.php
@@ -21,12 +21,15 @@
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
-require_once PATH_t3lib . 'class.t3lib_svbase.php';
+
+// @TODO: Find out if we still need those requires
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('core') . 'Classes/Service/AbstractService.php';
require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('openid', 'sv1/class.tx_openid_store.php');
+
/*
* @deprecated since 6.0, the classname tx_openid_sv1 and this file is obsolete
* and will be removed with 6.2. The class was renamed and is now located at:
* typo3/sysext/openid/Classes/OpenidService.php
*/
require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('openid') . 'Classes/OpenidService.php';
-?>
\ No newline at end of file
+?>
diff --git a/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php b/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php
index 69536b04c33e..2399ed0506b8 100644
--- a/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php
+++ b/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php
@@ -204,7 +204,7 @@ class ElementBrowser {
protected $hookObjects = array();
/**
- * object for t3lib_basicFileFunctions
+ * @var \TYPO3\CMS\Core\Utility\File\BasicFileUtility
*/
public $fileProcessor;
diff --git a/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php b/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php
index 6f20405e43ae..ec955891df95 100644
--- a/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php
+++ b/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php
@@ -920,12 +920,13 @@ class AbstractDatabaseRecordList extends \TYPO3\CMS\Backend\RecordList\AbstractR
}
/**
- * Creates an instance of t3lib_pageTree which will select a page tree to $depth and return the object. In that object we will find the ids of the tree.
+ * Creates an instance of \TYPO3\CMS\Backend\Tree\View\PageTreeView which will select a page
+ * tree to $depth and return the object. In that object we will find the ids of the tree.
*
* @param integer $id Page id.
* @param integer $depth Depth to go down.
* @param string $perms_clause Select clause
- * @return object t3lib_pageTree instance with created list of ids.
+ * @return \TYPO3\CMS\Backend\Tree\View\PageTreeView instance with created list of ids.
* @todo Define visibility
*/
public function getTreeObject($id, $depth, $perms_clause) {
diff --git a/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php b/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
index 3e17c62cfd2e..ec7a23098d4e 100644
--- a/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
+++ b/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
@@ -198,7 +198,7 @@ class DatabaseRecordList extends \TYPO3\CMS\Recordlist\RecordList\AbstractDataba
if (!$GLOBALS['SOBE']->modTSconfig['properties']['noCreateRecordsLink']) {
$buttons['new_record'] = '<a href="#" onclick="' . htmlspecialchars(('return jumpExt(\'' . $this->backPath . 'db_new.php?id=' . $this->id . '\');')) . '" title="' . $GLOBALS['LANG']->getLL('newRecordGeneral', TRUE) . '">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-document-new') . '</a>';
}
- // If edit permissions are set (see class.t3lib_userauthgroup.php)
+ // If edit permissions are set, see \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
if ($localCalcPerms & 2 && !empty($this->id)) {
// Edit
$params = '&edit[pages][' . $this->pageRow['uid'] . ']=edit';
diff --git a/typo3/sysext/recycler/Classes/Controller/RecyclerModuleController.php b/typo3/sysext/recycler/Classes/Controller/RecyclerModuleController.php
index 1b90b084201e..6b1a8f54f067 100644
--- a/typo3/sysext/recycler/Classes/Controller/RecyclerModuleController.php
+++ b/typo3/sysext/recycler/Classes/Controller/RecyclerModuleController.php
@@ -48,7 +48,7 @@ class RecyclerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
protected $recordsPageLimit = 50;
/**
- * @var t3lib_pageRenderer
+ * @var \TYPO3\CMS\Core\Page\PageRenderer
*/
protected $pageRenderer;
@@ -229,7 +229,6 @@ class RecyclerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
);
// SAVE button
$buttons['save'] = '';
- //<input type="image" class="c-inputButton" name="submit" value="Update"' . t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], 'gfx/savedok.gif', '') . ' title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveDoc', 1) . '" />';
return $buttons;
}
diff --git a/typo3/sysext/recycler/Classes/Domain/Model/DeletedRecords.php b/typo3/sysext/recycler/Classes/Domain/Model/DeletedRecords.php
index 8453b6b446bf..c4dde1cfc2b8 100644
--- a/typo3/sysext/recycler/Classes/Domain/Model/DeletedRecords.php
+++ b/typo3/sysext/recycler/Classes/Domain/Model/DeletedRecords.php
@@ -309,7 +309,6 @@ class DeletedRecords {
* @return boolean
*/
public function undeleteData($recordsArray, $recursive = FALSE) {
- require_once PATH_t3lib . 'class.t3lib_tcemain.php';
$result = FALSE;
$depth = 999;
$recordsArray = json_decode($recordsArray);
diff --git a/typo3/sysext/reports/Classes/ViewHelpers/IconViewHelper.php b/typo3/sysext/reports/Classes/ViewHelpers/IconViewHelper.php
index eb1a7a5a9101..a59fd6ab2093 100644
--- a/typo3/sysext/reports/Classes/ViewHelpers/IconViewHelper.php
+++ b/typo3/sysext/reports/Classes/ViewHelpers/IconViewHelper.php
@@ -45,11 +45,11 @@ class IconViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackendView
} else {
$icon = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('reports') . 'Resources/Public/moduleicon.gif';
}
- $content = '<img' . \t3lib_iconworks::skinImg($GLOBALS['BACK_PATH'], $icon, 'width="16" height="16"') . ' title="' . htmlspecialchars($title) . '" alt="' . htmlspecialchars($title) . '" />';
+ $content = '<img' . \TYPO3\CMS\Backend\Utility\IconUtility::skinImg($GLOBALS['BACK_PATH'], $icon, 'width="16" height="16"') . ' title="' . htmlspecialchars($title) . '" alt="' . htmlspecialchars($title) . '" />';
return $content;
}
}
-?>
\ No newline at end of file
+?>
diff --git a/typo3/sysext/rtehtmlarea/Classes/BrowseLinks.php b/typo3/sysext/rtehtmlarea/Classes/BrowseLinks.php
index 2bb5377154dc..d202cebc2e8d 100644
--- a/typo3/sysext/rtehtmlarea/Classes/BrowseLinks.php
+++ b/typo3/sysext/rtehtmlarea/Classes/BrowseLinks.php
@@ -167,7 +167,7 @@ class BrowseLinks extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
}
/**
- * Initialize hook objects implementing interface t3lib_browseLinksHook
+ * Initialize hook objects implementing the interface
*
* @param string $hookKey: the hook key
* @return void
diff --git a/typo3/sysext/rtehtmlarea/Classes/Controller/SpellCheckingController.php b/typo3/sysext/rtehtmlarea/Classes/Controller/SpellCheckingController.php
index a086aa68f3a9..dc4758deb0bd 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Controller/SpellCheckingController.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Controller/SpellCheckingController.php
@@ -30,7 +30,9 @@ namespace TYPO3\CMS\Rtehtmlarea\Controller;
*/
class SpellCheckingController {
- // Instance of t3lib_cs
+ /**
+ * @var \TYPO3\CMS\Core\Charset\CharsetConverter
+ */
protected $csConvObj;
// The extension key
diff --git a/typo3/sysext/rtehtmlarea/Classes/SelectImage.php b/typo3/sysext/rtehtmlarea/Classes/SelectImage.php
index f4306495ea64..5a89304a72e2 100644
--- a/typo3/sysext/rtehtmlarea/Classes/SelectImage.php
+++ b/typo3/sysext/rtehtmlarea/Classes/SelectImage.php
@@ -73,12 +73,10 @@ class SelectImage extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
protected $imgObj;
- // Instance object of t3lib_stdGraphic
/**
* Initialisation
*
- * @return void
- * @todo Define visibility
+ * @return void
*/
public function init() {
$this->initVariables();
@@ -150,7 +148,7 @@ class SelectImage extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
}
/**
- * Initialize hook objects implementing interface t3lib_browseLinksHook
+ * Initialize hook objects implementing the hook interface
*
* @return void
*/
diff --git a/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php b/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php
index 14a9aeccc0c5..52ca566a6b1b 100644
--- a/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php
+++ b/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php
@@ -262,7 +262,6 @@ class SaltedPasswordService extends \TYPO3\CMS\Sv\AbstractAuthenticationService
* @see sprintf()
* @see t3lib::divLog()
* @see \TYPO3\CMS\Core\Utility\GeneralUtility::sysLog()
- * @see t3lib_timeTrack::setTSlogMessage()
* @todo Define visibility
*/
public function writeLogMessage($message) {
diff --git a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
index 84da91d72fa7..3b2334ebd873 100644
--- a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
+++ b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
@@ -1385,7 +1385,7 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
* This method is used to add a message to the internal queue
*
* @param string $message The message itself
- * @param integer $severity Message level (according to t3lib_FlashMessage class constants)
+ * @param integer $severity Message level (according to \TYPO3\CMS\Core\Messaging\FlashMessage class constants)
* @return void
*/
public function addMessage($message, $severity = \TYPO3\CMS\Core\Messaging\FlashMessage::OK) {
diff --git a/typo3/sysext/scheduler/Classes/Example/TestTask.php b/typo3/sysext/scheduler/Classes/Example/TestTask.php
index 77583f80a666..479291b6670a 100644
--- a/typo3/sysext/scheduler/Classes/Example/TestTask.php
+++ b/typo3/sysext/scheduler/Classes/Example/TestTask.php
@@ -69,8 +69,8 @@ class TestTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
$mailBody = 'SCHEDULER TEST-TASK' . LF . '- - - - - - - - - - - - - - - -' . LF . 'UID: ' . $this->taskUid . LF . 'Sitename: ' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'] . LF . 'Site: ' . $site . LF . 'Called by: ' . $calledBy . LF . 'tstamp: ' . date('Y-m-d H:i:s') . ' [' . time() . ']' . LF . 'maxLifetime: ' . $this->scheduler->extConf['maxLifetime'] . LF . 'start: ' . date('Y-m-d H:i:s', $start) . ' [' . $start . ']' . LF . 'end: ' . (empty($end) ? '-' : date('Y-m-d H:i:s', $end) . ' [' . $end . ']') . LF . 'interval: ' . $interval . LF . 'multiple: ' . ($multiple ? 'yes' : 'no') . LF . 'cronCmd: ' . ($cronCmd ? $cronCmd : 'not used');
// Prepare mailer and send the mail
try {
- /** @var $mailer t3lib_mail_message */
- $mailer = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('t3lib_mail_message');
+ /** @var $mailer \TYPO3\CMS\Core\Mail\MailMessage */
+ $mailer = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Core\Mail\MailMessage');
$mailer->setFrom(array($this->email => 'SCHEDULER TEST-TASK'));
$mailer->setReplyTo(array($this->email => 'SCHEDULER TEST-TASK'));
$mailer->setSubject('SCHEDULER TEST-TASK');
diff --git a/typo3/sysext/setup/Classes/Controller/SetupModuleController.php b/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
index 836818539872..e4abcf07b9b3 100644
--- a/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
+++ b/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
@@ -123,7 +123,7 @@ class SetupModuleController {
* Instanciate the form protection before a simulated user is initialized.
*/
public function __construct() {
- $this->formProtection = \t3lib_formProtection_Factory::get();
+ $this->formProtection = \TYPO3\CMS\Core\FormProtection\FormProtectionFactory::get();
}
/**
diff --git a/typo3/sysext/sv/Classes/AbstractAuthenticationService.php b/typo3/sysext/sv/Classes/AbstractAuthenticationService.php
index da3acdf37f89..cb84e0d2a14f 100644
--- a/typo3/sysext/sv/Classes/AbstractAuthenticationService.php
+++ b/typo3/sysext/sv/Classes/AbstractAuthenticationService.php
@@ -142,7 +142,6 @@ class AbstractAuthenticationService extends \TYPO3\CMS\Core\Service\AbstractServ
* @param integer $recuid Special field used by tce_main.php. These ($tablename, $recuid, $recpid) holds the reference to the record which the log-entry is about. (Was used in attic status.php to update the interface.)
* @param integer $recpid Special field used by tce_main.php. These ($tablename, $recuid, $recpid) holds the reference to the record which the log-entry is about. (Was used in attic status.php to update the interface.)
* @return void
- * @see t3lib_beUserAuth::writelog()
* @todo Define visibility
*/
public function writelog($type, $action, $error, $details_nr, $details, $data, $tablename = '', $recuid = '', $recpid = '') {
diff --git a/typo3/sysext/sv/Classes/AuthenticationService.php b/typo3/sysext/sv/Classes/AuthenticationService.php
index d1b58b12b458..09c2314dfcc9 100644
--- a/typo3/sysext/sv/Classes/AuthenticationService.php
+++ b/typo3/sysext/sv/Classes/AuthenticationService.php
@@ -212,7 +212,8 @@ class AuthenticationService extends \TYPO3\CMS\Sv\AbstractAuthenticationService
/**
* Fetches subgroups of groups. Function is called recursively for each subgroup.
- * Function was previously copied from t3lib_beUserAuth->fetchGroups and has been slightly modified.
+ * Function was previously copied from
+ * \TYPO3\CMS\Core\Authentication\BackendUserAuthentication->fetchGroups and has been slightly modified.
*
* @param string $grList Commalist of fe_groups uid numbers
* @param string $idList List of already processed fe_groups-uids so the function will not fall into a eternal recursion.
diff --git a/typo3/sysext/sv/class.tx_sv_authbase.php b/typo3/sysext/sv/class.tx_sv_authbase.php
index 36c50e57dba8..544974573273 100644
--- a/typo3/sysext/sv/class.tx_sv_authbase.php
+++ b/typo3/sysext/sv/class.tx_sv_authbase.php
@@ -24,16 +24,20 @@
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
+// @TODO: Find out if we still need this require
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('core') . 'Classes/Service/AbstractService.php';
+
/**
* Service base class for 'User authentication'.
*
* @author René Fritz <r.fritz@colorcube.de>
*/
-require_once PATH_t3lib . 'class.t3lib_svbase.php';
+
/*
* @deprecated since 6.0, the classname tx_sv_authbase and this file is obsolete
* and will be removed with 6.2. The class was renamed and is now located at:
* typo3/sysext/sv/Classes/AbstractAuthenticationService.php
*/
require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('sv') . 'Classes/AbstractAuthenticationService.php';
-?>
\ No newline at end of file
+?>
diff --git a/typo3/sysext/sys_action/Classes/ActionTask.php b/typo3/sysext/sys_action/Classes/ActionTask.php
index 10f85c11d61e..6a2fd15706d0 100644
--- a/typo3/sysext/sys_action/Classes/ActionTask.php
+++ b/typo3/sysext/sys_action/Classes/ActionTask.php
@@ -368,7 +368,7 @@ class ActionTask implements \TYPO3\CMS\Taskcenter\TaskInterface {
$res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('*', 'be_users', 'cruser_id=' . $GLOBALS['BE_USER']->user['uid'] . ' AND createdByAction=' . intval($action['uid']) . \TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('be_users'), '', 'username');
// Render the user records
while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
- $icon = \t3lib_iconworks::getSpriteIconForRecord('be_users', $row, array('title' => 'uid=' . $row['uid']));
+ $icon = \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIconForRecord('be_users', $row, array('title' => 'uid=' . $row['uid']));
$line = $icon . $this->action_linkUserName($row['username'], $row['realName'], $action['uid'], $row['uid']);
// Selected user
if ($row['uid'] == $selectedUser) {
@@ -664,7 +664,7 @@ class ActionTask implements \TYPO3\CMS\Taskcenter\TaskInterface {
'description' => \TYPO3\CMS\Backend\Utility\BackendUtility::getRecordTitle($el['table'], $dbAnalysis->results[$el['table']][$el['id']]),
'descriptionHtml' => $description,
'link' => $GLOBALS['BACK_PATH'] . 'alt_doc.php?returnUrl=' . rawurlencode(\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('REQUEST_URI')) . '&edit[' . $el['table'] . '][' . $el['id'] . ']=edit',
- 'icon' => \t3lib_iconworks::getSpriteIconForRecord($el['table'], $dbAnalysis->results[$el['table']][$el['id']], array('title' => htmlspecialchars($path)))
+ 'icon' => \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIconForRecord($el['table'], $dbAnalysis->results[$el['table']][$el['id']], array('title' => htmlspecialchars($path)))
);
}
// Render the record list
diff --git a/typo3/sysext/t3editor/Classes/Hook/TypoScriptTemplateInfoHook.php b/typo3/sysext/t3editor/Classes/Hook/TypoScriptTemplateInfoHook.php
index aa42aca2215d..749eec3e5ea9 100644
--- a/typo3/sysext/t3editor/Classes/Hook/TypoScriptTemplateInfoHook.php
+++ b/typo3/sysext/t3editor/Classes/Hook/TypoScriptTemplateInfoHook.php
@@ -125,7 +125,6 @@ class TypoScriptTemplateInfoHook {
// Update template ?
$POST = \TYPO3\CMS\Core\Utility\GeneralUtility::_POST();
if ($POST['submit']) {
- require_once PATH_t3lib . 'class.t3lib_tcemain.php';
// Set the data to be saved
$recData = array();
if (is_array($POST['data'])) {
diff --git a/typo3/sysext/t3editor/res/jslib/ts_codecompletion/tscodecompletion.js b/typo3/sysext/t3editor/res/jslib/ts_codecompletion/tscodecompletion.js
index e80689e04846..e07a8679576a 100644
--- a/typo3/sysext/t3editor/res/jslib/ts_codecompletion/tscodecompletion.js
+++ b/typo3/sysext/t3editor/res/jslib/ts_codecompletion/tscodecompletion.js
@@ -105,7 +105,7 @@ var TsCodeCompletion = function(codeMirror, outerdiv) {
* loads the array of registered codecompletion plugins
* to register a plugin you have to add an array to the localconf
* $TYPO3_CONF_VARS['EXTCONF']['t3editor']['plugins'][] = array(
- * 'extpath' => t3lib_div::getIndpEnv('TYPO3_SITE_URL').t3lib_extMgm::siteRelPath($_EXTKEY),
+ * 'extpath' => \TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_SITE_URL') . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($_EXTKEY),
* 'classpath' => 'js/my_plugin.js',
* 'classname'=> 'MyPlugin'
* );
diff --git a/typo3/sysext/t3editor/res/tsref/tsref.xml b/typo3/sysext/t3editor/res/tsref/tsref.xml
index 7cbbcef926f5..a6f2865536e9 100644
--- a/typo3/sysext/t3editor/res/tsref/tsref.xml
+++ b/typo3/sysext/t3editor/res/tsref/tsref.xml
@@ -293,7 +293,7 @@ This will by default add "&MP=2-207" to all links pointing to pages 36,37 and 48
<property name="MP_mapRootPoints" type="string">
<description><![CDATA[list of PIDs/string
Defines a list of ID numbers from which the MP-vars are automatically calculated for the branch.
-The result is used just like MP_defaults are used to find MP-vars if none has been specified prior to the call to t3lib_tstemplate::linkData().
+The result is used just like MP_defaults are used to find MP-vars if none has been specified prior to the call to \TYPO3\CMS\Core\TypoScript\TemplateService::linkData().
You can specify "root" as a special keyword in the list of IDs and that will create a map-tree for the whole site (but this may be VERY processing intensive if there are many pages!).
The order of IDs specified may have a significance; Any ID in a branch which is processed already (by a previous ID root point) will not be processed again.]]></description>
<default><![CDATA[
@@ -758,7 +758,7 @@ Please take note that this tag is required for XHTML compliant output, so you sh
</property>
<property name="noScaleUp" type="boolean">
<description><![CDATA[Normally images are scaled to the size specified via TypoScript. This also forces small images to be scaled to a larger size. This is not always a good thing.
-If this property is set, images are not allowed to be scaled up in size. This parameter clears the $this->mayScaleUp var of the class t3lib_stdgraphics (often "gifbuilder").]]></description>
+If this property is set, images are not allowed to be scaled up in size. This parameter clears the $this->mayScaleUp var of the class \TYPO3\CMS\Core\Imaging\GraphicalFunctions (often "gifbuilder").]]></description>
<default><![CDATA[
]]></default>
</property>
@@ -801,7 +801,7 @@ is set in localconf.php.]]></description>
</property>
<property name="pageRendererTemplateFile" type="string">
<description><![CDATA[
- Sets the template for page renderer class (t3lib_PageRenderer).
+ Sets the template for page renderer class (\TYPO3\CMS\Core\Page\PageRenderer).
Example:
@@ -884,7 +884,7 @@ Note: TYPO3 comes with a built-in concatenation handler, but you can also regist
Example:
-$GLOBALS['TYPO3_CONF_VARS']['FE']['jsConcatenateHandler'] = t3lib_extMgm::extPath($_EXTKEY) . 'Classes/class.tx_myext_jsConcatenateHandler.php:tx_myext_jsConcatenateHandler->concatenateJs';]]></description>
+$GLOBALS['TYPO3_CONF_VARS']['FE']['jsConcatenateHandler'] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'Classes/class.tx_myext_jsConcatenateHandler.php:tx_myext_jsConcatenateHandler->concatenateJs';]]></description>
<default><![CDATA[false]]></default>
</property>
<property name="concatenateCss" type="boolean">
@@ -898,7 +898,7 @@ Note: TYPO3 comes with a built-in concatenation handler, but you can also regist
Example:
-$GLOBALS['TYPO3_CONF_VARS']['FE']['cssConcatenateHandler'] = t3lib_extMgm::extPath($_EXTKEY) . 'Classes/class.tx_myext_cssConcatenateHandler.php:tx_myext_cssConcatenateHandler->concatenateCss';]]></description>
+$GLOBALS['TYPO3_CONF_VARS']['FE']['cssConcatenateHandler'] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'Classes/class.tx_myext_cssConcatenateHandler.php:tx_myext_cssConcatenateHandler->concatenateCss';]]></description>
<default><![CDATA[false]]></default>
</property>
<property name="renderCharset" type="string">
@@ -1151,7 +1151,7 @@ What it does NOT do (yet) according to XHTML specs.:
- ampersands (and entities in general I think) MUST be converted to an entity reference! (&s;). This may mean further conversion of non-tag content before output to page. May be related to the charset issue as a whole.
- Minimized values not allowed: Must do this: selected="selected"
-Please see the class t3lib_parsehtml for details.
+Please see the class \TYPO3\CMS\Core\Html\HtmlParser for details.
You can enable this function by the following values:
all = the content is always processed before it may be stored in cache.
@@ -2418,7 +2418,7 @@ Example:
 10.splitRendering.10 {
  value = 200-380 , 65, 66
  fontSize = 50
-Â Â fontFile = Â t3lib/fonts/nimbus.ttf
+Â Â fontFile = Â typo3/sysext/core/Resources/Private/Font/nimbus.ttf
  xSpaceBefore = 30
 }
 10.splitRendering.20 = highlightWord
@@ -2463,7 +2463,7 @@ Example:
 10.splitRendering.10 {
  value = 200-380 , 65, 66
  fontSize = 50
-Â Â fontFile = Â t3lib/fonts/nimbus.ttf
+Â Â fontFile = Â typo3/sysext/core/Resources/Private/Font/nimbus.ttf
  xSpaceBefore = 30
 }
 10.splitRendering.20 = highlightWord
@@ -3038,7 +3038,7 @@ Basically this shows that
- the fields "header_layout", "bodytext" and "image" are mapped to non-existing fields in the page-record
-- a new field, "sectionIndex_uid" is introduced in the page-record which is detected by the function t3lib_tstemplate->linkData(). If this field is present in a pagerecord, the linkData()-function will prepend a hash-mark and the number of the field.
+- a new field, "sectionIndex_uid" is introduced in the page-record which is detected by the function \TYPO3\CMS\Core\TypoScript\TemplateService->linkData(). If this field is present in a pagerecord, the linkData()-function will prepend a hash-mark and the number of the field.
NOTE:
@@ -4861,8 +4861,8 @@ Is the value "global" then true nesting in relation to other tags marked for "gl
</property>
<property name="prefixLocalAnchors" type="integer">
<description><![CDATA[If the first char is a "#" character (anchor of fx. <a> tags) this will prefix either a relative or absolute path.
-If the value is "1" you will get the absolute path (t3lib_div::getIndpEnv('TYPO3_REQUEST_URL'))
-If the value is "2" you will get the relative path (stripping of t3lib_div::getIndpEnv('TYPO3_SITE_URL'))
+If the value is "1" you will get the absolute path (\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_REQUEST_URL'))
+If the value is "2" you will get the relative path (stripping of \TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_SITE_URL'))
Example:
@@ -7929,7 +7929,7 @@ If set, a clear gif is not used by rather a <div> tag with a style-attribute set
This formatting is useful if the locale is set in advance in the CONFIG-object. See this.
Properties:
-.charset : Can be set to the charset of the output string if you need to convert it to renderCharset. Default is to take the intelligently guessed charset from t3lib_cs.]]></description>
+.charset : Can be set to the charset of the output string if you need to convert it to renderCharset. Default is to take the intelligently guessed charset from \TYPO3\CMS\Core\Charset\CharsetConverter.]]></description>
<default><![CDATA[
]]></default>
</property>
diff --git a/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php b/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
index 6e67d753c552..f32cf982923e 100644
--- a/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
+++ b/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
@@ -226,7 +226,7 @@ class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
$icon = '<img src="' . $icon . '" title="' . $title . '" alt="' . $title . '" />';
}
if (@is_file($icon)) {
- $icon = '<img' . \t3lib_iconworks::skinImg($GLOBALS['BACK_PATH'], $icon, 'width="16" height="16"') . ' title="' . $title . '" alt="' . $title . '" />';
+ $icon = '<img' . \TYPO3\CMS\Backend\Utility\IconUtility::skinImg($GLOBALS['BACK_PATH'], $icon, 'width="16" height="16"') . ' title="' . $title . '" alt="' . $title . '" />';
}
} else {
$icon = $item['icon'];
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
index 40984c0fc5d9..33b2d34eed13 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
@@ -89,9 +89,6 @@ class TypoScriptTemplateModuleController extends \TYPO3\CMS\Backend\Module\BaseS
$this->sObj = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('sObj');
$this->edit = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('edit');
$this->perms_clause = $GLOBALS['BE_USER']->getPagePermsClause(1);
- if (\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('clear_all_cache')) {
- $this->include_once[] = PATH_t3lib . 'class.t3lib_tcemain.php';
- }
}
/**
diff --git a/typo3/sysext/tstemplate_info/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php b/typo3/sysext/tstemplate_info/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php
index 8a07c86cf62a..b96b7d4c08be 100644
--- a/typo3/sysext/tstemplate_info/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php
+++ b/typo3/sysext/tstemplate_info/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php
@@ -134,7 +134,8 @@ class TypoScriptTemplateInformationModuleFunctionController extends \TYPO3\CMS\B
}
/**
- * Create an instance of t3lib_tsparser_ext in $GLOBALS['tmpl'] and looks for the first (visible) template
+ * Create an instance of \TYPO3\CMS\Core\TypoScript\ExtendedTemplateService in
+ * $GLOBALS['tmpl'] and looks for the first (visible) template
* record. If $template_uid was given and greater than zero, this record will be checked.
*
* @param integer $pageId The uid of the current page
diff --git a/typo3/sysext/wizard_crpages/Classes/Controller/CreatePagesWizardModuleFunctionController.php b/typo3/sysext/wizard_crpages/Classes/Controller/CreatePagesWizardModuleFunctionController.php
index 3241c7bb82dc..32f6d5fa6525 100644
--- a/typo3/sysext/wizard_crpages/Classes/Controller/CreatePagesWizardModuleFunctionController.php
+++ b/typo3/sysext/wizard_crpages/Classes/Controller/CreatePagesWizardModuleFunctionController.php
@@ -173,7 +173,7 @@ class CreatePagesWizardModuleFunctionController extends \TYPO3\CMS\Backend\Modul
lineCounter += 5;
});
';
- /** @var t3lib_pageRenderer * */
+ /** @var \TYPO3\CMS\Core\Page\PageRenderer */
$pageRenderer = $GLOBALS['TBE_TEMPLATE']->getPageRenderer();
$pageRenderer->loadExtJS();
$pageRenderer->addExtOnReadyCode($extCode);
diff --git a/typo3/tce_db.php b/typo3/tce_db.php
index f8f6db3a3667..0ac2ae4a2fa3 100644
--- a/typo3/tce_db.php
+++ b/typo3/tce_db.php
@@ -24,9 +24,11 @@
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
* TCE gateway (TYPO3 Core Engine) for database handling
- * This script is a gateway for POST forms to class.t3lib_TCEmain that manipulates all information in the database!!
+ * This script is a gateway for POST forms to \TYPO3\CMS\Core\DataHandling\DataHandler
+ * that manipulates all information in the database!!
* For syntax and API information, see the document 'TYPO3 Core APIs'
*
* Revised for TYPO3 3.6 July/2003 by Kasper Skårhøj
@@ -34,12 +36,14 @@
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
require 'init.php';
+
/*
* @deprecated since 6.0, the classname SC_tce_db and this file is obsolete
* and will be removed with 6.2. The class was renamed and is now located at:
* typo3/sysext/backend/Classes/Controller/SimpleDataHandlerController.php
*/
require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('backend') . 'Classes/Controller/SimpleDataHandlerController.php';
+
// Make instance:
$SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\SimpleDataHandlerController');
$SOBE->init();
@@ -47,10 +51,10 @@ $SOBE->init();
foreach ($SOBE->include_once as $INC_FILE) {
include_once $INC_FILE;
}
-$formprotection = t3lib_formprotection_Factory::get();
+$formprotection = \TYPO3\CMS\Core\FormProtection\FormProtectionFactory::get();
if ($formprotection->validateToken(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('formToken'), 'tceAction')) {
$SOBE->initClipboard();
$SOBE->main();
}
$SOBE->finish();
-?>
\ No newline at end of file
+?>
diff --git a/typo3/thumbs.php b/typo3/thumbs.php
index 487d1cef04a0..af0b6cdde573 100644
--- a/typo3/thumbs.php
+++ b/typo3/thumbs.php
@@ -24,18 +24,21 @@
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
* Generates a thumbnail and returns an image stream, either GIF/PNG or JPG
*
* @author René Fritz <r.fritz@colorcube.de>
*/
+
// Set error reporting
error_reporting(E_ALL & ~(E_STRICT | E_NOTICE | E_DEPRECATED));
require 'init.php';
+
// include thumbs script
require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('backend') . 'Classes/View/ThumbnailView.php';
// Make instance:
$SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\View\\ThumbnailView');
$SOBE->init();
$SOBE->main();
-?>
+?>
\ No newline at end of file
diff --git a/typo3/wizard_tsconfig.php b/typo3/wizard_tsconfig.php
index 062b374768e5..3aa94b6c0464 100644
--- a/typo3/wizard_tsconfig.php
+++ b/typo3/wizard_tsconfig.php
@@ -40,7 +40,7 @@ $GLOBALS['LANG']->includeLLFile('EXT:lang/locallang_wizards.xlf');
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
-class ext_TSparser extends t3lib_tsparser_ext {
+class ext_TSparser extends \TYPO3\CMS\Core\TypoScript\ExtendedTemplateService {
/**
* Pass through of incoming value for link.
--
GitLab