diff --git a/typo3/sysext/backend/Classes/Controller/ContentElement/NewContentElementController.php b/typo3/sysext/backend/Classes/Controller/ContentElement/NewContentElementController.php index fd04f1e0862278db4996369a2b1f94d7554f150e..fc9278f502cecf1b5504b7a73493b039ef07fd77 100644 --- a/typo3/sysext/backend/Classes/Controller/ContentElement/NewContentElementController.php +++ b/typo3/sysext/backend/Classes/Controller/ContentElement/NewContentElementController.php @@ -22,12 +22,10 @@ use TYPO3\CMS\Backend\Utility\BackendUtility; use TYPO3\CMS\Backend\View\BackendLayoutView; use TYPO3\CMS\Backend\Wizard\NewContentElementWizardHookInterface; use TYPO3\CMS\Core\Imaging\Icon; -use TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider; use TYPO3\CMS\Core\Imaging\IconRegistry; use TYPO3\CMS\Core\Service\DependencyOrderingService; use TYPO3\CMS\Core\Utility\ArrayUtility; use TYPO3\CMS\Core\Utility\GeneralUtility; -use TYPO3\CMS\Core\Utility\StringUtility; /** * Script Class for the New Content element wizard diff --git a/typo3/sysext/backend/Classes/Controller/DummyController.php b/typo3/sysext/backend/Classes/Controller/DummyController.php index 230206485495a06c802ff1d6cd39a2862912675a..4045250f29c9d9f62f0c3699cfb7db972d58df29 100644 --- a/typo3/sysext/backend/Classes/Controller/DummyController.php +++ b/typo3/sysext/backend/Classes/Controller/DummyController.php @@ -16,7 +16,6 @@ namespace TYPO3\CMS\Backend\Controller; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; -use TYPO3\CMS\Core\Utility\GeneralUtility; /** * Script Class, creating the content for the dummy script - which is just blank output. diff --git a/typo3/sysext/backend/Classes/Controller/File/FileController.php b/typo3/sysext/backend/Classes/Controller/File/FileController.php index ffc9f059c085048a6172de7e0d7674e2d2114a11..1b71671d7898761f47ffa8625abc262474fe8849 100644 --- a/typo3/sysext/backend/Classes/Controller/File/FileController.php +++ b/typo3/sysext/backend/Classes/Controller/File/FileController.php @@ -23,7 +23,6 @@ use TYPO3\CMS\Core\Resource\DuplicationBehavior; use TYPO3\CMS\Core\Resource\Folder; use TYPO3\CMS\Core\Utility\File\ExtendedFileUtility; use TYPO3\CMS\Core\Utility\GeneralUtility; -use TYPO3\CMS\Core\Utility\HttpUtility; /** * Gateway for TCE (TYPO3 Core Engine) file-handling through POST forms. diff --git a/typo3/sysext/backend/Classes/Controller/SimpleDataHandlerController.php b/typo3/sysext/backend/Classes/Controller/SimpleDataHandlerController.php index 8df887413b1a60765295effa311d37d99508c532..f712b58b5bb097d508e1632fb19165730d617af6 100644 --- a/typo3/sysext/backend/Classes/Controller/SimpleDataHandlerController.php +++ b/typo3/sysext/backend/Classes/Controller/SimpleDataHandlerController.php @@ -22,7 +22,6 @@ use TYPO3\CMS\Core\DataHandling\DataHandler; use TYPO3\CMS\Core\Messaging\AbstractMessage; use TYPO3\CMS\Core\Messaging\FlashMessageService; use TYPO3\CMS\Core\Utility\GeneralUtility; -use TYPO3\CMS\Core\Utility\HttpUtility; use TYPO3\CMS\Core\Utility\MathUtility; /** diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/EditController.php b/typo3/sysext/backend/Classes/Controller/Wizard/EditController.php index 153787231630b22657cd6162c2ba96099a083ee2..8017632783b03b3166534f94eb1321e9493b9eb3 100644 --- a/typo3/sysext/backend/Classes/Controller/Wizard/EditController.php +++ b/typo3/sysext/backend/Classes/Controller/Wizard/EditController.php @@ -150,5 +150,4 @@ class EditController extends AbstractWizardController return $this->closeWindow; } } - } diff --git a/typo3/sysext/backend/Classes/Tree/View/ContentLayoutPagePositionMap.php b/typo3/sysext/backend/Classes/Tree/View/ContentLayoutPagePositionMap.php index 867d18939bd75588e0831c0f1ae1a738361d144a..2c0f246747265b9620d3c6aea38ca5b8a88a57aa 100644 --- a/typo3/sysext/backend/Classes/Tree/View/ContentLayoutPagePositionMap.php +++ b/typo3/sysext/backend/Classes/Tree/View/ContentLayoutPagePositionMap.php @@ -112,5 +112,4 @@ class ContentLayoutPagePositionMap extends PagePositionMap unset($params['new_unique_uid']); return GeneralUtility::linkThisScript($params); } - } diff --git a/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserRepository.php b/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserRepository.php index 72667da1f1d51481e25ac058a4eeb8785feed489..e7d190f9a8010d9cd673a23802589e9e66ebad46 100644 --- a/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserRepository.php +++ b/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserRepository.php @@ -48,7 +48,7 @@ class BackendUserRepository extends \TYPO3\CMS\Extbase\Domain\Repository\Backend if ($demand->getUserName() !== '') { $searchConstraints = array(); foreach (array('userName', 'uid', 'realName') as $field) { - $searchConstraints[] = $query->like( + $searchConstraints[] = $query->like( $field, '%' . $GLOBALS['TYPO3_DB']->escapeStrForLike($demand->getUserName(), 'be_users') . '%' ); } diff --git a/typo3/sysext/core/Classes/Charset/CharsetConverter.php b/typo3/sysext/core/Classes/Charset/CharsetConverter.php index efd6c8d2d942955ad6e47737837e1e97a7b7b724..7265bbff479f66b758b50ee37af1bfe9f2a29394 100644 --- a/typo3/sysext/core/Classes/Charset/CharsetConverter.php +++ b/typo3/sysext/core/Classes/Charset/CharsetConverter.php @@ -53,7 +53,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility; */ class CharsetConverter implements SingletonInterface { - /** * Possible strategies for handling multi-byte data * Only used for internal purpose diff --git a/typo3/sysext/core/Classes/Html/HtmlParser.php b/typo3/sysext/core/Classes/Html/HtmlParser.php index 286af109133e3b45891cd8aff8bf4b37071ade26..e55d1d02ed432184f377b65b56aba2383aa8a978 100644 --- a/typo3/sysext/core/Classes/Html/HtmlParser.php +++ b/typo3/sysext/core/Classes/Html/HtmlParser.php @@ -51,7 +51,7 @@ class HtmlParser public function splitIntoBlock($tag, $content, $eliminateExtraEndTags = false) { $tags = array_unique(GeneralUtility::trimExplode(',', $tag, true)); - array_walk($tags, function(&$tag) { + array_walk($tags, function (&$tag) { $tag = preg_quote($tag, '/'); }); $regexStr = '/\\<\\/?(' . implode('|', $tags) . ')(\\s*\\>|\\s[^\\>]*\\>)/si'; diff --git a/typo3/sysext/core/Classes/Messaging/ErrorpageMessage.php b/typo3/sysext/core/Classes/Messaging/ErrorpageMessage.php index 06da9decd60711644f68f37a371a6ae7157ee7f9..73609e8ba9b0f5910f7a2f09f6bf2df8fb979a64 100644 --- a/typo3/sysext/core/Classes/Messaging/ErrorpageMessage.php +++ b/typo3/sysext/core/Classes/Messaging/ErrorpageMessage.php @@ -46,5 +46,4 @@ class ErrorpageMessage extends AbstractStandaloneMessage $defaultMarkers['###EXTPATH_BACKEND###'] = ExtensionManagementUtility::siteRelPath('backend'); return $defaultMarkers; } - } diff --git a/typo3/sysext/core/Classes/Resource/Driver/AbstractHierarchicalFilesystemDriver.php b/typo3/sysext/core/Classes/Resource/Driver/AbstractHierarchicalFilesystemDriver.php index a8873d87de285db3d922fca9e424caa464dfab6a..920f40aa3a09d8ff4f40dab143d502cf00f0da34 100644 --- a/typo3/sysext/core/Classes/Resource/Driver/AbstractHierarchicalFilesystemDriver.php +++ b/typo3/sysext/core/Classes/Resource/Driver/AbstractHierarchicalFilesystemDriver.php @@ -15,8 +15,8 @@ namespace TYPO3\CMS\Core\Resource\Driver; */ use TYPO3\CMS\Core\Charset\CharsetConverter; -use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Core\Resource\Exception\InvalidPathException; +use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Core\Utility\PathUtility; /** diff --git a/typo3/sysext/core/Classes/Resource/Utility/ListUtility.php b/typo3/sysext/core/Classes/Resource/Utility/ListUtility.php index f328cd1003764fe6ee526fa4afe067496de13d80..a99a7d2c7ad9205d8fcd3ecda26adb8ed6ceb9ed 100644 --- a/typo3/sysext/core/Classes/Resource/Utility/ListUtility.php +++ b/typo3/sysext/core/Classes/Resource/Utility/ListUtility.php @@ -39,7 +39,6 @@ class ListUtility $name = $folder->getName(); $role = $folder->getRole(); if ($role !== FolderInterface::ROLE_DEFAULT) { - $tempName = $lang->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:role_folder_' . $role, true); if (!empty($tempName) && ($tempName !== $name)) { // Set new name and append original name diff --git a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php index e8d1e95df8cee024fe1d9d07612e9f73dc5ff52a..52477f0636ab77325331fdc46e4222d406a987f8 100644 --- a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php +++ b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php @@ -36,7 +36,6 @@ use TYPO3\CMS\Core\Resource\Folder; use TYPO3\CMS\Core\Resource\ResourceFactory; use TYPO3\CMS\Core\Resource\ResourceStorage; use TYPO3\CMS\Core\Type\Exception\InvalidEnumerationValueException; -use TYPO3\CMS\Core\Utility\CommandUtility; use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Lang\LanguageService; diff --git a/typo3/sysext/core/Resources/PHP/ClassMapGenerator.php b/typo3/sysext/core/Resources/PHP/ClassMapGenerator.php index b487ed6edb5df446288a44e0df56e62563ce84fb..233f348f60e81aeef05636ac60da4eb80d75cd21 100644 --- a/typo3/sysext/core/Resources/PHP/ClassMapGenerator.php +++ b/typo3/sysext/core/Resources/PHP/ClassMapGenerator.php @@ -18,8 +18,8 @@ namespace Composer\Autoload; -use Symfony\Component\Finder\Finder; use Composer\IO\IOInterface; +use Symfony\Component\Finder\Finder; /** * ClassMapGenerator @@ -66,7 +66,7 @@ class ClassMapGenerator $path = Finder::create()->files()->followLinks()->name('/\.(php|inc|hh)$/')->in($path); } else { throw new \RuntimeException( - 'Could not scan for classes inside "'.$path. + 'Could not scan for classes inside "' . $path . '" which does not appear to be a file nor a folder' ); } @@ -95,10 +95,10 @@ class ClassMapGenerator if (!isset($map[$class])) { $map[$class] = $filePath; - } elseif ($io && $map[$class] !== $filePath && !preg_match('{/(test|fixture|example|stub)s?/}i', strtr($map[$class].' '.$filePath, '\\', '/'))) { + } elseif ($io && $map[$class] !== $filePath && !preg_match('{/(test|fixture|example|stub)s?/}i', strtr($map[$class] . ' ' . $filePath, '\\', '/'))) { $io->writeError( - '<warning>Warning: Ambiguous class resolution, "'.$class.'"'. - ' was found in both "'.$map[$class].'" and "'.$filePath.'", the first will be used.</warning>' + '<warning>Warning: Ambiguous class resolution, "' . $class . '"' . + ' was found in both "' . $map[$class] . '" and "' . $filePath . '", the first will be used.</warning>' ); } } @@ -132,11 +132,11 @@ class ClassMapGenerator } } } catch (\Exception $e) { - throw new \RuntimeException('Could not scan for classes inside '.$path.": \n".$e->getMessage(), 0, $e); + throw new \RuntimeException('Could not scan for classes inside ' . $path . ": \n" . $e->getMessage(), 0, $e); } // return early if there is no chance of matching anything in this file - if (!preg_match('{\b(?:class|interface'.$extraTypes.')\s}i', $contents)) { + if (!preg_match('{\b(?:class|interface' . $extraTypes . ')\s}i', $contents)) { return array(); } @@ -161,7 +161,7 @@ class ClassMapGenerator preg_match_all('{ (?: - \b(?<![\$:>])(?P<type>class|interface'.$extraTypes.') \s++ (?P<name>[a-zA-Z_\x7f-\xff:][a-zA-Z0-9_\x7f-\xff:\-]*+) + \b(?<![\$:>])(?P<type>class|interface' . $extraTypes . ') \s++ (?P<name>[a-zA-Z_\x7f-\xff:][a-zA-Z0-9_\x7f-\xff:\-]*+) | \b(?<![\$:>])(?P<ns>namespace) (?P<nsname>\s++[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+(?:\s*+\\\\\s*+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+)*+)? \s*+ [\{;] ) }ix', $contents, $matches); @@ -176,7 +176,7 @@ class ClassMapGenerator $name = $matches['name'][$i]; if ($name[0] === ':') { // This is an XHP class, https://github.com/facebook/xhp - $name = 'xhp'.substr(str_replace(array('-', ':'), array('_', '__'), $name), 1); + $name = 'xhp' . substr(str_replace(array('-', ':'), array('_', '__'), $name), 1); } elseif ($matches['type'][$i] === 'enum') { // In Hack, something like: // enum Foo: int { HERP = '123'; } diff --git a/typo3/sysext/core/Tests/Unit/Core/Fixtures/test_extension/Tests/TestClass.php b/typo3/sysext/core/Tests/Unit/Core/Fixtures/test_extension/Tests/TestClass.php index b7d809680d45c7251ea62f821dfb7b02971e6b0f..eee7fda713c65757ee0f22790df209c1c931c440 100644 --- a/typo3/sysext/core/Tests/Unit/Core/Fixtures/test_extension/Tests/TestClass.php +++ b/typo3/sysext/core/Tests/Unit/Core/Fixtures/test_extension/Tests/TestClass.php @@ -5,5 +5,4 @@ */ class TestClass { - -} \ No newline at end of file +} diff --git a/typo3/sysext/core/Tests/Unit/Core/Fixtures/test_extension/class.ext_update.php b/typo3/sysext/core/Tests/Unit/Core/Fixtures/test_extension/class.ext_update.php index 8d32f9a9a0a9b42a66ac3fb69f9e55c53e038d70..67ec4a5aba61af6f0e25dfc7eed0ecea9b7586ca 100644 --- a/typo3/sysext/core/Tests/Unit/Core/Fixtures/test_extension/class.ext_update.php +++ b/typo3/sysext/core/Tests/Unit/Core/Fixtures/test_extension/class.ext_update.php @@ -5,5 +5,4 @@ */ class ext_update { - -} \ No newline at end of file +} diff --git a/typo3/sysext/impexp/Classes/Domain/Repository/PresetRepository.php b/typo3/sysext/impexp/Classes/Domain/Repository/PresetRepository.php index 3939335c99a738c286838f72536b594fec00e3f5..9229e656e05098fb6886e5d38326a2a446fe7959 100644 --- a/typo3/sysext/impexp/Classes/Domain/Repository/PresetRepository.php +++ b/typo3/sysext/impexp/Classes/Domain/Repository/PresetRepository.php @@ -25,7 +25,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility; */ class PresetRepository { - /** * @param int $pageId * @return array diff --git a/typo3/sysext/impexp/Classes/Import.php b/typo3/sysext/impexp/Classes/Import.php index 30fa5b9d12ab4f040ec7b13c686978333355b0b5..702140ff274179dc14b0c39c13955a32ca1da595 100644 --- a/typo3/sysext/impexp/Classes/Import.php +++ b/typo3/sysext/impexp/Classes/Import.php @@ -311,7 +311,8 @@ class Import extends ImportExport * @param array $storageRecord The storage record which should get compared * @return bool Returns TRUE when both object storages can be seen as equivalent */ - protected function isEquivalentObjectStorage(ResourceStorage $storageObject, array $storageRecord) { + protected function isEquivalentObjectStorage(ResourceStorage $storageObject, array $storageRecord) + { // compare the properties: driver, writable and online if ( $storageObject->getDriverType() === $storageRecord['driver'] @@ -336,7 +337,8 @@ class Import extends ImportExport * * @return array Messages explaining issues which need to get resolved before import */ - public function checkImportPrerequisites() { + public function checkImportPrerequisites() + { $messages = array(); // Check #1: Extension dependencies @@ -354,7 +356,7 @@ class Import extends ImportExport // Check #2: If the path for every local storage object exists. // Else files can't get moved into a newly imported storage. - if(is_array($this->dat['header']['records']['sys_file_storage'])) { + if (is_array($this->dat['header']['records']['sys_file_storage'])) { foreach ($this->dat['header']['records']['sys_file_storage'] as $sysFileStorageUid => $_) { $storageRecord = $this->dat['records']['sys_file_storage:' . $sysFileStorageUid]['data']; // continue with Local, writable and online storage only @@ -385,7 +387,6 @@ class Import extends ImportExport $configuration = $resourceStorage->getConfiguration(); $messages['resourceStorageFolderMissing_' . $storageRecordUid] = 'The resource storage "' . $resourceStorage->getName() . '" will get imported. The storage target directory "' . $configuration['basePath'] . '" does not exist. Please create the directory prior to starting the import!'; } - } } } diff --git a/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php b/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php index de3ccc6219e9c683e488a00d3605b14230586041..7bf4a1a7641a952a6d9b684e87c61038a5119815 100644 --- a/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php +++ b/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php @@ -731,4 +731,4 @@ class CrawlerHook } } } -} \ No newline at end of file +} diff --git a/typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php b/typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php index 0df3183cd04479d5f7d80cf6dbd42861b5014275..ae42487b32eac50c1a4324c58e82f50dfa8e9bb8 100644 --- a/typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php +++ b/typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php @@ -100,7 +100,6 @@ class InfoPageTyposcriptConfigController extends \TYPO3\CMS\Backend\Module\Abstr $theOutput = '<h1>' . htmlspecialchars($this->getLanguageService()->getLL('tsconf_title')) . '</h1>'; if ($this->pObj->MOD_SETTINGS['tsconf_parts'] == 99) { - $TSparts = BackendUtility::getPagesTSconfig($this->pObj->id, null, true); $lines = array(); $pUids = array(); diff --git a/typo3/sysext/install/Classes/Controller/BackendModuleController.php b/typo3/sysext/install/Classes/Controller/BackendModuleController.php index ad070d933d6a9c4d70d05bd5b7fa6a08e3fbc0be..b9056025b34ad7010c5c4c2cb0794c37ecb5f069 100644 --- a/typo3/sysext/install/Classes/Controller/BackendModuleController.php +++ b/typo3/sysext/install/Classes/Controller/BackendModuleController.php @@ -36,7 +36,6 @@ use TYPO3\CMS\Install\Service\EnableFileService; */ class BackendModuleController { - /** * Index action shows install tool / step installer or redirect to action to enable install tool * @@ -83,5 +82,4 @@ class BackendModuleController } return $response; } - } diff --git a/typo3/sysext/lang/Classes/Controller/LanguageController.php b/typo3/sysext/lang/Classes/Controller/LanguageController.php index 1463e68682d1e850d44391c3e24a7d8d5fc576f8..9a2bb7adf5cc62acbf91093971f706fd572b09f2 100644 --- a/typo3/sysext/lang/Classes/Controller/LanguageController.php +++ b/typo3/sysext/lang/Classes/Controller/LanguageController.php @@ -20,14 +20,14 @@ use TYPO3\CMS\Backend\Template\Components\Menu\MenuItem; use TYPO3\CMS\Backend\View\BackendTemplateView; use TYPO3\CMS\Core\Imaging\Icon; use TYPO3\CMS\Core\Utility\GeneralUtility; +use TYPO3\CMS\Extbase\Mvc\Controller\ActionController; +use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder; +use TYPO3\CMS\Extbase\Utility\LocalizationUtility; use TYPO3\CMS\Lang\Domain\Model\Extension; use TYPO3\CMS\Lang\Domain\Repository\ExtensionRepository; use TYPO3\CMS\Lang\Domain\Repository\LanguageRepository; use TYPO3\CMS\Lang\Service\RegistryService; use TYPO3\CMS\Lang\Service\TranslationService; -use TYPO3\CMS\Extbase\Mvc\Controller\ActionController; -use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder; -use TYPO3\CMS\Extbase\Utility\LocalizationUtility; /** * Language controller diff --git a/typo3/sysext/rtehtmlarea/Classes/Form/Element/RichTextElement.php b/typo3/sysext/rtehtmlarea/Classes/Form/Element/RichTextElement.php index ca3c81edcff6a7832fa8f9136c293187d6170823..28ae79909105260dd132caee0831275337e5b478 100644 --- a/typo3/sysext/rtehtmlarea/Classes/Form/Element/RichTextElement.php +++ b/typo3/sysext/rtehtmlarea/Classes/Form/Element/RichTextElement.php @@ -27,7 +27,6 @@ use TYPO3\CMS\Core\Utility\ArrayUtility; use TYPO3\CMS\Core\Utility\ClientUtility; use TYPO3\CMS\Core\Utility\ExtensionManagementUtility; use TYPO3\CMS\Core\Utility\GeneralUtility; -use TYPO3\CMS\Core\Utility\MathUtility; use TYPO3\CMS\Lang\LanguageService; use TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi; diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Pbkdf2SaltTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Pbkdf2SaltTest.php index 6952b4802894f7ca1a7d754855b79b7ab10a327d..0d24e7bf2e22eb52290e5499031bfafe90299aeb 100644 --- a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Pbkdf2SaltTest.php +++ b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Pbkdf2SaltTest.php @@ -338,7 +338,7 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase { $this->objectInstance->setMinHashCount(1000); $passlibSaltedHash= '$pbkdf2-sha256$6400$.6UI/S.nXIk8jcbdHx3Fhg$98jZicV16ODfEsEZeYPGHU3kbrUrvUEXOPimVSQDD44'; - $saltedHashPassword = $this->objectInstance->getHashedPassword("password", $passlibSaltedHash); + $saltedHashPassword = $this->objectInstance->getHashedPassword('password', $passlibSaltedHash); $this->assertSame($passlibSaltedHash, $saltedHashPassword); } diff --git a/typo3/sysext/setup/Classes/Controller/SetupModuleController.php b/typo3/sysext/setup/Classes/Controller/SetupModuleController.php index 59bd260f1dae1f8fc8e84e2b428a7e0468243567..6c1278ac714c84ee6b23765aa0ef856f607d951d 100644 --- a/typo3/sysext/setup/Classes/Controller/SetupModuleController.php +++ b/typo3/sysext/setup/Classes/Controller/SetupModuleController.php @@ -639,7 +639,7 @@ class SetupModuleController extends AbstractModule '<a id="clear_button_' . htmlspecialchars($fieldName) . '" ' . 'onclick="clearExistingImage(); return false;" class="btn btn-default">' . $iconFactory->getIcon('actions-delete', Icon::SIZE_SMALL) - .'</a>'; + . '</a>'; } $html .= '<a id="add_button_' . htmlspecialchars($fieldName) . '" class="btn btn-default btn-add-avatar"' diff --git a/typo3/sysext/t3editor/Classes/T3editor.php b/typo3/sysext/t3editor/Classes/T3editor.php index 8e65253fc9b209dde5adbcf91c157f78706271b6..0008610a8ad9a3a71be79eb07dd50ce35d83f9c5 100755 --- a/typo3/sysext/t3editor/Classes/T3editor.php +++ b/typo3/sysext/t3editor/Classes/T3editor.php @@ -170,7 +170,6 @@ class T3editor implements \TYPO3\CMS\Core\SingletonInterface $this->relExtPath = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('t3editor'); $this->codemirrorPath = $this->relExtPath . $this->codemirrorPath; - } /** diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php index 4d5d6663249ffed9c5a1b17fb41f68891e5f373b..f89083cbd207596df095f5a36f35349adb5af557 100755 --- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php +++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php @@ -18,7 +18,6 @@ use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use TYPO3\CMS\Backend\Module\BaseScriptClass; use TYPO3\CMS\Backend\Template\Components\ButtonBar; -use TYPO3\CMS\Backend\Template\DocumentTemplate; use TYPO3\CMS\Backend\Template\ModuleTemplate; use TYPO3\CMS\Backend\Utility\BackendUtility; use TYPO3\CMS\Core\DataHandling\DataHandler;