[TASK] Add rule "return_type_declaration" to php-cs-fixer

Unify the space before the colon of return type. Resolves: #84515 Releases: master, 8.7 Change-Id: Ie107e574965f834c8fcaa8c2aa4f44f7cc41d7c5 Reviewed-on: https://review.typo3.org/56553 Tested-by: TYPO3com <no-reply@typo3.com> Reviewed-by: Georg Ringer <georg.ringer@gmail.com> Tested-by: Georg Ringer <georg.ringer@gmail.com>
TYPO3 · Apr 4, 2018 · 37869c6 · 37869c6
1 parent d0da431
commit 37869c6
Show file tree

Hide file tree

Showing 25 changed files with 48 additions and 47 deletions.
diff --git a/Build/.php_cs b/Build/.php_cs
@@ -81,5 +81,6 @@ return PhpCsFixer\Config::create()
         'no_useless_else' => true,
         'phpdoc_types' => true,
         'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
+        'return_type_declaration' => ['space_before' => 'none'],
     ])
     ->setFinder($finder);
diff --git a/typo3/sysext/backend/Classes/Backend/ToolbarItems/UserToolbarItem.php b/typo3/sysext/backend/Classes/Backend/ToolbarItems/UserToolbarItem.php
@@ -122,7 +122,7 @@ protected function getBackendUser()
      *
      * @return StandaloneView
      */
-    protected function getFluidTemplateObject(string $filename):StandaloneView
+    protected function getFluidTemplateObject(string $filename): StandaloneView
     {
         $view = GeneralUtility::makeInstance(StandaloneView::class);
         $view->setLayoutRootPaths(['EXT:backend/Resources/Private/Layouts']);

diff --git a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php
@@ -248,7 +248,7 @@ public function main()
      *
      * @return array
      */
-    protected function getPageTitle() : array
+    protected function getPageTitle(): array
     {
         $pageTitle = [
             'title' => BackendUtility::getRecordTitle($this->table, $this->row, false)
@@ -272,7 +272,7 @@ protected function getPageTitle() : array
      *
      * @return array
      */
-    protected function getPreview() : array
+    protected function getPreview(): array
     {
         $preview = [];
         // Perhaps @todo in future: Also display preview for records - without fileObject
@@ -318,7 +318,7 @@ protected function getPreview() : array
      *
      * @return array
      */
-    protected function getPropertiesForTable() : array
+    protected function getPropertiesForTable(): array
     {
         $propertiesForTable = [];
         $lang = $this->getLanguageService();
@@ -426,7 +426,7 @@ protected function getPropertiesForTable() : array
      *
      * @return array
      */
-    protected function getReferences() : array
+    protected function getReferences(): array
     {
         $references = [];
         switch ($this->type) {
@@ -451,7 +451,7 @@ protected function getReferences() : array
      *
      * @return array
      */
-    protected function getBackButton() : array
+    protected function getBackButton(): array
     {
         return ['returnUrl' => GeneralUtility::sanitizeLocalUrl(GeneralUtility::_GET('returnUrl'))];
     }
@@ -611,7 +611,7 @@ protected function makeRef($table, $ref)
      * @param string $ref Filename or uid
      * @return array
      */
-    protected function makeRefFrom($table, $ref) : array
+    protected function makeRefFrom($table, $ref): array
     {
         $refFromLines = [];
         $lang = $this->getLanguageService();

diff --git a/typo3/sysext/backend/Classes/Controller/ContentElement/NewContentElementController.php b/typo3/sysext/backend/Classes/Controller/ContentElement/NewContentElementController.php
@@ -568,7 +568,7 @@ protected function getBackendUser()
      * @param string $filename
      * @return StandaloneView
      */
-    protected function getFluidTemplateObject(string $filename = 'Main.html'):StandaloneView
+    protected function getFluidTemplateObject(string $filename = 'Main.html'): StandaloneView
     {
         /** @var StandaloneView $view */
         $view = GeneralUtility::makeInstance(StandaloneView::class);

diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/AbstractItemProvider.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/AbstractItemProvider.php
@@ -953,7 +953,7 @@ protected function getExplicitAuthFieldValues()
      * @param string $localFieldName Current handle field name
      * @return QueryBuilder
      */
-    protected function buildForeignTableQueryBuilder(array $result, string $localFieldName):  QueryBuilder
+    protected function buildForeignTableQueryBuilder(array $result, string $localFieldName): QueryBuilder
     {
         $backendUser = $this->getBackendUser();
 

diff --git a/typo3/sysext/backend/Classes/Template/ModuleTemplate.php b/typo3/sysext/backend/Classes/Template/ModuleTemplate.php
@@ -740,7 +740,7 @@ protected function getFlashMessageQueue()
     /**
      * @return bool
      */
-    public function isUiBlock() : bool
+    public function isUiBlock(): bool
     {
         return $this->uiBlock;
     }

diff --git a/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php b/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
@@ -1609,7 +1609,7 @@ public function fetchUserRecord($dbUser, $username, $extraWhere = '')
      * @internal
      * @return string
      */
-    public function getSessionId() : string
+    public function getSessionId(): string
     {
         return $this->id;
     }
@@ -1618,7 +1618,7 @@ public function getSessionId() : string
      * @internal
      * @return string
      */
-    public function getLoginType() : string
+    public function getLoginType(): string
     {
         return $this->loginType;
     }

diff --git a/typo3/sysext/core/Classes/Configuration/Richtext.php b/typo3/sysext/core/Classes/Configuration/Richtext.php
@@ -141,7 +141,7 @@ protected function convertPlainArrayToTypoScriptArray(array $plainArray)
     /**
      * @return BackendUserAuthentication
      */
-    protected function getBackendUser() : BackendUserAuthentication
+    protected function getBackendUser(): BackendUserAuthentication
     {
         return $GLOBALS['BE_USER'];
     }
@@ -179,7 +179,7 @@ protected function addFlattenedPageTsConfig(array $typoScriptArray): array
      * @param string $recordType Record type value
      * @return array
      */
-    protected function getPageTsConfiguration(string $table, string $field, int $pid, string $recordType) : array
+    protected function getPageTsConfiguration(string $table, string $field, int $pid, string $recordType): array
     {
         // Load PageTSconfig configuration
         $fullPageTsConfig = $this->getRtePageTsConfigOfPid($pid);

diff --git a/typo3/sysext/core/Classes/Database/ReferenceIndex.php b/typo3/sysext/core/Classes/Database/ReferenceIndex.php
@@ -340,7 +340,7 @@ public function generateRefIndexData($tableName, $uid)
      * @param array $record Record from $tableName
      * @return array
      */
-    protected function generateDataUsingRecord(string $tableName, array $record) : array
+    protected function generateDataUsingRecord(string $tableName, array $record): array
     {
         $this->relations = [];
         $deleteField = $GLOBALS['TCA'][$tableName]['ctrl']['delete'];

diff --git a/typo3/sysext/core/Classes/Messaging/AbstractMessage.php b/typo3/sysext/core/Classes/Messaging/AbstractMessage.php
@@ -54,7 +54,7 @@ abstract class AbstractMessage
      *
      * @return string The message's title.
      */
-    public function getTitle() : string
+    public function getTitle(): string
     {
         return $this->title;
     }
@@ -74,7 +74,7 @@ public function setTitle(string $title)
      *
      * @return string The message.
      */
-    public function getMessage() : string
+    public function getMessage(): string
     {
         return $this->message;
     }
@@ -94,7 +94,7 @@ public function setMessage(string $message)
      *
      * @return int The message' severity, must be one of AbstractMessage::INFO or similar contstants
      */
-    public function getSeverity() : int
+    public function getSeverity(): int
     {
         return $this->severity;
     }

diff --git a/typo3/sysext/core/Classes/Messaging/FlashMessageRendererResolver.php b/typo3/sysext/core/Classes/Messaging/FlashMessageRendererResolver.php
@@ -40,7 +40,7 @@ class FlashMessageRendererResolver
      *
      * @return FlashMessageRendererInterface
      */
-    public function resolve() : FlashMessageRendererInterface
+    public function resolve(): FlashMessageRendererInterface
     {
         $rendererClass = $this->resolveFlashMessageRenderClass();
         $renderer = GeneralUtility::makeInstance($rendererClass);
@@ -56,7 +56,7 @@ public function resolve() : FlashMessageRendererInterface
      *
      * @return string
      */
-    protected function resolveFlashMessageRenderClass() : string
+    protected function resolveFlashMessageRenderClass(): string
     {
         $context = $this->resolveContext();
         $renderClass = $this->renderer['_default'];
@@ -77,7 +77,7 @@ protected function resolveFlashMessageRenderClass() : string
      *
      * @return string
      */
-    protected function resolveContext() : string
+    protected function resolveContext(): string
     {
         $context = '';
         if (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_CLI) {

diff --git a/typo3/sysext/core/Classes/Messaging/FlashMessageService.php b/typo3/sysext/core/Classes/Messaging/FlashMessageService.php
@@ -38,7 +38,7 @@ class FlashMessageService implements SingletonInterface
      * @return FlashMessageQueue
      * @api
      */
-    public function getMessageQueueByIdentifier($identifier = 'core.template.flashMessages') : FlashMessageQueue
+    public function getMessageQueueByIdentifier($identifier = 'core.template.flashMessages'): FlashMessageQueue
     {
         if (!isset($this->flashMessageQueues[$identifier])) {
             $this->flashMessageQueues[$identifier] = GeneralUtility::makeInstance(

diff --git a/typo3/sysext/core/Classes/Messaging/Renderer/BootstrapRenderer.php b/typo3/sysext/core/Classes/Messaging/Renderer/BootstrapRenderer.php
@@ -54,7 +54,7 @@ class BootstrapRenderer implements FlashMessageRendererInterface
      * @param FlashMessage[] $flashMessages
      * @return string Representation of the flash message
      */
-    public function render(array $flashMessages) : string
+    public function render(array $flashMessages): string
     {
         return $this->getMessageAsMarkup($flashMessages);
     }
@@ -66,7 +66,7 @@ public function render(array $flashMessages) : string
      *
      * @return string The message severity class name
      */
-    protected function getClass(FlashMessage $flashMessage) : string
+    protected function getClass(FlashMessage $flashMessage): string
     {
         return 'alert-' . self::$classes[$flashMessage->getSeverity()];
     }
@@ -78,7 +78,7 @@ protected function getClass(FlashMessage $flashMessage) : string
      *
      * @return string The message severity icon name
      */
-    protected function getIconName(FlashMessage $flashMessage) : string
+    protected function getIconName(FlashMessage $flashMessage): string
     {
         return self::$icons[$flashMessage->getSeverity()];
     }
@@ -89,7 +89,7 @@ protected function getIconName(FlashMessage $flashMessage) : string
      * @param FlashMessage[] $flashMessages
      * @return string
      */
-    protected function getMessageAsMarkup(array $flashMessages) : string
+    protected function getMessageAsMarkup(array $flashMessages): string
     {
         $markup = [];
         $markup[] = '<div class="typo3-messages">';

diff --git a/typo3/sysext/core/Classes/Messaging/Renderer/FlashMessageRendererInterface.php b/typo3/sysext/core/Classes/Messaging/Renderer/FlashMessageRendererInterface.php
@@ -28,5 +28,5 @@ interface FlashMessageRendererInterface
      * @param FlashMessage[] $flashMessages
      * @return string Representation of the flash message
      */
-    public function render(array $flashMessages) : string;
+    public function render(array $flashMessages): string;
 }
diff --git a/typo3/sysext/core/Classes/Messaging/Renderer/ListRenderer.php b/typo3/sysext/core/Classes/Messaging/Renderer/ListRenderer.php
@@ -55,7 +55,7 @@ class ListRenderer implements FlashMessageRendererInterface
      * @param FlashMessage[] $flashMessages
      * @return string Representation of the flash message
      */
-    public function render(array $flashMessages) : string
+    public function render(array $flashMessages): string
     {
         return $this->getMessageAsMarkup($flashMessages);
     }
@@ -67,7 +67,7 @@ public function render(array $flashMessages) : string
      *
      * @return string The message severity class name
      */
-    protected function getClass(FlashMessage $flashMessage) : string
+    protected function getClass(FlashMessage $flashMessage): string
     {
         return 'alert-' . self::$classes[$flashMessage->getSeverity()];
     }
@@ -79,7 +79,7 @@ protected function getClass(FlashMessage $flashMessage) : string
      *
      * @return string The message severity icon name
      */
-    protected function getIconName(FlashMessage $flashMessage) : string
+    protected function getIconName(FlashMessage $flashMessage): string
     {
         return self::$icons[$flashMessage->getSeverity()];
     }
@@ -90,7 +90,7 @@ protected function getIconName(FlashMessage $flashMessage) : string
      * @param FlashMessage[] $flashMessages
      * @return string
      */
-    protected function getMessageAsMarkup(array $flashMessages) : string
+    protected function getMessageAsMarkup(array $flashMessages): string
     {
         $markup = [];
         $markup[] = '<ul class="typo3-messages">';

diff --git a/typo3/sysext/core/Classes/Messaging/Renderer/PlaintextRenderer.php b/typo3/sysext/core/Classes/Messaging/Renderer/PlaintextRenderer.php
@@ -56,7 +56,7 @@ class PlaintextRenderer implements FlashMessageRendererInterface
      * @param FlashMessage[] $flashMessages
      * @return string Representation of the flash message as plain text
      */
-    public function render(array $flashMessages) : string
+    public function render(array $flashMessages): string
     {
         $messages = [];
 

diff --git a/typo3/sysext/core/Classes/Session/Backend/SessionBackendInterface.php b/typo3/sysext/core/Classes/Session/Backend/SessionBackendInterface.php
@@ -46,7 +46,7 @@ public function validateConfiguration();
      *
      * @return array Return a list of all user sessions. The list may be empty.
      */
-    public function getAll() : array;
+    public function getAll(): array;
 
     /**
      * Read session data
@@ -55,15 +55,15 @@ public function getAll() : array;
      * @return array Returns the session data
      * @throws SessionNotFoundException
      */
-    public function get(string $sessionId) : array;
+    public function get(string $sessionId): array;
 
     /**
      * Delete a session record
      *
      * @param string $sessionId
      * @return bool true if the session was deleted, false it session could not be found
      */
-    public function remove(string $sessionId) : bool;
+    public function remove(string $sessionId): bool;
 
     /**
      * Write session data. This method prevents overriding existing session data.
@@ -75,7 +75,7 @@ public function remove(string $sessionId) : bool;
      * @return array The newly created session record.
      * @throws SessionNotCreatedException
      */
-    public function set(string $sessionId, array $sessionData) : array;
+    public function set(string $sessionId, array $sessionData): array;
 
     /**
      * Updates the session data.
@@ -87,7 +87,7 @@ public function set(string $sessionId, array $sessionData) : array;
      * @return array $sessionData The newly updated session record.
      * @throws SessionNotUpdatedException
      */
-    public function update(string $sessionId, array $sessionData) : array;
+    public function update(string $sessionId, array $sessionData): array;
 
     /**
      * Garbage Collection

diff --git a/typo3/sysext/core/Classes/Session/SessionManager.php b/typo3/sysext/core/Classes/Session/SessionManager.php
@@ -45,7 +45,7 @@ class SessionManager implements SingletonInterface
      * @return SessionBackendInterface
      * @throws \InvalidArgumentException
      */
-    public function getSessionBackend(string $identifier) : SessionBackendInterface
+    public function getSessionBackend(string $identifier): SessionBackendInterface
     {
         if (!isset($this->sessionBackends[$identifier])) {
             if (!isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['session'][$identifier]) || !is_array($GLOBALS['TYPO3_CONF_VARS']['SYS']['session'][$identifier])) {
@@ -70,7 +70,7 @@ public function getSessionBackend(string $identifier) : SessionBackendInterface
      * @return SessionBackendInterface
      * @throws \InvalidArgumentException
      */
-    protected function createSessionBackendFromConfiguration(string $identifier, array $configuration) : SessionBackendInterface
+    protected function createSessionBackendFromConfiguration(string $identifier, array $configuration): SessionBackendInterface
     {
         $className = $configuration['backend'];
 

diff --git a/typo3/sysext/core/Classes/Utility/StringUtility.php b/typo3/sysext/core/Classes/Utility/StringUtility.php
@@ -103,7 +103,7 @@ public static function getUniqueId($prefix = '')
      * @param string $selector
      * @return string
      */
-    public static function escapeCssSelector(string $selector) : string
+    public static function escapeCssSelector(string $selector): string
     {
         return preg_replace('/([#:.\\[\\],=@])/', '\\\\$1', $selector);
     }

diff --git a/typo3/sysext/core/Classes/ViewHelpers/IconForRecordViewHelper.php b/typo3/sysext/core/Classes/ViewHelpers/IconForRecordViewHelper.php
@@ -47,7 +47,7 @@ public function initializeArguments()
      *
      * @return string
      */
-    public function render() : string
+    public function render(): string
     {
         $table = $this->arguments['table'];
         $size = $this->arguments['size'];

diff --git a/typo3/sysext/core/Tests/Unit/Utility/StringUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/StringUtilityTest.php
@@ -232,7 +232,7 @@ public function escapeCssSelector(string $selector, string $expectedValue)
     /**
      * @return array
      */
-    public function escapeCssSelectorDataProvider() : array
+    public function escapeCssSelectorDataProvider(): array
     {
         return [
             ['data.field', 'data\\.field'],

diff --git a/...sext/frontend/Classes/ContentObject/TypolinkModifyLinkConfigForPageLinksHookInterface.php b/...sext/frontend/Classes/ContentObject/TypolinkModifyLinkConfigForPageLinksHookInterface.php
@@ -29,5 +29,5 @@ interface TypolinkModifyLinkConfigForPageLinksHookInterface
      *
      * @return array The modified $linkConfiguration
      */
-    public function modifyPageLinkConfiguration(array $linkConfiguration, array $linkDetails, array $pageRow) : array;
+    public function modifyPageLinkConfiguration(array $linkConfiguration, array $linkDetails, array $pageRow): array;
 }
diff --git a/typo3/sysext/frontend/Tests/Unit/Typolink/AbstractTypolinkBuilderTest.php b/typo3/sysext/frontend/Tests/Unit/Typolink/AbstractTypolinkBuilderTest.php
@@ -247,7 +247,7 @@ public function forceAbsoluteUrlReturnsCorrectAbsoluteUrlWithSubfolder()
      *
      * @return array [[$expected, $conf, $name, $respectFrameSetOption, $fallbackTarget],]
      */
-    public function resolveTargetAttributeDataProvider() : array
+    public function resolveTargetAttributeDataProvider(): array
     {
         $targetName = $this->getUniqueId('name_');
         $target = $this->getUniqueId('target_');