diff --git a/typo3/sysext/core/Classes/Configuration/FlexForm/FlexFormTools.php b/typo3/sysext/core/Classes/Configuration/FlexForm/FlexFormTools.php
index 0202a21055b7528c597e17b366ad3058a0f64c79..4e8b82178e5d74f69e2115afcc2322f129b67ce3 100644
--- a/typo3/sysext/core/Classes/Configuration/FlexForm/FlexFormTools.php
+++ b/typo3/sysext/core/Classes/Configuration/FlexForm/FlexFormTools.php
@@ -222,50 +222,6 @@ class FlexFormTools
return call_user_func_array(array($this->callBackObj, $methodName), $parameterArray);
}
- /**
- * Returns an array of available languages to use for FlexForm operations
- *
- * @return array
- * @deprecated since TYPO3 CMS 7, will be removed with TYPO3 CMS 8
- */
- public function getAvailableLanguages()
- {
- GeneralUtility::logDeprecatedFunction();
- $isL = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('static_info_tables');
- // Find all language records in the system
- $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
- 'language_isocode,static_lang_isocode,title,uid',
- 'sys_language',
- 'pid=0' . BackendUtility::deleteClause('sys_language'),
- '',
- 'title'
- );
- // Traverse them
- $output = array();
- $output[0] = array(
- 'uid' => 0,
- 'title' => 'Default language',
- 'ISOcode' => 'DEF'
- );
- while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
- $output[$row['uid']] = $row;
- if (!empty($row['language_isocode'])) {
- $output[$row['uid']]['ISOcode'] = $row['language_isocode'];
- } elseif ($isL && $row['static_lang_isocode']) {
- \TYPO3\CMS\Core\Utility\GeneralUtility::deprecationLog('Usage of the field "static_lang_isocode" is discouraged, and will stop working with CMS 8. Use the built-in language field "language_isocode" in your sys_language records.');
- $rr = BackendUtility::getRecord('static_languages', $row['static_lang_isocode'], 'lg_iso_2');
- if ($rr['lg_iso_2']) {
- $output[$row['uid']]['ISOcode'] = $rr['lg_iso_2'];
- }
- }
- if (!$output[$row['uid']]['ISOcode']) {
- unset($output[$row['uid']]);
- }
- }
- $GLOBALS['TYPO3_DB']->sql_free_result($res);
- return $output;
- }
-
/***********************************
*
* Processing functions
diff --git a/typo3/sysext/core/Classes/Page/PageRenderer.php b/typo3/sysext/core/Classes/Page/PageRenderer.php
index 3a21791f05bb38910d7bc6e38c9c3f3873f4b00c..bece1e6fab44e738f68a3008c62fdb59e12cb06d 100644
--- a/typo3/sysext/core/Classes/Page/PageRenderer.php
+++ b/typo3/sysext/core/Classes/Page/PageRenderer.php
@@ -1306,7 +1306,7 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
if (empty($filterNamespaces)) {
$filterNamespaces = array('TYPO3');
}
- // @deprecated since TYPO3 CMS 7, will be removed in TYPO3 CMS 8
+ // @deprecated since TYPO3 CMS 7, will be removed in TYPO3 CMS 9
// add compatibility mapping for the old flashmessage API
$this->addJsFile(GeneralUtility::resolveBackPath($this->backPath .
'sysext/backend/Resources/Public/JavaScript/flashmessage_compatibility.js'));
diff --git a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
index 240996f1380f8f7de5fb104341dd7798877062ce..d81170942bfef9cbce45b7e78f29006dcc5e170f 100644
--- a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
+++ b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
@@ -259,19 +259,13 @@ class ExtensionManagementUtility
*
* @param string $table The table name of a table already present in $GLOBALS['TCA'] with a columns section
* @param array $columnArray The array with the additional columns (typical some fields an extension wants to add)
- * @param bool $addTofeInterface DEPRECATED: Usage of feInterface is no longer part of the TYPO3 CMS Core. Please check EXT:statictemplates.
* @return void
*/
- public static function addTCAcolumns($table, $columnArray, $addTofeInterface = false)
+ public static function addTCAcolumns($table, $columnArray)
{
if (is_array($columnArray) && is_array($GLOBALS['TCA'][$table]) && is_array($GLOBALS['TCA'][$table]['columns'])) {
// Candidate for array_merge() if integer-keys will some day make trouble...
$GLOBALS['TCA'][$table]['columns'] = array_merge($GLOBALS['TCA'][$table]['columns'], $columnArray);
- if ($addTofeInterface) {
- GeneralUtility::deprecationLog(
- 'Usage of feInterface is no longer part of the TYPO3 CMS Core. Please check EXT:' . $GLOBALS['_EXTKEY'] . '.'
- );
- }
}
}
@@ -314,8 +308,8 @@ class ExtensionManagementUtility
// Get the palette names used in current showitem
$paletteCount = preg_match_all('/(?:^|,) # Line start or a comma
(?:
- \\s*\\-\\-palette\\-\\-;[^;]*;([^,$]*)| # --palette--;label;paletteName
- \\s*\\b[^;,]+\\b(?:;[^;]*;([^;,]+);?[^;,]*;?)?[^,]* # @deprecated since TYPO3 CMS 7: field;label;paletteName[;options[;colors]]
+ \\s*\\-\\-palette\\-\\-;[^;]*;([^,$]*)| # --palette--;label;paletteName
+ \\s*\\b[^;,]+\\b(?:;[^;]*;([^;,]+))?[^,]* # field;label;paletteName
)/x', $typeDetails['showitem'], $paletteMatches);
if ($paletteCount > 0) {
$paletteNames = array_filter(array_merge($paletteMatches[1], $paletteMatches[2]));
diff --git a/typo3/sysext/core/Configuration/DefaultConfiguration.php b/typo3/sysext/core/Configuration/DefaultConfiguration.php
index db635e48a0472534d835ad9abeddc6d82fd72eb1..7a9595003b9d5204af917acbbc585c8cadcaeed8 100644
--- a/typo3/sysext/core/Configuration/DefaultConfiguration.php
+++ b/typo3/sysext/core/Configuration/DefaultConfiguration.php
@@ -1058,9 +1058,6 @@ return array(
'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)
'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
- 'strictFormmail' => true, // Boolean: If set, the internal "formmail" feature in TYPO3 will send mail ONLY to recipients which has been encoded by the system itself. This protects against spammers misusing the formmailer. This option has been marked as deprecated since TYPO3 CMS 7 and will be removed in TYPO3 CMS 8.
- 'secureFormmail' => true, // Boolean: If set, the internal "formmail" feature in TYPO3 will send mail ONLY to the recipients that are defined in the form CE record. This protects against spammers misusing the formmailer. This option has been marked as deprecated since TYPO3 CMS 7 and will be removed in TYPO3 CMS 8.
- 'formmailMaxAttachmentSize' => 250000, // Integer: Sets the maximum allowed size (in bytes) of attachments for the internal "formmail" feature.This option has been marked as deprecated since TYPO3 CMS 7 and will be removed in TYPO3 CMS 8.
'compressionLevel' => 0, // Integer: Determines output compression of FE output. Makes output smaller but slows down the page generation depending on the compression level. Requires zlib in your PHP installation. Range 1-9, where 1 is least compression and 9 is greatest compression. 'true' as value will set the compression based on the PHP default settings (usually 5). Suggested and most optimal value is 5.
'pageNotFound_handling' => '', // <p>How TYPO3 should handle requests for non-existing/accessible pages.</p> <dl><dt>empty (default)</dt><dd>The next visible page upwards in the page tree is shown.</dd> <dt>'true' or '1'</dt><dd>An error message is shown.</dd><dt>String</dt><dd>Static HTML file to show (reads content and outputs with correct headers), e.g. 'notfound.html' or 'http://www.example.org/errors/notfound.html'.</dd> <dt>Prefix "REDIRECT:"</dt><dd> If prefixed with "REDIRECT:" it will redirect to the URL/script after the prefix.</dd><dt>Prefix "READFILE:"</dt><dd>If prefixed with "READFILE" then it will expect the remaining string to be a HTML file which will be read and outputted directly after having the marker "###CURRENT_URL###" substituted with REQUEST_URI and ###REASON### with reason text, for example: "READFILE:fileadmin/notfound.html".</dd> <dt>Prefix "USER_FUNCTION:"</dt><dd> If prefixed with "USER_FUNCTION:" a user function is called, e.g. "USER_FUNCTION:fileadmin/class.user_notfound.php:user_notFound->pageNotFound" where the file must contain a class "user_notFound" with a method "pageNotFound" inside with two parameters $param and $ref.</dd></dl>
'pageNotFound_handling_statheader' => 'HTTP/1.0 404 Not Found', // If 'pageNotFound_handling' is enabled, this string will always be sent as header before the actual handling.
@@ -1161,8 +1158,6 @@ return array(
'email' => \TYPO3\CMS\Core\Database\SoftReferenceIndex::class,
'url' => \TYPO3\CMS\Core\Database\SoftReferenceIndex::class,
),
- // @deprecated global soft reference parsers are deprecated since TYPO3 CMS 7 and will be removed in TYPO3 CMS 8
- 'softRefParser_GL' => array(),
'cliKeys' => array()
),
),
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-72473-RemovedDeprecatedMiscellaneousFunctions.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-72473-RemovedDeprecatedMiscellaneousFunctions.rst
new file mode 100644
index 0000000000000000000000000000000000000000..489d743222399a09547f10e61121a54996270fee
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/master/Breaking-72473-RemovedDeprecatedMiscellaneousFunctions.rst
@@ -0,0 +1,44 @@
+=============================================================
+Breaking: #72473 - Removed deprecated miscellaneous functions
+=============================================================
+
+Description
+===========
+
+Removed deprecated miscellaneous functions
+
+The following methods have been removed:
+
+``FlexFormTools::getAvailableLanguages``
+``AbstractPlugin::pi_list_searchBox``
+``ImportExportController::printContent``
+``SearchFormController::checkExistance``
+``SearchFormController::checkExistence``
+``SchedulerModuleController::render``
+``SchedulerModuleController::checkDate``
+``SetupModuleController::printContent``
+``TypoScriptTemplateModuleController::printContent``
+``VersionModuleController::printContent``
+
+Last parameter ``addTofeInterface`` for ``ExtensionManagementUtility::addTCAcolumns`` has been removed.
+
+The following options in the Install Tool have been removed:
+
+``FE\strictFormmail``
+``FE\secureFormmail``
+``FE\formmailMaxAttachmentSize``
+``SC_OPTIONS\GLOBAL\softRefParser_GL'``
+
+
+Impact
+======
+
+Using the methods above directly in any third party extension will result in a fatal error.
+
+Using one of the options from the Install Tool won't have any effect anymore.
+
+
+Affected Installations
+======================
+
+Instances which use one of the methods above or use one of the removed Install Tool options.
diff --git a/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php b/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php
index d98b60a8cf68eb24810366bf8a3fc0088e0c9e95..3818ee15e56a2ee13f7e9eca919498ebded7c375 100644
--- a/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php
+++ b/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php
@@ -663,36 +663,6 @@ class AbstractPlugin
return $sTables;
}
- /**
- * Returns a Search box, sending search words to piVars "sword" and setting the "no_cache" parameter as well in the form.
- * Submits the search request to the current REQUEST_URI
- *
- * @param string $tableParams Attributes for the table tag which is wrapped around the table cells containing the search box
- * @return string Output HTML, wrapped in <div>-tags with a class attribute
- * @deprecated since TYPO3 CMS 7, will be removed in TYPO3 CMS 8
- */
- public function pi_list_searchBox($tableParams = '')
- {
- GeneralUtility::logDeprecatedFunction();
- // Search box design:
- $sTables = '
-
- <!--
- List search box:
- -->
- <div' . $this->pi_classParam('searchbox') . '>
- <form action="' . htmlspecialchars(GeneralUtility::getIndpEnv('REQUEST_URI')) . '" method="post" style="margin: 0 0 0 0;">
- <' . rtrim('table ' . $tableParams) . '>
- <tr>
- <td><input type="text" name="' . $this->prefixId . '[sword]" value="' . htmlspecialchars($this->piVars['sword']) . '"' . $this->pi_classParam('searchbox-sword') . ' /></td>
- <td><input type="submit" value="' . $this->pi_getLL('pi_list_searchBox_search', 'Search', true) . '"' . $this->pi_classParam('searchbox-button') . ' />' . '<input type="hidden" name="no_cache" value="1" />' . '<input type="hidden" name="' . $this->prefixId . '[pointer]" value="" />' . '</td>
- </tr>
- </table>
- </form>
- </div>';
- return $sTables;
- }
-
/**
* Returns a mode selector; a little menu in a table normally put in the top of the page/list.
*
diff --git a/typo3/sysext/impexp/Classes/Controller/ImportExportController.php b/typo3/sysext/impexp/Classes/Controller/ImportExportController.php
index 4211179f577d53f252c1787e26a9473d28d26d42..44e01e0e967003e7b72f41abe112f2e93fd4d286 100644
--- a/typo3/sysext/impexp/Classes/Controller/ImportExportController.php
+++ b/typo3/sysext/impexp/Classes/Controller/ImportExportController.php
@@ -190,18 +190,6 @@ class ImportExportController extends BaseScriptClass
$this->content .= '</form>';
}
- /**
- * Print the content
- *
- * @return void
- * @deprecated since TYPO3 CMS 7, will be removed in TYPO3 CMS 8
- */
- public function printContent()
- {
- GeneralUtility::logDeprecatedFunction();
- echo $this->content;
- }
-
/**
* Injects the request object for the current request and gathers all data
*
diff --git a/typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php b/typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php
index 22a853cc7d08ea14f12bab140708226bb42ed2b7..7a656a320835b5b498cd9f2d5c7db54d0de0eb0b 100755
--- a/typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php
@@ -1249,41 +1249,6 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
}
}
- /**
- * Check if the record is still available or if it has been deleted meanwhile.
- * Currently this works for files only, since extending it to page content would cause a lot of overhead.
- *
- * @param array $row Result row array
- * @return bool Returns TRUE if record is still available
- * @deprecated since TYPO3 CMS 7, will be removed in TYPO3 CMS 8
- */
- public function checkExistance($row)
- {
- return $this->checkExistence($row);
- }
-
- /**
- * Check if the record is still available or if it has been deleted meanwhile.
- * Currently this works for files only, since extending it to page content would cause a lot of overhead.
- *
- * @param array $row Result row array
- * @return bool Returns TRUE if record is still available
- * @deprecated since TYPO3 CMS 7, will be removed in TYPO3 CMS 8 (it is not used in the core any more, see #44381)
- */
- protected function checkExistence($row)
- {
- GeneralUtility::logDeprecatedFunction();
- $recordExists = true;
- // Always expect that page content exists
- if ($row['item_type']) {
- // External media:
- if (!is_file($row['data_filename']) || !file_exists($row['data_filename'])) {
- $recordExists = false;
- }
- }
- return $recordExists;
- }
-
/**
* Returns "DESC" or "" depending on the settings of the incoming highest/lowest result order (piVars['desc']
*
diff --git a/typo3/sysext/install/Classes/Service/SilentConfigurationUpgradeService.php b/typo3/sysext/install/Classes/Service/SilentConfigurationUpgradeService.php
index 09deb6a48a63751b2fef7af849d1a12efe593110..cb958884651925750cdaacd8b1e4950967627092 100755
--- a/typo3/sysext/install/Classes/Service/SilentConfigurationUpgradeService.php
+++ b/typo3/sysext/install/Classes/Service/SilentConfigurationUpgradeService.php
@@ -72,6 +72,10 @@ class SilentConfigurationUpgradeService
'BE/spriteIconGenerator_handler',
// #72417
'SYS/lockingMode',
+ // #72473
+ 'FE/secureFormmail',
+ 'FE/strictFormmail',
+ 'FE/formmailMaxAttachmentSize',
);
/**
diff --git a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
index 5c9285dbd30effa1ac60ff3447cebffd41e53d8f..df25ae185d3f20450789ef757544e89ceae71be0 100644
--- a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
+++ b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
@@ -315,18 +315,6 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
return $response;
}
- /**
- * This method actually prints out the module's HTML content
- *
- * @return void
- * @deprecated since TYPO3 CMS 7, will be removed in TYPO3 CMS 8
- */
- public function render()
- {
- GeneralUtility::logDeprecatedFunction();
- echo $this->content;
- }
-
/**
* This method checks the status of the '_cli_scheduler' user
* It will differentiate between a non-existing user and an existing,
@@ -1431,44 +1419,6 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
return $result;
}
- /**
- * This method checks whether the given string can be considered a valid date or not
- * Allowed values are anything that matches natural language (see PHP function strtotime())
- * or TYPO3's date syntax: HH:ii yyyy-mm-dd
- * If the string is a valid date, the corresponding timestamp is returned.
- * Otherwise an exception is thrown
- *
- * @param string $string String to check
- * @return int Unix timestamp
- * @throws \InvalidArgumentException
- * @deprecated since TYPO3 CMS 7, will be removed in CMS 8, as the unified datetime picker with a separate timestamp field is used.
- */
- public function checkDate($string)
- {
- GeneralUtility::logDeprecatedFunction();
- // Try with strtotime
- $timestamp = strtotime($string);
- // That failed. Try TYPO3's standard date/time input format
- if ($timestamp === false) {
- // Split time and date
- $dateParts = GeneralUtility::trimExplode(' ', $string, true);
- // Proceed if there are indeed two parts
- // Extract each component of date and time
- if (count($dateParts) == 2) {
- list($time, $date) = $dateParts;
- list($hour, $minutes) = GeneralUtility::trimExplode(':', $time, true);
- list($day, $month, $year) = GeneralUtility::trimExplode('-', $date, true);
- // Get a timestamp from all these parts
- $timestamp = @mktime($hour, $minutes, 0, $month, $day, $year);
- }
- // If the timestamp is still false, throw an exception
- if ($timestamp === false) {
- throw new \InvalidArgumentException('"' . $string . '" seems not to be a correct date.', 1294587694);
- }
- }
- return $timestamp;
- }
-
/*************************
*
* APPLICATION LOGIC UTILITIES
diff --git a/typo3/sysext/scheduler/Tests/Unit/Controller/SchedulerModuleControllerTest.php b/typo3/sysext/scheduler/Tests/Unit/Controller/SchedulerModuleControllerTest.php
deleted file mode 100644
index 7b88ebd79d1b4e2571b62ac14449209704cfe30f..0000000000000000000000000000000000000000
--- a/typo3/sysext/scheduler/Tests/Unit/Controller/SchedulerModuleControllerTest.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-namespace TYPO3\CMS\Scheduler\Tests\Unit\Controller;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-/**
- * Test case
- */
-class SchedulerModuleControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
-{
- /**
- * @var \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController
- */
- protected $testObject;
-
- /**
- * Sets up each test case.
- *
- * @return void
- */
- protected function setUp()
- {
- $this->testObject = $this->getMock(\TYPO3\CMS\Scheduler\Controller\SchedulerModuleController::class, array('dummy'), array(), '', false);
- }
-
- /**
- * Data provider for checkDateWithStrtotimeValues
- *
- * @see checkDateWithStrtotimeValues
- * @return array Testdata for "checkDateWithStrtotimeValues".
- */
- public function checkDateWithStrtotimeValuesDataProvider()
- {
- return array(
- 'now' => array(
- 'now',
- ),
- '10 September 2000' => array(
- '10 September 2000',
- ),
- '+1 day' => array(
- '+1 day',
- ),
- '+1 week' => array(
- '+1 week',
- ),
- '+1 week 2 days 4 hours 2 seconds' => array(
- '+1 week 2 days 4 hours 2 seconds',
- ),
- 'next Thursday' => array(
- 'next Thursday',
- ),
- 'last Monday' => array(
- 'last Monday',
- )
- );
- }
-
- /**
- * @dataProvider checkDateWithStrtotimeValuesDataProvider
- * @test
- * @see http://de.php.net/manual/de/function.strtotime.php
- * @param string $strToTimeValue Test value which will be passed to $this->testObject->checkDate
- */
- public function checkDateWithStrtotimeValues($strToTimeValue)
- {
- $expectedTimestamp = strtotime($strToTimeValue);
- $checkDateResult = $this->testObject->checkDate($strToTimeValue);
- // We use assertLessThan here, because we test with relative values (eg. next Thursday, now, ..)
- // If this tests runs over 1 seconds the test will fail if we use assertSame / assertEquals
- // With assertLessThan the tests could run 0 till 3 seconds ($delta = 4)
- $delta = 4;
- $this->assertLessThan($delta, $checkDateResult - $expectedTimestamp, 'assertLessThan fails with value "' . $strToTimeValue . '"');
- $this->assertInternalType(\PHPUnit_Framework_Constraint_IsType::TYPE_INT, $checkDateResult, 'assertType fails with value "' . $strToTimeValue . '"');
- }
-
- /**
- * Provides dates in TYPO3 date field formats (non-US), i.e. H:i Y-m-d
- *
- * @see checkDateWithTypo3DateSyntax
- * @return array Test data for "checkDateWithTypo3DateSyntax".
- */
- public function checkDateWithTypo3DateSyntaxDataProvider()
- {
- return array(
- '00:00 2011-05-30' => array(
- '00:00 2011-05-30',
- mktime(0, 0, 0, 5, 30, 2011)
- ),
- '00:01 2011-05-30' => array(
- '00:01 2011-05-30',
- mktime(0, 1, 0, 5, 30, 2011)
- ),
- '23:59 2011-05-30' => array(
- '23:59 2011-05-30',
- mktime(23, 59, 0, 5, 30, 2011)
- ),
- '15:35 2000-12-24' => array(
- '15:35 2000-12-24',
- mktime(15, 35, 0, 12, 24, 2000)
- ),
- '00:01 1970-01-01' => array(
- '00:01 1970-01-01',
- mktime(0, 1, 0, 1, 1, 1970)
- ),
- '17:26 2020-03-15' => array(
- '17:26 2020-03-15',
- mktime(17, 26, 0, 3, 15, 2020)
- ),
- '1:5 2020-03-15' => array(
- '1:5 2020-03-15',
- mktime(1, 5, 0, 3, 15, 2020)
- ),
- '10:50 2020-3-5' => array(
- '10:50 2020-3-5',
- mktime(10, 50, 0, 3, 5, 2020)
- ),
- '01:01 1968-01-01' => array(
- '01:01 1968-01-01',
- mktime(1, 1, 0, 1, 1, 1968)
- )
- );
- }
-
- /**
- * @dataProvider checkDateWithTypo3DateSyntaxDataProvider
- * @test
- * @param string $typo3DateValue Test value which will be passed to $this->testObject->checkDate
- * @param int $expectedTimestamp Expected value to compare with result from operation
- */
- public function checkDateWithTypo3DateSyntax($typo3DateValue, $expectedTimestamp)
- {
- $this->assertSame($expectedTimestamp, $this->testObject->checkDate($typo3DateValue), 'Fails with value "' . $typo3DateValue . '"');
- }
-
- /**
- * Provides some invalid dates
- *
- * @see checkDateWithInvalidDateValues
- * @return array Test data for "checkDateWithInvalidDateValues".
- */
- public function checkDateWithInvalidDateValuesDataProvider()
- {
- return array(
- 'Not Good' => array(
- 'Not Good'
- ),
- 'HH:ii yyyy-mm-dd' => array(
- 'HH:ii yyyy-mm-dd'
- )
- );
- }
-
- /**
- * This test must be raised an InvalidArgumentException
- *
- * @dataProvider checkDateWithInvalidDateValuesDataProvider
- * @expectedException \InvalidArgumentException
- * @test
- * @param string $dateValue Test value which will be passed to $this->testObject->checkDate.
- */
- public function checkDateWithInvalidDateValues($dateValue)
- {
- $this->testObject->checkDate($dateValue);
- }
-}
diff --git a/typo3/sysext/setup/Classes/Controller/SetupModuleController.php b/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
index 49c3b40b5e08a4ab7a906cb61554434f758efd35..61ae7ecc82ada87bca49cd2829e0f21d1da1af96 100644
--- a/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
+++ b/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
@@ -463,18 +463,6 @@ class SetupModuleController extends AbstractModule
return $response;
}
- /**
- * Prints the content / ends page
- *
- * @return void
- * @deprecated since TYPO3 CMS 7, will be removed in TYPO3 CMS 8
- */
- public function printContent()
- {
- GeneralUtility::logDeprecatedFunction();
- echo $this->content;
- }
-
/**
* Create the panel of buttons for submitting the form or otherwise perform operations.
*/
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
index add2244711c674cb78e1686f15708e47d6d81a86..2901f5a2c0bf1e9cb3d206bb71ed5791f5ff33e3 100755
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
@@ -311,18 +311,6 @@ class TypoScriptTemplateModuleController extends BaseScriptClass
return $response;
}
- /**
- * Print content
- *
- * @return void
- * @deprecated since TYPO3 CMS 7, will be removed in TYPO3 CMS 8
- */
- public function printContent()
- {
- GeneralUtility::logDeprecatedFunction();
- echo $this->content;
- }
-
/**
* Create the panel of buttons for submitting the form or otherwise perform operations.
*
diff --git a/typo3/sysext/version/Classes/Controller/VersionModuleController.php b/typo3/sysext/version/Classes/Controller/VersionModuleController.php
index f70b35e848c4aa9d76ae4bfd88e58b10a5942bd6..2a9c643861bce3825a9f95b1b4ea7d0c8584a6a2 100644
--- a/typo3/sysext/version/Classes/Controller/VersionModuleController.php
+++ b/typo3/sysext/version/Classes/Controller/VersionModuleController.php
@@ -222,18 +222,6 @@ class VersionModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
$this->content = $this->doc->insertStylesAndJS($this->content);
}
- /**
- * Outputs accumulated module content to browser.
- *
- * @return void
- * @deprecated since TYPO3 CMS 7, will be removed in TYPO3 CMS 8
- */
- public function printContent()
- {
- GeneralUtility::logDeprecatedFunction();
- echo $this->content;
- }
-
/**
* Create the panel of buttons for submitting the form or otherwise perform operations.
*