diff --git a/Documentation/source/configuration.rst b/Documentation/source/configuration.rst
index 8d18018..1b6ed60 100644
--- a/Documentation/source/configuration.rst
+++ b/Documentation/source/configuration.rst
@@ -211,6 +211,28 @@ Using ``runtime-set``:
--runtime-set removedConstantConfigFiles "/Some/Absolute/Path/*.yaml"
+.. _configuration-removedClassConfigFiles:
+
+removedClassConfigFiles
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Configure where to look for configuration files defining the removed classes. Default is
+``Configuration/Removed/Classes/*.yaml`` inside the standard itself. We already try to deliver as
+much as possible. Globing is used, so placeholders like ``*`` are possible, see
+https://secure.php.net/manual/en/function.glob.php
+
+Using :file:`ruleset.xml`:
+
+.. code:: xml
+
+
+
+Using ``runtime-set``:
+
+.. code:: bash
+
+ --runtime-set removedClassConfigFiles "/Some/Absolute/Path/*.yaml"
+
.. _configuration-removedTypoScriptConfigFiles:
removedTypoScriptConfigFiles
@@ -233,6 +255,28 @@ Using ``runtime-set``:
--runtime-set removedTypoScriptConfigFiles "/Some/Absolute/Path/*.yaml"
+.. _configuration-removedTypoScriptConstantConfigFiles:
+
+removedTypoScriptConstantsConfigFiles
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Configure where to look for configuration files defining the removed TypoScript constants.
+Default is ``Configuration/Removed/TypoScriptConstants/*.yaml`` inside the standard itself.
+We already try to deliver as much as possible. Globing is used, so placeholders like ``*`` are
+possible, see https://secure.php.net/manual/en/function.glob.php
+
+Using :file:`ruleset.xml`:
+
+.. code:: xml
+
+
+
+Using ``runtime-set``:
+
+.. code:: bash
+
+ --runtime-set removedTypoScriptConstantConfigFiles "/Some/Absolute/Path/*.yaml"
+
.. _configuration-features:
features
diff --git a/Documentation/source/features.rst b/Documentation/source/features.rst
index b4a6323..8b4c5e1 100644
--- a/Documentation/source/features.rst
+++ b/Documentation/source/features.rst
@@ -96,13 +96,16 @@ Check for removed calls
Also we check for the following deprecated calls:
-Check for usage of *removed functions* in general. The functions are configured via yaml files. The
-location of them is configurable, default is inside the standard itself, and we try to deliver all
-information. For configuration options see :ref:`configuration-removedFunctionConfigFiles`.
+Check for usage of *removed PHP functions* in general. The functions are configured via yaml files.
+The location of them is configurable, default is inside the standard itself, and we try to deliver
+all information. For configuration options see :ref:`configuration-removedFunctionConfigFiles`.
-Check for usage of *removed constants*. The constants are configured in same way as removed
+Check for usage of *removed PHP constants*. The constants are configured in same way as removed
functions. For configuration options see :ref:`configuration-removedConstantConfigFiles`.
+Check for usage of *removed PHP classes*. The classes are configured in same way as removed
+functions. For configuration options see :ref:`configuration-removedClassConfigFiles`.
+
Check for usage of *removed signals*. The signals are configured in same way as removed
functions. For configuration options see :ref:`configuration-removedSignalConfigFiles`.
@@ -117,6 +120,10 @@ This will check whether you are using already removed TypoScript parts, supporte
- Paths like ``styles.insertContent``
+Check for usage of *removed TypoScript constants*. The TypoScript constants are configured in same
+way as removed functions. For configuration options see
+:ref:`configuration-removedTypoScriptConstantConfigFiles`.
+
For a complete list, take a look at the corresponding YAML-Files.
Further checks
diff --git a/src/Standards/Typo3Update/Configuration/Removed/Classes/7.0.yaml b/src/Standards/Typo3Update/Configuration/Removed/Classes/7.0.yaml
index 2341204..c50d9c9 100644
--- a/src/Standards/Typo3Update/Configuration/Removed/Classes/7.0.yaml
+++ b/src/Standards/Typo3Update/Configuration/Removed/Classes/7.0.yaml
@@ -9,3 +9,48 @@
\TYPO3\CMS\Backend\Template\StandardDocumentTemplate:
replacement: 'Use \TYPO3\CMS\Backend\Template\DocumentTemplate instead'
docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.0/Breaking-61782-DeprecatedDocumentTemplateClassesRemoved.html'
+ \TYPO3\CMS\Extbase\Mvc\Controller\ArgumentError:
+ replacement: 'Migrate to rewritten property mapper'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.0/Breaking-57396-ExtbaseDeprecatedPropertyMapperRemoved.html'
+ \TYPO3\CMS\Extbase\Mvc\Controller\ArgumentsValidator:
+ replacement: 'Migrate to rewritten property mapper'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.0/Breaking-57396-ExtbaseDeprecatedPropertyMapperRemoved.html'
+ \TYPO3\CMS\Extbase\Property\Mapper:
+ replacement: 'Migrate to rewritten property mapper'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.0/Breaking-57396-ExtbaseDeprecatedPropertyMapperRemoved.html'
+ \TYPO3\CMS\Extbase\Property\MappingResults:
+ replacement: 'Migrate to rewritten property mapper'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.0/Breaking-57396-ExtbaseDeprecatedPropertyMapperRemoved.html'
+ \TYPO3\CMS\Extbase\Security\Channel\RequestHashService:
+ replacement: 'Migrate to rewritten property mapper'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.0/Breaking-57396-ExtbaseDeprecatedPropertyMapperRemoved.html'
+ \TYPO3\CMS\Extbase\Validation\PropertyError:
+ replacement: 'Migrate to rewritten property mapper'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.0/Breaking-57396-ExtbaseDeprecatedPropertyMapperRemoved.html'
+ \TYPO3\CMS\Extbase\Validation\Validator\AbstractObjectValidator:
+ replacement: 'Migrate to rewritten property mapper'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.0/Breaking-57396-ExtbaseDeprecatedPropertyMapperRemoved.html'
+ \TYPO3\CMS\Fluid\ViewHelpers\Form\ErrorsViewHelper:
+ replacement: 'Migrate to rewritten property mapper'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.0/Breaking-57396-ExtbaseDeprecatedPropertyMapperRemoved.html'
+ \TYPO3\CMS\Extbase\Mvc\Controller\FlashMessageContainer:
+ replacement: 'Change the API calls to not be of static kind anymore. Extbase extensions have to use getFlashMessageQueue() of the controllerContext'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.0/Breaking-57382-FlashMessageApi.html'
+ \TYPO3\CMS\Extbase\Service\TypeHandlingService:
+ replacement: 'Replace all calls to \TYPO3\CMS\Extbase\Service\TypeHandlingService functions to their new static functions in \TYPO3\CMS\Extbase\Utility\TypeHandlingUtility'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.0/Breaking-61786-ExtbaseDeprecatedTypeHandlingServiceRemoved.html'
+ \TYPO3\CMS\Extbase\Persistence\Generic\Qom\QueryObjectModelConstantsInterface:
+ replacement: 'Use \TYPO3\CMS\Extbase\Persistence\QueryInterface::*'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.0/Breaking-62673-ExtbaseDeprecatedCodeRemoved.html#removed-php-classes'
+ \TYPO3\CMS\Extbase\Persistence\Generic\Qom\QueryObjectModelFactoryInterface:
+ replacement: null
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.0/Breaking-62673-ExtbaseDeprecatedCodeRemoved.html#removed-php-classes'
+ \TYPO3\CMS\Scheduler\Task\FileIndexingTask:
+ replacement: null
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.0/Breaking-62670-DeprecatedCodeRemovalInMultipleSysexts.html#removed-php-classes'
+ \TYPO3\CMS\Core\Compatibility\GlobalObjectDeprecationDecorator:
+ replacement: null
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html#removed-php-classes'
+ \TYPO3\CMS\Core\Resource\Service\IndexerService:
+ replacement: null
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html#removed-php-classes'
diff --git a/src/Standards/Typo3Update/Configuration/Removed/Classes/7.3.yaml b/src/Standards/Typo3Update/Configuration/Removed/Classes/7.3.yaml
new file mode 100644
index 0000000..d9fa51d
--- /dev/null
+++ b/src/Standards/Typo3Update/Configuration/Removed/Classes/7.3.yaml
@@ -0,0 +1,14 @@
+# Breaking changes in 7.3: https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.3/Index.html#breaking-changes
+'7.3':
+ \TYPO3\CMS\T3editor\FormWizard:
+ replacement: 'Use the newly introduced API'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.3/Breaking-67229-FormEngineRelatedClasses.html'
+ \TYPO3\CMS\Rtehtmlarea\Controller\FrontendRteController:
+ replacement: 'Use the newly introduced API'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.3/Breaking-67229-FormEngineRelatedClasses.html'
+ \TYPO3\CMS\Rsaauth\Hook\LoginFormHook:
+ replacement: 'Use the new backend login form API'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.3/Breaking-66669-BackendLoginControllerRefactored.html'
+ \TYPO3\CMS\Extbase\Persistence\Generic\IdentityMap:
+ replacement: 'Existing code can be migrated to the persistence Session class which provides a drop-in replacement for the IdentityMap'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.3/Breaking-66429-RemoveIdentityMapFromPersistence.html'
diff --git a/src/Standards/Typo3Update/Configuration/Removed/Classes/7.4.yaml b/src/Standards/Typo3Update/Configuration/Removed/Classes/7.4.yaml
new file mode 100644
index 0000000..23c4838
--- /dev/null
+++ b/src/Standards/Typo3Update/Configuration/Removed/Classes/7.4.yaml
@@ -0,0 +1,14 @@
+# Breaking changes in 7.4: https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.4/Index.html#breaking-changes
+'7.4':
+ \TYPO3\CMS\Backend\Rte\AbstractRte:
+ replacement: 'Take a look at the docs'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.4/Breaking-67811-RteApi.html'
+ \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaBase:
+ replacement: 'Take a look at the docs'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.4/Breaking-67811-RteApi.html'
+ \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi:
+ replacement: 'Not removed but refactored, see docs'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.4/Breaking-67811-RteApi.html'
+ \TYPO3\CMS\Backend\Template\FrontendDocumentTemplate:
+ replacement: null
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.4/Breaking-68243-MoveNotUsedFrontendDocumentTemplate.html'
diff --git a/src/Standards/Typo3Update/Configuration/Removed/Classes/7.5.yaml b/src/Standards/Typo3Update/Configuration/Removed/Classes/7.5.yaml
new file mode 100644
index 0000000..8fdb755
--- /dev/null
+++ b/src/Standards/Typo3Update/Configuration/Removed/Classes/7.5.yaml
@@ -0,0 +1,17 @@
+# Breaking changes in 7.5: https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.5/Index.html#breaking-changes
+'7.5':
+ \TYPO3\CMS\Backend\Form\DataPreprocessor:
+ replacement: 'Take a look at the docs'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.5/Breaking-69568-FormEngine.html'
+ \TYPO3\CMS\Backend\Form\FormEngine:
+ replacement: 'Take a look at the docs'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.5/Breaking-69568-FormEngine.html'
+ \TYPO3\CMS\Backend\Form\FlexFormsHelper:
+ replacement: 'Take a look at the docs'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.5/Breaking-69568-FormEngine.html'
+ \TYPO3\CMS\Core\Database\SqlParser:
+ replacement: 'Use \TYPO3\CMS\Dbal\Database\SqlParser instead'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.5/Breaking-68401-SqlParserMovedIntoEXTdbal.html'
+ \TYPO3\CMS\Cshmanual\Controller\HelpModuleController:
+ replacement: 'Use the Extbase controller or Repository class'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.5/Breaking-63000-MigrateCshmanualToExtbase.html'
diff --git a/src/Standards/Typo3Update/Configuration/Removed/Classes/7.6.yaml b/src/Standards/Typo3Update/Configuration/Removed/Classes/7.6.yaml
new file mode 100644
index 0000000..4a497e3
--- /dev/null
+++ b/src/Standards/Typo3Update/Configuration/Removed/Classes/7.6.yaml
@@ -0,0 +1,23 @@
+# Breaking changes in 7.6: https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.6/Index.html#breaking-changes
+'7.6':
+ \TYPO3\CMS\Recordlist\Browser\ElementBrowser:
+ replacement: 'Use the new API for adding element browsers or link handlers'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.6/Breaking-66369-RemovedElementBrowserRelatedClasses.html'
+ \TYPO3\CMS\Rtehtmlarea\BrowseLinks:
+ replacement: 'Use the new API for adding element browsers or link handlers'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.6/Breaking-66369-RemovedElementBrowserRelatedClasses.html'
+ \TYPO3\CMS\Rtehtmlarea\FolderTree:
+ replacement: 'Use the new API for adding element browsers or link handlers'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.6/Breaking-66369-RemovedElementBrowserRelatedClasses.html'
+ \TYPO3\CMS\Rtehtmlarea\LinkHandler\RemoveLinkHandler:
+ replacement: 'Use the new API for adding element browsers or link handlers'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.6/Breaking-66369-RemovedElementBrowserRelatedClasses.html'
+ \TYPO3\CMS\Rtehtmlarea\PageTree:
+ replacement: 'Use the new API for adding element browsers or link handlers'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.6/Breaking-66369-RemovedElementBrowserRelatedClasses.html'
+ \TYPO3\CMS\Core\ElementBrowser\ElementBrowserHookInterface:
+ replacement: 'Use the new API for adding element browsers or link handlers'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.6/Breaking-66369-RemovedElementBrowserRelatedClasses.html'
+ \TYPO3\CMS\Impexp\ImportExport:
+ replacement: 'Use or extend one or both of the new classes (TYPO3CMSImpexpImport and TYPO3CMSImpexpExport).'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.6/Breaking-45899-SplitClassImportExportIntoClassesImportAndExport.html'
diff --git a/src/Standards/Typo3Update/Configuration/Removed/TypoScriptConstant/7.0.yaml b/src/Standards/Typo3Update/Configuration/Removed/TypoScriptConstant/7.0.yaml
new file mode 100644
index 0000000..80d7e28
--- /dev/null
+++ b/src/Standards/Typo3Update/Configuration/Removed/TypoScriptConstant/7.0.yaml
@@ -0,0 +1,20 @@
+# Breaking changes in 7.0: https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.0/Index.html#breaking-changes
+'7.0':
+ _clear:
+ replacement: 'Either remove usage of constant or add a snippet at an early point in TypoScript for backwards compatibility'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.0/Breaking-60561-DefaultTypoScriptConstantsRemoved.html'
+ _blackBorderWrap:
+ replacement: 'Either remove usage of constant or add a snippet at an early point in TypoScript for backwards compatibility'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.0/Breaking-60561-DefaultTypoScriptConstantsRemoved.html'
+ _tableWrap:
+ replacement: 'Either remove usage of constant or add a snippet at an early point in TypoScript for backwards compatibility'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.0/Breaking-60561-DefaultTypoScriptConstantsRemoved.html'
+ _tableWrap_DEBUG:
+ replacement: 'Either remove usage of constant or add a snippet at an early point in TypoScript for backwards compatibility'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.0/Breaking-60561-DefaultTypoScriptConstantsRemoved.html'
+ _stdFrameParams:
+ replacement: 'Either remove usage of constant or add a snippet at an early point in TypoScript for backwards compatibility'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.0/Breaking-60561-DefaultTypoScriptConstantsRemoved.html'
+ _stdFramesetParams:
+ replacement: 'Either remove usage of constant or add a snippet at an early point in TypoScript for backwards compatibility'
+ docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.0/Breaking-60561-DefaultTypoScriptConstantsRemoved.html'
diff --git a/src/Standards/Typo3Update/Options.php b/src/Standards/Typo3Update/Options.php
index 3462aa8..d5097fc 100644
--- a/src/Standards/Typo3Update/Options.php
+++ b/src/Standards/Typo3Update/Options.php
@@ -121,6 +121,19 @@ class Options
);
}
+ /**
+ * Returns an array of absolute file names containing removed typoscript constants.
+ *
+ * @return array
+ */
+ public static function getRemovedTypoScriptConstantConfigFiles()
+ {
+ return static::getOptionFileNames(
+ 'removedTypoScriptConstant',
+ __DIR__ . '/Configuration/Removed/TypoScriptConstant/*.yaml'
+ );
+ }
+
/**
* Returns an array of absolute file names containing removed class configurations.
*
diff --git a/src/Standards/Typo3Update/Sniffs/Removed/TypoScriptConstantSniff.php b/src/Standards/Typo3Update/Sniffs/Removed/TypoScriptConstantSniff.php
new file mode 100644
index 0000000..c396d32
--- /dev/null
+++ b/src/Standards/Typo3Update/Sniffs/Removed/TypoScriptConstantSniff.php
@@ -0,0 +1,86 @@
+
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+use Helmich\TypoScriptParser\Tokenizer\TokenInterface;
+use PHP_CodeSniffer_File as PhpCsFile;
+use Typo3Update\Options;
+use Typo3Update\Sniffs\Removed\AbstractGenericUsage;
+
+class Typo3Update_Sniffs_Removed_TypoScriptConstantSniff extends AbstractGenericUsage
+{
+ /**
+ * Register sniff only for TypoScript.
+ * @var array
+ */
+ public $supportedTokenizers = [
+ 'TYPOSCRIPT',
+ ];
+
+ public function register()
+ {
+ return [
+ TokenInterface::TYPE_RIGHTVALUE_MULTILINE,
+ TokenInterface::TYPE_RIGHTVALUE,
+ ];
+ }
+
+ protected function prepareStructure(array $typo3Versions)
+ {
+ $newStructure = [];
+
+ foreach ($typo3Versions as $typo3Version => $removals) {
+ foreach ($removals as $removed => $config) {
+ $config['name'] = $removed;
+ $config['identifier'] = $removed;
+ $config['oldUsage'] = $removed;
+ $config['versionRemoved'] = $typo3Version;
+ $newStructure[$removed] = $config;
+ }
+ }
+
+ return $newStructure;
+ }
+
+ protected function findRemoved(PhpCsFile $phpcsFile, $stackPtr)
+ {
+ $removed = [];
+ $tokens = $phpcsFile->getTokens();
+ $token = $tokens[$stackPtr];
+ $matches = [];
+ preg_match_all('/\{\$.*\}/', $token['content'], $matches);
+
+ foreach ($matches as $constants) {
+ foreach ($constants as $constant) {
+ $constant = substr($constant, 2, -1);
+ if ($this->configured->isRemoved($constant)) {
+ $removed[] = $this->configured->getRemoved($constant);
+ }
+ }
+ }
+
+ return $removed;
+ }
+
+ protected function getRemovedConfigFiles()
+ {
+ return Options::getRemovedTypoScriptConstantConfigFiles();
+ }
+}
diff --git a/tests/Fixtures/Standards/Typo3Update/Sniffs/Classname/InstantiationWithMakeInstanceSniff/Expected.diff b/tests/Fixtures/Standards/Typo3Update/Sniffs/Classname/InstantiationWithMakeInstanceSniff/Expected.diff
index 41f28ef..80accd3 100644
--- a/tests/Fixtures/Standards/Typo3Update/Sniffs/Classname/InstantiationWithMakeInstanceSniff/Expected.diff
+++ b/tests/Fixtures/Standards/Typo3Update/Sniffs/Classname/InstantiationWithMakeInstanceSniff/Expected.diff
@@ -1,10 +1,11 @@
--- tests/Fixtures/Standards/Typo3Update/Sniffs/Classname/InstantiationWithMakeInstanceSniff/InputFileForIssues.php
+++ PHP_CodeSniffer
-@@ -19,6 +19,6 @@
+@@ -19,7 +19,7 @@
* 02110-1301, USA.
*/
-t3lib_div::makeInstance('Tx_Extbase_Command_HelpCommandController');
+t3lib_div::makeInstance('\TYPO3\CMS\Extbase\Command\HelpCommandController');
+ t3lib_div::makeInstance(\TYPO3\CMS\Core\Resource\Service\IndexerService::class);
// Not handled by this sniff, but StaticCallSniff, as this uses double colon.
t3lib_div::makeInstance(Tx_Extbase_Command_HelpCommandController::class);
diff --git a/tests/Fixtures/Standards/Typo3Update/Sniffs/Classname/InstantiationWithMakeInstanceSniff/InputFileForIssues.php b/tests/Fixtures/Standards/Typo3Update/Sniffs/Classname/InstantiationWithMakeInstanceSniff/InputFileForIssues.php
index 12550c5..ccc9a0c 100644
--- a/tests/Fixtures/Standards/Typo3Update/Sniffs/Classname/InstantiationWithMakeInstanceSniff/InputFileForIssues.php
+++ b/tests/Fixtures/Standards/Typo3Update/Sniffs/Classname/InstantiationWithMakeInstanceSniff/InputFileForIssues.php
@@ -20,5 +20,6 @@
*/
t3lib_div::makeInstance('Tx_Extbase_Command_HelpCommandController');
+t3lib_div::makeInstance(\TYPO3\CMS\Core\Resource\Service\IndexerService::class);
// Not handled by this sniff, but StaticCallSniff, as this uses double colon.
t3lib_div::makeInstance(Tx_Extbase_Command_HelpCommandController::class);
diff --git a/tests/Fixtures/Standards/Typo3Update/Sniffs/Removed/TypoScriptConstantSniff/Expected.json b/tests/Fixtures/Standards/Typo3Update/Sniffs/Removed/TypoScriptConstantSniff/Expected.json
new file mode 100644
index 0000000..e353a62
--- /dev/null
+++ b/tests/Fixtures/Standards/Typo3Update/Sniffs/Removed/TypoScriptConstantSniff/Expected.json
@@ -0,0 +1,42 @@
+{
+ "files": {
+ "InputFileForIssues.ts": {
+ "errors": 0,
+ "messages": [
+ {
+ "column": 13,
+ "fixable": false,
+ "line": 3,
+ "message": "Calls to removed code are not allowed; found _clear. Removed in 7.0. Either remove usage of constant or add a snippet at an early point in TypoScript for backwards compatibility. See: https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.0/Breaking-60561-DefaultTypoScriptConstantsRemoved.html",
+ "severity": 5,
+ "source": "Typo3Update.Removed.TypoScriptConstant._clear",
+ "type": "WARNING"
+ },
+ {
+ "column": 11,
+ "fixable": false,
+ "line": 4,
+ "message": "Calls to removed code are not allowed; found _tableWrap_DEBUG. Removed in 7.0. Either remove usage of constant or add a snippet at an early point in TypoScript for backwards compatibility. See: https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.0/Breaking-60561-DefaultTypoScriptConstantsRemoved.html",
+ "severity": 5,
+ "source": "Typo3Update.Removed.TypoScriptConstant._tableWrap_DEBUG",
+ "type": "WARNING"
+ },
+ {
+ "column": 11,
+ "fixable": false,
+ "line": 4,
+ "message": "Calls to removed code are not allowed; found _tableWrap. Removed in 7.0. Either remove usage of constant or add a snippet at an early point in TypoScript for backwards compatibility. See: https://docs.typo3.org/typo3cms/extensions/core/7.6/Changelog/7.0/Breaking-60561-DefaultTypoScriptConstantsRemoved.html",
+ "severity": 5,
+ "source": "Typo3Update.Removed.TypoScriptConstant._tableWrap",
+ "type": "WARNING"
+ }
+ ],
+ "warnings": 3
+ }
+ },
+ "totals": {
+ "errors": 0,
+ "fixable": 0,
+ "warnings": 3
+ }
+}
diff --git a/tests/Fixtures/Standards/Typo3Update/Sniffs/Removed/TypoScriptConstantSniff/InputFileForIssues.ts b/tests/Fixtures/Standards/Typo3Update/Sniffs/Removed/TypoScriptConstantSniff/InputFileForIssues.ts
new file mode 100644
index 0000000..e8cc475
--- /dev/null
+++ b/tests/Fixtures/Standards/Typo3Update/Sniffs/Removed/TypoScriptConstantSniff/InputFileForIssues.ts
@@ -0,0 +1,8 @@
+test = TEXT
+test {
+ value = Some stuff {$_clear} and some more.
+ value (
+ Some values {$_tableWrap_DEBUG}
+ {$_tableWrap}
+ )
+}