From 99840b080f8d46aa812efcb517d8fd3e80ef9788 Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Tue, 4 Apr 2017 10:21:16 +0200
Subject: [PATCH] FEATURE: Finish refactoring

* Removed functions and constants are working now.

Relates: #42
---
 .../Configuration/Removed/Functions/7.0.yaml  | 140 +++++++++---------
 .../Configuration/Removed/Functions/7.2.yaml  |  22 +--
 .../Configuration/Removed/Functions/7.3.yaml  |   6 +-
 .../Configuration/Removed/Functions/7.4.yaml  |  52 +++----
 .../Sniffs/Removed/AbstractGenericUsage.php   |   9 +-
 .../Removed/GenericConstantUsageSniff.php     |  31 ----
 .../Removed/GenericFunctionCallSniff.php      |   5 +-
 7 files changed, 117 insertions(+), 148 deletions(-)

diff --git a/src/Standards/Typo3Update/Configuration/Removed/Functions/7.0.yaml b/src/Standards/Typo3Update/Configuration/Removed/Functions/7.0.yaml
index 3913b8c..999b99f 100644
--- a/src/Standards/Typo3Update/Configuration/Removed/Functions/7.0.yaml
+++ b/src/Standards/Typo3Update/Configuration/Removed/Functions/7.0.yaml
@@ -1,218 +1,218 @@
 # Breaking changes in 7.0: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Index.html#breaking-changes
 '7.0':
   \TYPO3\CMS\Core\Utility\GeneralUtility::loadTCA:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-61785-LoadTcaFunctionRemoved.html'
   \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController->getCompressedTCarray:
-    newFunctionCall: 'Full TCA is always loaded during bootstrap in FE, the method is obsolete. If an eid script calls this method to load TCA, use \TYPO3\CMS\Frontend\Utility\EidUtility::initTCA() instead'
+    replacement: 'Full TCA is always loaded during bootstrap in FE, the method is obsolete. If an eid script calls this method to load TCA, use \TYPO3\CMS\Frontend\Utility\EidUtility::initTCA() instead'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-61785-FrontendTcaFunctionsRemoved.html'
   \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController->includeTCA:
-    newFunctionCall: 'Full TCA is always loaded during bootstrap in FE, the method is obsolete. If an eid script calls this method to load TCA, use \TYPO3\CMS\Frontend\Utility\EidUtility::initTCA() instead'
+    replacement: 'Full TCA is always loaded during bootstrap in FE, the method is obsolete. If an eid script calls this method to load TCA, use \TYPO3\CMS\Frontend\Utility\EidUtility::initTCA() instead'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-61785-FrontendTcaFunctionsRemoved.html'
   \TYPO3\CMS\Core\Utility\MailUtility::mail:
-    newFunctionCall: 'Use the \TYPO3\CMS\Core\Mail\Mailer API for sending email'
+    replacement: 'Use the \TYPO3\CMS\Core\Mail\Mailer API for sending email'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-61783-RemoveDeprecatedMailFunctionality.html'
   \TYPO3\CMS\Core\Utility\GeneralUtility::plainMailEncoded:
-    newFunctionCall: 'Use the \TYPO3\CMS\Core\Mail\Mailer API for sending email'
+    replacement: 'Use the \TYPO3\CMS\Core\Mail\Mailer API for sending email'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-61783-RemoveDeprecatedMailFunctionality.html'
   \TYPO3\CMS\Frontend\Utility\EidUtility::connectDB:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-61863-ConnectDbFunctionRemoved.html'
   \TYPO3\CMS\Core\Utility\GeneralUtility::int_from_ver:
-    newFunctionCall: 'Replace the usage of the removed function with \TYPO3\CMS\Core\Utility\VersionNumberUtility::convertVersionNumberToInteger()'
+    replacement: 'Replace the usage of the removed function with \TYPO3\CMS\Core\Utility\VersionNumberUtility::convertVersionNumberToInteger()'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-61860-RemoveIntFromVerFunction.html'
   \TYPO3\CMS\Core\DataHandlin\DataHandler->getUniqueFields:
-    newFunctionCall: 'Replace all calls to \TYPO3\CMS\Core\DataHandling\DataHandler::getUniqueFields() with calls to \TYPO3\CMS\Version\Hook\DataHandlerHook::getUniqueFields()'
+    replacement: 'Replace all calls to \TYPO3\CMS\Core\DataHandling\DataHandler::getUniqueFields() with calls to \TYPO3\CMS\Version\Hook\DataHandlerHook::getUniqueFields()'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-61822-GetUniqueFieldsFunctionRemoved.html'
   \TYPO3\CMS\Core\Utility\PhpOptionsUtility::isSafeModeEnabled:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-61820-PhpOptionsUtilityDeprecatedFunctionsRemoved.html'
   \TYPO3\CMS\Core\Utility\PhpOptionsUtility::isMagicQuotesGpcEnabled:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-61820-PhpOptionsUtilityDeprecatedFunctionsRemoved.html'
   \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLocalconfWritable:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-61802-IsLocalconfWritableFunctionRemoved.html'
   \TYPO3\CMS\Extbase\Object\ObjectManager->create:
-    newFunctionCall: 'Use ObjectManager::get() instead'
+    replacement: 'Use ObjectManager::get() instead'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62673-ExtbaseDeprecatedCodeRemoved.html'
   \TYPO3\CMS\Extbase\Persistence\Generic\Backend->replaceObject:
-    newFunctionCall: 'Removed without replacement'
+    replacement: 'Removed without replacement'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62673-ExtbaseDeprecatedCodeRemoved.html'
   \TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface->setReturnRawQueryResult:
-    newFunctionCall: 'Removed without replacement'
+    replacement: 'Removed without replacement'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62673-ExtbaseDeprecatedCodeRemoved.html'
   \TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface->getReturnRawQueryResult:
-    newFunctionCall: 'Use the parameter on $query->execute() directly'
+    replacement: 'Use the parameter on $query->execute() directly'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62673-ExtbaseDeprecatedCodeRemoved.html'
   \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings->setSysLanguageUid:
-    newFunctionCall: 'Use setLanguageUid() instead'
+    replacement: 'Use setLanguageUid() instead'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62673-ExtbaseDeprecatedCodeRemoved.html'
   \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings->getSysLanguageUid:
-    newFunctionCall: 'Use getLanguageUid() instead'
+    replacement: 'Use getLanguageUid() instead'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62673-ExtbaseDeprecatedCodeRemoved.html'
   \TYPO3\CMS\Lang\LanguageService->JScharCode:
-    newFunctionCall: 'Use GeneralUtility::quoteJSvalue instead'
+    replacement: 'Use GeneralUtility::quoteJSvalue instead'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62670-DeprecatedCodeRemovalInMultipleSysexts.html'
   \TYPO3\CMS\Frontend\ContentObjec\ContentObjectRenderer->joinTSarrays:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62670-DeprecatedCodeRemovalInMultipleSysexts.html'
   \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController->tidyHTML:
-    newFunctionCall: 'You may use the tidy extension from TER'
+    replacement: 'You may use the tidy extension from TER'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62670-DeprecatedCodeRemovalInMultipleSysexts.html'
   \TYPO3\CMS\Recordlist\Browser\ElementBrowser->isWebFolder:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62670-DeprecatedCodeRemovalInMultipleSysexts.html'
   \TYPO3\CMS\Recordlist\Browser\ElementBrowser->checkFolder:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62670-DeprecatedCodeRemovalInMultipleSysexts.html'
   \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRecordList->getTreeObject:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62670-DeprecatedCodeRemovalInMultipleSysexts.html'
   \TYPO3\CMS\Filelist\FileList->dirData:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62670-DeprecatedCodeRemovalInMultipleSysexts.html'
   \TYPO3\CMS\Frontend\ContentObject\FilesContentObject->stdWrapValue:
-    newFunctionCall: 'Use ContentObjectRenderer::stdWrapValue instead'
+    replacement: 'Use ContentObjectRenderer::stdWrapValue instead'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62670-DeprecatedCodeRemovalInMultipleSysexts.html'
   \TYPO3\CMS\Impexp\Controller\ImportExportController->userTempFolder:
-    newFunctionCall: 'Use getDefaultImportExportFolder instead'
+    replacement: 'Use getDefaultImportExportFolder instead'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62670-DeprecatedCodeRemovalInMultipleSysexts.html'
   \TYPO3\CMS\Impexp\Controller\ImportExportController->userSaveFolder:
-    newFunctionCall: 'Use getDefaultImportExportFolder instead'
+    replacement: 'Use getDefaultImportExportFolder instead'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62670-DeprecatedCodeRemovalInMultipleSysexts.html'
   \TYPO3\CMS\Lowlevel\View\DatabaseIntegrityView->func_filesearch:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62670-DeprecatedCodeRemovalInMultipleSysexts.html'
   \TYPO3\CMS\Lowlevel\View\DatabaseIntegrityView->findFile:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62670-DeprecatedCodeRemovalInMultipleSysexts.html'
   \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaBase->buildStyleSheet:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62670-DeprecatedCodeRemovalInMultipleSysexts.html'
   \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaBase->loremIpsumInsert:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62670-DeprecatedCodeRemovalInMultipleSysexts.html'
   \TYPO3\CMS\Workspaces\Service\StagesService->checkCustomStagingForWS:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62670-DeprecatedCodeRemovalInMultipleSysexts.html'
   \TYPO3\CMS\Core\DataHandling\DataHandler->clear_cache:
-    newFunctionCall: 'Use ->clear_cacheCmd() instead. Alternatively you can call ->registerPageCacheClearing() from a hook to not immediately clear the cache but register clearing after DataHandler operation finishes'
+    replacement: 'Use ->clear_cacheCmd() instead. Alternatively you can call ->registerPageCacheClearing() from a hook to not immediately clear the cache but register clearing after DataHandler operation finishes'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\DataHandling\DataHandler->internal_clearPageCache:
-    newFunctionCall: 'Use the cache manager directly'
+    replacement: 'Use the cache manager directly'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Utility\GeneralUtility::array_merge_recursive_overrule:
-    newFunctionCall: 'Use ArrayUtility::mergeRecursiveWithOverrule() instead. WARNING: The new method changed its signature and does not return the first parameter anymore'
+    replacement: 'Use ArrayUtility::mergeRecursiveWithOverrule() instead. WARNING: The new method changed its signature and does not return the first parameter anymore'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Utility\GeneralUtility::htmlspecialchars_decode:
-    newFunctionCall: 'Use native PHP htmlspecialchars_decode() function'
+    replacement: 'Use native PHP htmlspecialchars_decode() function'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   # NOTE: This is useless, adding a warning to all "get" methods is crazy.
   # Also this is already handeled by: Typo3Update_Sniffs_LegacyClassnames_InstantiationWithObjectManagerSniff
   # \TYPO3\CMS\Core\Category\CategoryRegistry->get:
-  #   newFunctionCall: 'Use isRegistered() instead'
+  #   replacement: 'Use isRegistered() instead'
   #   docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Category\CategoryRegistry->applyTca:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   # NOTE: This is useless, adding a warning to all "findByUid" methods is crazy.
   # Many calls to repositories will be marked as warning
   # \TYPO3\CMS\Core\Resource\FileRepository->findByUid:
-  #   newFunctionCall: null
+  #   replacement: null
   #   docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Resource\FileRepository->addToIndex:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Resource\FileRepository->getFileIndexRecordsForFolder:
-    newFunctionCall: 'Use FileIndexRepository::findByFolder() instead'
+    replacement: 'Use FileIndexRepository::findByFolder() instead'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Resource\FileRepository->getFileIndexRecord:
-    newFunctionCall: 'Use FileIndexRepository::findOneByFileObject() instead'
+    replacement: 'Use FileIndexRepository::findOneByFileObject() instead'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Resource\FileRepository->findBySha1Hash:
-    newFunctionCall: 'Use FileIndexRepository::findByContentHash() instead'
+    replacement: 'Use FileIndexRepository::findByContentHash() instead'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   # NOTE: This is useless, adding a warning to all "update" methods is crazy.
   # All repository updates will be marked as warning
   # \TYPO3\CMS\Core\Resource\FileRepository->update:
-  #   newFunctionCall: 'Use FileIndexRepository::update() instead'
+  #   replacement: 'Use FileIndexRepository::update() instead'
   #   docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Resource\ResourceStorage->getFolderByIdentifier:
-    newFunctionCall: 'Use getFolder() instead'
+    replacement: 'Use getFolder() instead'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Resource\ResourceStorage->getFileByIdentifier:
-    newFunctionCall: 'Use getFileInfoByIdentifier() instead'
+    replacement: 'Use getFileInfoByIdentifier() instead'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Resource\ResourceStorage->getFileList:
-    newFunctionCall: 'Use getFilesInFolder() instead'
+    replacement: 'Use getFilesInFolder() instead'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Resource\ResourceStorage->getFolderList:
-    newFunctionCall: 'Use getFoldersInFolder() instead'
+    replacement: 'Use getFoldersInFolder() instead'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Resource\ResourceStorage->fetchFolderListFromDriver:
-    newFunctionCall: 'Use getFoldersInFolder() instead'
+    replacement: 'Use getFoldersInFolder() instead'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Utility\File\BasicFileUtility->getTotalFileInfo:
-    newFunctionCall: "Use ResourceStorage instead via $GLOBALS['BE_USER']->getFileStorages()"
+    replacement: "Use ResourceStorage instead via $GLOBALS['BE_USER']->getFileStorages()"
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Utility\File\BasicFileUtility->checkFileNameLen:
-    newFunctionCall: "Use ResourceStorage instead via $GLOBALS['BE_USER']->getFileStorages()"
+    replacement: "Use ResourceStorage instead via $GLOBALS['BE_USER']->getFileStorages()"
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Utility\File\BasicFileUtility->isPathValid:
-    newFunctionCall: 'Use GeneralUtility::validPathStr() instead'
+    replacement: 'Use GeneralUtility::validPathStr() instead'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Utility\File\BasicFileUtility->blindPath:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Utility\File\BasicFileUtility->findTempFolder:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Utility\File\BasicFileUtility->rmDoubleSlash:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Utility\File\BasicFileUtility->cleanDirectoryName:
-    newFunctionCall: 'Use PathUtility::getCanonicalPath() instead'
+    replacement: 'Use PathUtility::getCanonicalPath() instead'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility->init_actionPerms:
-    newFunctionCall: 'Use setActionPermissions() instead'
+    replacement: 'Use setActionPermissions() instead'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility->printLogErrorMessages:
-    newFunctionCall: 'Use pushErrorMessagesToFlashMessageQueue() instead'
+    replacement: 'Use pushErrorMessagesToFlashMessageQueue() instead'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility->findRecycler:
-    newFunctionCall: 'Use \TYPO3\CMS\Core\Resource\ResourceStorage instead'
+    replacement: 'Use \TYPO3\CMS\Core\Resource\ResourceStorage instead'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Html\RteHtmlParser->findRecycler:
-    newFunctionCall: "Use $fileFactory->getFolderObjectFromCombinedIdentifier($GLOBALS['TYPO3_CONF_VARS']['BE']['RTE_imageStorageDir']); instead"
+    replacement: "Use $fileFactory->getFolderObjectFromCombinedIdentifier($GLOBALS['TYPO3_CONF_VARS']['BE']['RTE_imageStorageDir']); instead"
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Rtehtmlarea\SelectImage->getRTEImageStorageDir:
-    newFunctionCall: "Use $fileFactory->getFolderObjectFromCombinedIdentifier($GLOBALS['TYPO3_CONF_VARS']['BE']['RTE_imageStorageDir']); instead"
+    replacement: "Use $fileFactory->getFolderObjectFromCombinedIdentifier($GLOBALS['TYPO3_CONF_VARS']['BE']['RTE_imageStorageDir']); instead"
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Localization\Locales->getTerLocales:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Localization\Locales->getTerLocaleDependencies:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Localization\Locales->convertToTerLocales:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getInsertionNeedles:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getRequiredExtensionListArray:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::writeNewExtensionList:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Utility\PhpOptionsUtility::isSqlSafeModeEnabled:
-    newFunctionCall: null
+    replacement: null
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
   \TYPO3\CMS\Core\Core\ClassLoader::getAliasForClassName:
-    newFunctionCall: 'Use getAliasesForClassName() instead'
+    replacement: 'Use getAliasesForClassName() instead'
     docsUrl: 'https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.0/Breaking-62416-DeprecatedCodeRemovalInCoreSysext.html'
diff --git a/src/Standards/Typo3Update/Configuration/Removed/Functions/7.2.yaml b/src/Standards/Typo3Update/Configuration/Removed/Functions/7.2.yaml
index d1cb239..d596610 100644
--- a/src/Standards/Typo3Update/Configuration/Removed/Functions/7.2.yaml
+++ b/src/Standards/Typo3Update/Configuration/Removed/Functions/7.2.yaml
@@ -1,36 +1,36 @@
 # Breaking changes in 7.2: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.2/Index.html
 '7.2':
   \TYPO3\CMS\Core\Page\PageRenderer->setSvgPath:
-    newFunctionCall: 'Use 3rd party library instead, which is already loaded by TYPO3'
+    replacement: 'Use 3rd party library instead, which is already loaded by TYPO3'
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.2/Breaking-65962-WebSVGLibraryAndAPIRemoved.html
   \TYPO3\CMS\Core\Page\PageRenderer->loadSvg:
-    newFunctionCall: 'Use 3rd party library instead, which is already loaded by TYPO3'
+    replacement: 'Use 3rd party library instead, which is already loaded by TYPO3'
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.2/Breaking-65962-WebSVGLibraryAndAPIRemoved.html
   \TYPO3\CMS\Core\Page\PageRenderer->enableSvgDebug:
-    newFunctionCall: 'Use 3rd party library instead, which is already loaded by TYPO3'
+    replacement: 'Use 3rd party library instead, which is already loaded by TYPO3'
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.2/Breaking-65962-WebSVGLibraryAndAPIRemoved.html
   \TYPO3\CMS\Core\Page\PageRenderer->svgForceFlash:
-    newFunctionCall: 'Use 3rd party library instead, which is already loaded by TYPO3'
+    replacement: 'Use 3rd party library instead, which is already loaded by TYPO3'
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.2/Breaking-65962-WebSVGLibraryAndAPIRemoved.html
   \TYPO3\CMS\Backend\Controller\LoginController->makeLoginForm:
-    newFunctionCall: 'Use the new Fluid View to adjust the login screen instead'
+    replacement: 'Use the new Fluid View to adjust the login screen instead'
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.2/Breaking-65939-BackendLoginRefactoring.html
   \TYPO3\CMS\Backend\Controller\LoginController->makeLogoutForm:
-    newFunctionCall: 'Use the new Fluid View to adjust the login screen instead'
+    replacement: 'Use the new Fluid View to adjust the login screen instead'
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.2/Breaking-65939-BackendLoginRefactoring.html
   \TYPO3\CMS\Backend\Controller\LoginController->wrapLoginForm:
-    newFunctionCall: 'Use the new Fluid View to adjust the login screen instead'
+    replacement: 'Use the new Fluid View to adjust the login screen instead'
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.2/Breaking-65939-BackendLoginRefactoring.html
   \TYPO3\CMS\Backend\Controller\LoginController->makeLoginBoxImage:
-    newFunctionCall: 'Use the new Fluid View to adjust the login screen instead'
+    replacement: 'Use the new Fluid View to adjust the login screen instead'
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.2/Breaking-65939-BackendLoginRefactoring.html
   \TYPO3\CMS\Backend\Controller\LoginController->makeLoginNews:
-    newFunctionCall: 'Use the new Fluid View to adjust the login screen instead'
+    replacement: 'Use the new Fluid View to adjust the login screen instead'
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.2/Breaking-65939-BackendLoginRefactoring.html
   \TYPO3\CMS\Backend\Controller\LoginController->emitRenderLoginFormSignal:
-    newFunctionCall: 'Use the new Fluid View to adjust the login screen instead'
+    replacement: 'Use the new Fluid View to adjust the login screen instead'
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.2/Breaking-65939-BackendLoginRefactoring.html
 # NOTE: This is useless, adding a warning to all "getSignalSlotDispatcher" methods is crazy, many developers implement such a method.
 # \TYPO3\CMS\Backend\Controller\LoginController->getSignalSlotDispatcher:
-#   newFunctionCall: 'Use the new Fluid View to adjust the login screen instead'
+#   replacement: 'Use the new Fluid View to adjust the login screen instead'
 #   docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.2/Breaking-65939-BackendLoginRefactoring.html
diff --git a/src/Standards/Typo3Update/Configuration/Removed/Functions/7.3.yaml b/src/Standards/Typo3Update/Configuration/Removed/Functions/7.3.yaml
index 15ff9b8..4194ed6 100644
--- a/src/Standards/Typo3Update/Configuration/Removed/Functions/7.3.yaml
+++ b/src/Standards/Typo3Update/Configuration/Removed/Functions/7.3.yaml
@@ -2,12 +2,12 @@
 '7.3':
   # NOTE: If this is making you crazy, just disable via ruleset.xml or phpcs.xml
   parent::initializeObject:
-    newFunctionCall: 'Remove call, if this is inside a child of \TYPO3\CMS\Extbase\DomainObject\AbstractDomainObject, there is no initializeObject in the parent anymore.'
+    replacement: 'Remove call, if this is inside a child of \TYPO3\CMS\Extbase\DomainObject\AbstractDomainObject, there is no initializeObject in the parent anymore.'
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.3/Breaking-67402-ExtbaseAbstractDomainObjectInitializeObject.html
   \TYPO3\CMS\Extbase\Persistence\Repository::replace:
-    newFunctionCall: null
+    replacement: null
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.3/Breaking-63835-RemoveDeprecatedExtbasePersistenceParts.html
   \TYPO3\CMS\Extbase\Persistence\Generic\Backend::setDeletedObjects:
-    newFunctionCall: null
+    replacement: null
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.3/Breaking-63835-RemoveDeprecatedExtbasePersistenceParts.html
 
diff --git a/src/Standards/Typo3Update/Configuration/Removed/Functions/7.4.yaml b/src/Standards/Typo3Update/Configuration/Removed/Functions/7.4.yaml
index ee9bbd5..aefe6e7 100644
--- a/src/Standards/Typo3Update/Configuration/Removed/Functions/7.4.yaml
+++ b/src/Standards/Typo3Update/Configuration/Removed/Functions/7.4.yaml
@@ -1,81 +1,81 @@
 # Breaking changes in 7.4: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Index.html#breaking-changes
 '7.4':
   \TYPO3\CMS\Core\Page\PageRenderer::setExtCorePath:
-    newFunctionCall: null
+    replacement: null
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Breaking-68001-RemovedExtJSCoreAndExtJSAdapters.html
   \TYPO3\CMS\Core\Page\PageRenderer::getExtCorePath:
-    newFunctionCall: null
+    replacement: null
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Breaking-68001-RemovedExtJSCoreAndExtJSAdapters.html
   \TYPO3\CMS\Core\Page\PageRenderer::loadExtCore:
-    newFunctionCall: null
+    replacement: null
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Breaking-68001-RemovedExtJSCoreAndExtJSAdapters.html
   \TYPO3\CMS\Core\Page\PageRenderer::enableExtCoreDebug:
-    newFunctionCall: null
+    replacement: null
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Breaking-68001-RemovedExtJSCoreAndExtJSAdapters.html
   \TYPO3\CMS\Core\Page\PageRenderer::setExtCorePath:
-    newFunctionCall: null
+    replacement: null
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Breaking-68001-RemovedExtJSCoreAndExtJSAdapters.html
   \TYPO3\CMS\Backend\Controller\EditDocumentController->functionMenus:
-    newFunctionCall: null
+    replacement: null
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Breaking-67753-DropSecondaryOptions.html
   \TYPO3\CMS\Backend\Utility\BackendUtility::getFileIcon:
-    newFunctionCall: 'Use \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIconForFile() insteadenableExtCoreDebug'
+    replacement: 'Use \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIconForFile() insteadenableExtCoreDebug'
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Breaking-67654-RemoveGLOBALSFILEICONSFunctionality.html
   \TYPO3\CMS\Frontend\Page\PageGenerator::getIncFiles:
-    newFunctionCall: 'Use hooks during the Frontend set up to execute custom PHP code'
+    replacement: 'Use hooks during the Frontend set up to execute custom PHP code'
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Breaking-67646-LibraryInclusionInFrontend.html
   \TYPO3\CMS\Backend\Template\DocumentTemplate\DocumentTemplate->formWidthText:
-    newFunctionCall: null
+    replacement: null
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Breaking-67565-DeprecatedBackendRelatedMethodsRemoved.html
   \TYPO3\CMS\Backend\View\PageLayoutView->getBackendLayoutConfiguration:
-    newFunctionCall: null
+    replacement: null
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Breaking-67565-DeprecatedBackendRelatedMethodsRemoved.html
   \TYPO3\CMS\Backend\View\PageLayoutView->wordWrapper:
-    newFunctionCall: null
+    replacement: null
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Breaking-67565-DeprecatedBackendRelatedMethodsRemoved.html
   \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController->checkJumpUrlReferer:
-    newFunctionCall: null
+    replacement: null
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Breaking-66602-RemoveRefererCheckWhileHandlingJumpUrl.html
   \TYPO3\CMS\Core\Utility\OpcodeCacheUtility::initialize:
-    newFunctionCall: 'Use new service class instead \TYPO3\CMS\Core\Service\OpcodeCacheService'
+    replacement: 'Use new service class instead \TYPO3\CMS\Core\Service\OpcodeCacheService'
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Breaking-63838-ChangedOpcodeCacheUtilityBeingAServiceClass.html
   \TYPO3\CMS\Core\Utility\OpcodeCacheUtility::clearAllActive:
-    newFunctionCall: 'Use new service class instead \TYPO3\CMS\Core\Service\OpcodeCacheService'
+    replacement: 'Use new service class instead \TYPO3\CMS\Core\Service\OpcodeCacheService'
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Breaking-63838-ChangedOpcodeCacheUtilityBeingAServiceClass.html
   \TYPO3\CMS\Core\Utility\OpcodeCacheUtility::getAllActive:
-    newFunctionCall: 'Use new service class instead \TYPO3\CMS\Core\Service\OpcodeCacheService'
+    replacement: 'Use new service class instead \TYPO3\CMS\Core\Service\OpcodeCacheService'
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Breaking-63838-ChangedOpcodeCacheUtilityBeingAServiceClass.html
   \TYPO3\CMS\Backend\Tree\View\PagePositionMap->JSimgFunc:
-    newFunctionCall: 'Use proper styling for a tree list'
+    replacement: 'Use proper styling for a tree list'
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Breaking-56951-RemoveUnusedMethodsInPagePositionMap.html
   \TYPO3\CMS\Backend\Tree\View\PagePositionMap->insertQuadLines:
-    newFunctionCall: 'Use proper styling for a tree list'
+    replacement: 'Use proper styling for a tree list'
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Breaking-56951-RemoveUnusedMethodsInPagePositionMap.html
   \TYPO3\CMS\Core\Page\PageRenderer->enableExtJSQuickTips:
-    newFunctionCall: 'Use bootstrap tooltips, which work out of the box as alternative. Simple add data-toggle="tooltip" and data-title="your tooltip" to any element you want'
+    replacement: 'Use bootstrap tooltips, which work out of the box as alternative. Simple add data-toggle="tooltip" and data-title="your tooltip" to any element you want'
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Breaking-68276-RemoveExtJSQuicktipsIfPossible.html
   \TYPO3\CMS\IndexedSearch\Indexer->removeLoginpagesWithContentHash:
-    newFunctionCall: null
+    replacement: null
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Breaking-68193-DropRemoveLoginpagesWithContentHashFromIndexerphp.html
   \TYPO3\CMS\Frontend\Controller\ExtDirectEidController->actionIsAllowed:
-    newFunctionCall: 'Migrate your eID scripts to the new PSR-7 compliant model'
+    replacement: 'Migrate your eID scripts to the new PSR-7 compliant model'
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Breaking-68186-AdjustedAndRemovedMethodsInEIDArea.html
   # NOTE: It does not make sense to warn about all render methods
   # \TYPO3\CMS\Frontend\Controller\ExtDirectEidController->render:
-  #   newFunctionCall: 'Migrate your eID scripts to the new PSR-7 compliant model'
+  #   replacement: 'Migrate your eID scripts to the new PSR-7 compliant model'
   #   docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Breaking-68186-AdjustedAndRemovedMethodsInEIDArea.html
   \TYPO3\CMS\Frontend\Utility\EidUtility::isEidRequest:
-    newFunctionCall: 'Migrate your eID scripts to the new PSR-7 compliant model'
+    replacement: 'Migrate your eID scripts to the new PSR-7 compliant model'
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Breaking-68186-AdjustedAndRemovedMethodsInEIDArea.html
   \TYPO3\CMS\Frontend\Utility\EidUtility::getEidScriptPath:
-    newFunctionCall: 'Migrate your eID scripts to the new PSR-7 compliant model'
+    replacement: 'Migrate your eID scripts to the new PSR-7 compliant model'
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Breaking-68186-AdjustedAndRemovedMethodsInEIDArea.html
   \TYPO3\CMS\Backend\View\PageLayoutView->linkRTEbutton:
-    newFunctionCall: null
+    replacement: null
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Breaking-68020-DroppedDisableBigButtons.html
   \TYPO3\CMS\Backend\View\PageLayoutView->isRTEforField:
-    newFunctionCall: null
+    replacement: null
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Breaking-68020-DroppedDisableBigButtons.html
   \TYPO3\CMS\Backend\View\PageLayoutView->getSpecConfForField:
-    newFunctionCall: null
+    replacement: null
     docsUrl: https://docs.typo3.org/typo3cms/extensions/core/Changelog/7.4/Breaking-68020-DroppedDisableBigButtons.html
diff --git a/src/Standards/Typo3Update/Sniffs/Removed/AbstractGenericUsage.php b/src/Standards/Typo3Update/Sniffs/Removed/AbstractGenericUsage.php
index 3875dcd..018b650 100644
--- a/src/Standards/Typo3Update/Sniffs/Removed/AbstractGenericUsage.php
+++ b/src/Standards/Typo3Update/Sniffs/Removed/AbstractGenericUsage.php
@@ -129,7 +129,7 @@ abstract class AbstractGenericUsage implements PhpCsSniff
             return;
         }
 
-        $this->addWarning($phpcsFile, $stackPtr);
+        $this->addMessage($phpcsFile, $stackPtr);
     }
 
     /**
@@ -195,14 +195,17 @@ abstract class AbstractGenericUsage implements PhpCsSniff
     }
 
     /**
-     * Add warning for the given token position.
+     * Add message for the given token position.
+     *
+     * Default is a warning, non fixable. Just overwrite in concrete sniff, if
+     * something different suites better.
      *
      * @param PhpCsFile $phpcsFile
      * @param int $tokenPosition
      *
      * @return void
      */
-    protected function addWarning(PhpCsFile $phpcsFile, $tokenPosition)
+    protected function addMessage(PhpCsFile $phpcsFile, $tokenPosition)
     {
         foreach ($this->removed as $constant) {
             $phpcsFile->addWarning(
diff --git a/src/Standards/Typo3Update/Sniffs/Removed/GenericConstantUsageSniff.php b/src/Standards/Typo3Update/Sniffs/Removed/GenericConstantUsageSniff.php
index adb479d..edcba91 100644
--- a/src/Standards/Typo3Update/Sniffs/Removed/GenericConstantUsageSniff.php
+++ b/src/Standards/Typo3Update/Sniffs/Removed/GenericConstantUsageSniff.php
@@ -24,9 +24,6 @@ use Typo3Update\Sniffs\Removed\AbstractGenericUsage;
 
 /**
  * Sniff that handles all calls to removed constants.
- *
- * Removed constants are configured using YAML-Files, for examples see src/Standards/Typo3Update/Configuration/Removed/Constants/7.0.yaml
- * Also check out the configuration options in Readme.rst.
  */
 class Typo3Update_Sniffs_Removed_GenericConstantUsageSniff extends AbstractGenericUsage
 {
@@ -40,34 +37,6 @@ class Typo3Update_Sniffs_Removed_GenericConstantUsageSniff extends AbstractGener
         return $this->getRemovedConstantConfigFiles();
     }
 
-    /**
-     * Prepares structure from config for later usage.
-     *
-     * @param array $typo3Versions
-     * @return array
-     */
-    // protected function prepareStructure(array $typo3Versions)
-    // {
-    //     $newStructure = [];
-
-    //     foreach ($typo3Versions as $typo3Version => $constants) {
-    //         foreach ($constants as $constant => $config) {
-    //             $split = explode('::', $constant);
-
-    //             $newStructure[$constant] = $config;
-
-    //             $newStructure[$constant]['static'] = strpos($constant, '::') !== false;
-    //             $newStructure[$constant]['fqcn'] = null;
-    //             $newStructure[$constant]['class'] = null;
-    //             $newStructure[$constant]['constant'] = $constant;
-    //             $newStructure[$constant]['version_removed'] = $typo3Version;
-    //             // TODO: Handle constants of classes
-    //         };
-    //     }
-
-    //     return $newStructure;
-    // }
-
     /**
      * Returns the token types that this sniff is interested in.
      *
diff --git a/src/Standards/Typo3Update/Sniffs/Removed/GenericFunctionCallSniff.php b/src/Standards/Typo3Update/Sniffs/Removed/GenericFunctionCallSniff.php
index 9d9b30a..29a957f 100644
--- a/src/Standards/Typo3Update/Sniffs/Removed/GenericFunctionCallSniff.php
+++ b/src/Standards/Typo3Update/Sniffs/Removed/GenericFunctionCallSniff.php
@@ -25,9 +25,6 @@ use Typo3Update\Sniffs\Removed\AbstractGenericUsage;
 
 /**
  * Sniff that handles all calls to removed functions.
- *
- * Removed functions are configured using YAML-Files, for examples see src/Standards/Typo3Update/Configuration/Removed/Functions/7.0.yaml
- * Also check out the configuration options in Readme.rst.
  */
 class Typo3Update_Sniffs_Removed_GenericFunctionCallSniff extends AbstractGenericUsage
 {
@@ -62,7 +59,7 @@ class Typo3Update_Sniffs_Removed_GenericFunctionCallSniff extends AbstractGeneri
             return false;
         }
 
-        parent::isRemoved($phpcsFile, $stackPtr);
+        return parent::isRemoved($phpcsFile, $stackPtr);
     }
 
     /**
-- 
GitLab