[TASK] Switch to short array syntax

helhum · helhum · commit c3ee22de660d · 2018-11-02T12:56:43.000+01:00
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -4,7 +4,7 @@ return PhpCsFixer\Config::create()
     ->setRules([
         '@PSR2' => true,
         'array_syntax' => [
-            'syntax' => 'long',
+            'syntax' => 'short',
         ],
         'binary_operator_spaces' => true,
         'concat_space' => [
diff --git a/.styleci.yml b/.styleci.yml
@@ -7,7 +7,6 @@ enabled:
   - function_typehint_space
   - hash_to_slash_comment
   - linebreak_after_opening_tag
-  - long_array_syntax
   - lowercase_cast
   - method_separation
   - native_function_casing
@@ -43,6 +42,7 @@ enabled:
   - phpdoc_scalar
   - phpdoc_types
   - self_accessor
+  - short_array_syntax
   - short_scalar_cast
   - single_quote
   - standardize_not_equals
diff --git a/Classes/Configuration/RecordRenderingConfigurationBuilder.php b/Classes/Configuration/RecordRenderingConfigurationBuilder.php
@@ -45,10 +45,10 @@ public function configurationFor($extensionName, $pluginName, $contextRecord = '
         list($tableName, $uid) = $this->resolveTableNameAndUidFromContextString($contextRecord);
         $pluginSignature = $this->buildPluginSignature($extensionName, $pluginName);
         $renderingPath = $this->resolveRenderingPath($pluginSignature);
-        return array(
+        return [
             'record' => $tableName . '_' . $uid,
             'path' => $renderingPath,
-        );
+        ];
     }
 
     /**
@@ -68,11 +68,11 @@ protected function resolveTableNameAndUidFromContextString($contextRecord)
         }
 
         if ($contextRecord === 'currentPage') {
-            $tableNameAndUid = array('pages', $this->renderingContext->getFrontendController()->id);
+            $tableNameAndUid = ['pages', $this->renderingContext->getFrontendController()->id];
         } else {
             $tableNameAndUid = explode(':', $contextRecord);
             if (count($tableNameAndUid) !== 2 || empty($tableNameAndUid[0]) || empty($tableNameAndUid[1]) || !MathUtility::canBeInterpretedAsInteger($tableNameAndUid[1])) {
-                $tableNameAndUid = array('pages', $this->renderingContext->getFrontendController()->id);
+                $tableNameAndUid = ['pages', $this->renderingContext->getFrontendController()->id];
             }
         }
         // TODO: maybe check if the record is available
diff --git a/Classes/Mvc/Request.php b/Classes/Mvc/Request.php
@@ -18,7 +18,7 @@ class Request
     /**
      * @var array
      */
-    protected $arguments = array();
+    protected $arguments = [];
 
     /**
      * @param array $arguments
diff --git a/Classes/Renderer/RecordRenderer.php b/Classes/Renderer/RecordRenderer.php
@@ -57,7 +57,7 @@ public function canRender(Request $request)
      */
     protected function resolveRenderingConfiguration(Request $request, RenderingContext $renderingContext)
     {
-        $configuration = array();
+        $configuration = [];
 
         if ($request->hasArgument('path')) {
             $renderingPath = $request->getArgument('path');
diff --git a/Classes/RenderingDispatcher.php b/Classes/RenderingDispatcher.php
@@ -40,7 +40,7 @@ class RenderingDispatcher
     /**
      * @var string[]
      */
-    protected $renderer = array();
+    protected $renderer = [];
 
     /**
      * @param RequestBuilder $requestBuilder
diff --git a/Classes/ViewHelpers/Uri/AjaxActionViewHelper.php b/Classes/ViewHelpers/Uri/AjaxActionViewHelper.php
@@ -58,7 +58,7 @@ class AjaxActionViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractView
      * @return string Rendered link
      *
      */
-    public function render($action = null, array $arguments = array(), $controller = null, $extensionName = null, $pluginName = null, $pageUid = null, $section = '', $format = '', $linkAccessRestrictedPages = false, array $additionalParams = array(), $absolute = false, $addQueryString = false, array $argumentsToBeExcludedFromQueryString = array(), $addQueryStringMethod = null, $contextRecord = 'current')
+    public function render($action = null, array $arguments = [], $controller = null, $extensionName = null, $pluginName = null, $pageUid = null, $section = '', $format = '', $linkAccessRestrictedPages = false, array $additionalParams = [], $absolute = false, $addQueryString = false, array $argumentsToBeExcludedFromQueryString = [], $addQueryStringMethod = null, $contextRecord = 'current')
     {
         if ($pluginName === null) {
             $pluginName = $this->controllerContext->getRequest()->getPluginName();
diff --git a/Classes/ViewHelpers/Widget/LinkViewHelper.php b/Classes/ViewHelpers/Widget/LinkViewHelper.php
@@ -62,7 +62,7 @@ public function initializeArguments()
      * @return string The rendered link
      *
      */
-    public function render($pluginName, $extensionName, $action = null, array $arguments = array(), $section = '', $format = '', $ajax = true, $contextRecord = 'current')
+    public function render($pluginName, $extensionName, $action = null, array $arguments = [], $section = '', $format = '', $ajax = true, $contextRecord = 'current')
     {
         if ($ajax === true) {
             $uri = $this->getAjaxUri();
@@ -86,7 +86,7 @@ protected function getAjaxUri()
         $pluginName = $this->arguments['pluginName'];
         $extensionName = $this->arguments['extensionName'];
         $contextRecord = $this->arguments['contextRecord'];
-        $arguments = $this->hasArgument('arguments') ? $this->arguments['arguments'] : array();
+        $arguments = $this->hasArgument('arguments') ? $this->arguments['arguments'] : [];
         if ($contextRecord === 'current') {
             if (
                 $pluginName !== $this->controllerContext->getRequest()->getPluginName()
@@ -104,10 +104,10 @@ protected function getAjaxUri()
         $argumentPrefix = $this->controllerContext->getRequest()->getArgumentPrefix();
 
         $uriBuilder->reset()
-            ->setArguments(array_merge(array($argumentPrefix => $arguments), $additionalParams))
+            ->setArguments(array_merge([$argumentPrefix => $arguments], $additionalParams))
             ->setSection($this->arguments['section'])
             ->setAddQueryString(true)
-            ->setArgumentsToBeExcludedFromQueryString(array($argumentPrefix, 'cHash'))
+            ->setArgumentsToBeExcludedFromQueryString([$argumentPrefix, 'cHash'])
             ->setFormat($this->arguments['format'])
             ->setUseCacheHash(true);
 
@@ -128,7 +128,7 @@ protected function getWidgetUri()
     {
         $uriBuilder = $this->controllerContext->getUriBuilder();
         $argumentPrefix = $this->controllerContext->getRequest()->getArgumentPrefix();
-        $arguments = $this->hasArgument('arguments') ? $this->arguments['arguments'] : array();
+        $arguments = $this->hasArgument('arguments') ? $this->arguments['arguments'] : [];
         if ($this->hasArgument('action')) {
             $arguments['action'] = $this->arguments['action'];
         }
@@ -139,10 +139,10 @@ protected function getWidgetUri()
             $arguments['addQueryStringMethod'] = $this->arguments['addQueryStringMethod'];
         }
         $uriBuilder->reset()
-            ->setArguments(array($argumentPrefix => $arguments))
+            ->setArguments([$argumentPrefix => $arguments])
             ->setSection($this->arguments['section'])
             ->setAddQueryString(true)
-            ->setArgumentsToBeExcludedFromQueryString(array($argumentPrefix, 'cHash'))
+            ->setArgumentsToBeExcludedFromQueryString([$argumentPrefix, 'cHash'])
             ->setFormat($this->arguments['format']);
 
         // TYPO3 6.0 compatibility check:
diff --git a/Classes/ViewHelpers/Widget/UriViewHelper.php b/Classes/ViewHelpers/Widget/UriViewHelper.php
@@ -52,7 +52,7 @@ public function initializeArguments()
      * @return string The rendered link
      *
      */
-    public function render($pluginName, $extensionName, $action = null, array $arguments = array(), $section = '', $format = '', $ajax = true, $contextRecord = 'current')
+    public function render($pluginName, $extensionName, $action = null, array $arguments = [], $section = '', $format = '', $ajax = true, $contextRecord = 'current')
     {
         if ($ajax === true) {
             return $this->getAjaxUri();
@@ -72,7 +72,7 @@ protected function getAjaxUri()
         $pluginName = $this->arguments['pluginName'];
         $extensionName = $this->arguments['extensionName'];
         $contextRecord = $this->arguments['contextRecord'];
-        $arguments = $this->hasArgument('arguments') ? $this->arguments['arguments'] : array();
+        $arguments = $this->hasArgument('arguments') ? $this->arguments['arguments'] : [];
         if ($contextRecord === 'current') {
             if (
                 $pluginName !== $this->controllerContext->getRequest()->getPluginName()
@@ -90,10 +90,10 @@ protected function getAjaxUri()
         $argumentPrefix = $this->controllerContext->getRequest()->getArgumentPrefix();
 
         $uriBuilder->reset()
-            ->setArguments(array_merge(array($argumentPrefix => $arguments), $additionalParams))
+            ->setArguments(array_merge([$argumentPrefix => $arguments], $additionalParams))
             ->setSection($this->arguments['section'])
             ->setAddQueryString(true)
-            ->setArgumentsToBeExcludedFromQueryString(array($argumentPrefix, 'cHash'))
+            ->setArgumentsToBeExcludedFromQueryString([$argumentPrefix, 'cHash'])
             ->setFormat($this->arguments['format'])
             ->setUseCacheHash(true);
 
@@ -114,7 +114,7 @@ protected function getWidgetUri()
     {
         $uriBuilder = $this->controllerContext->getUriBuilder();
         $argumentPrefix = $this->controllerContext->getRequest()->getArgumentPrefix();
-        $arguments = $this->hasArgument('arguments') ? $this->arguments['arguments'] : array();
+        $arguments = $this->hasArgument('arguments') ? $this->arguments['arguments'] : [];
         if ($this->hasArgument('action')) {
             $arguments['action'] = $this->arguments['action'];
         }
@@ -125,10 +125,10 @@ protected function getWidgetUri()
             $arguments['addQueryStringMethod'] = $this->arguments['addQueryStringMethod'];
         }
         $uriBuilder->reset()
-            ->setArguments(array($argumentPrefix => $arguments))
+            ->setArguments([$argumentPrefix => $arguments])
             ->setSection($this->arguments['section'])
             ->setAddQueryString(true)
-            ->setArgumentsToBeExcludedFromQueryString(array($argumentPrefix, 'cHash'))
+            ->setArgumentsToBeExcludedFromQueryString([$argumentPrefix, 'cHash'])
             ->setFormat($this->arguments['format']);
 
         // TYPO3 6.0 compatibility check:
diff --git a/Tests/Functional/AbstractRenderingTestCase.php b/Tests/Functional/AbstractRenderingTestCase.php
@@ -26,18 +26,18 @@ abstract class AbstractRenderingTestCase extends FunctionalTestCase
     /**
      * @var string[]
      */
-    protected $testExtensionsToLoad = array('typo3conf/ext/typoscript_rendering');
+    protected $testExtensionsToLoad = ['typo3conf/ext/typoscript_rendering'];
 
     /**
      * @var string[]
      */
-    protected $coreExtensionsToLoad = array('fluid');
+    protected $coreExtensionsToLoad = ['fluid'];
 
     public function setUp()
     {
         parent::setUp();
         $this->importDataSet(__DIR__ . '/Fixtures/Database/pages.xml');
-        $this->setUpFrontendRootPage(1, array('EXT:typoscript_rendering/Tests/Functional/Fixtures/Frontend/Basic.ts'));
+        $this->setUpFrontendRootPage(1, ['EXT:typoscript_rendering/Tests/Functional/Fixtures/Frontend/Basic.ts']);
     }
 
     /* ***********************************************
@@ -53,7 +53,7 @@ public function setUp()
      */
     protected function getRenderUrl($pageId, $languageId, $path)
     {
-        $requestArguments = array('id' => $pageId, 'L' => $languageId, 'path' => $path);
+        $requestArguments = ['id' => $pageId, 'L' => $languageId, 'path' => $path];
         return $this->fetchFrontendResponse($requestArguments)->getContent();
     }
 
@@ -71,18 +71,18 @@ protected function fetchFrontendResponse(array $requestArguments, $failOnFailure
             $requestUrl = '/?' . GeneralUtility::implodeArrayForUrl('', $requestArguments);
         }
 
-        $arguments = array(
+        $arguments = [
             'documentRoot' => $this->getInstancePath(),
             'requestUrl' => 'http://localhost' . $requestUrl,
-        );
+        ];
 
         $template = new \Text_Template('ntf://Frontend/Request.tpl');
         $template->setVar(
-            array(
+            [
                 'arguments' => var_export($arguments, true),
                 'originalRoot' => ORIGINAL_ROOT,
                 'ntfRoot' => __DIR__ . '/../../.Build/vendor/nimut/testing-framework/',
-            )
+            ]
         );
 
         if (class_exists('PHPUnit_Util_PHP')) {
diff --git a/Tests/Functional/FeNoPhpScriptIncludeRenderingTest.php b/Tests/Functional/FeNoPhpScriptIncludeRenderingTest.php
@@ -18,18 +18,18 @@ class FeNoPhpScriptIncludeRenderingTest extends AbstractRenderingTestCase
     /**
      * @var array
      */
-    protected $configurationToUseInTestInstance = array(
-        'FE' => array(
+    protected $configurationToUseInTestInstance = [
+        'FE' => [
             'noPHPscriptInclude' => true,
-        ),
-    );
+        ],
+    ];
 
     /**
      * @test
      */
     public function contentIsRenderedWithNoPhpScriptInclusionEnabled()
     {
-        $requestArguments = array('url' => $this->getRenderUrl(1, 1, 'lib.link'));
+        $requestArguments = ['url' => $this->getRenderUrl(1, 1, 'lib.link')];
         $expectedContent = '<a href="/index.php?id=1&amp;L=1" target="_blank">link</a>';
         $this->assertSame($expectedContent, $this->fetchFrontendResponse($requestArguments)->getContent());
     }
diff --git a/Tests/Functional/RenderingTest.php b/Tests/Functional/RenderingTest.php
@@ -20,7 +20,7 @@ class RenderingTest extends AbstractRenderingTestCase
      */
     public function urlGeneratedRespectAbsRefPrefixAndLinkVarsAndTarget()
     {
-        $requestArguments = array('url' => $this->getRenderUrl(1, 1, 'lib.link'));
+        $requestArguments = ['url' => $this->getRenderUrl(1, 1, 'lib.link')];
         $expectedContent = '<a href="/index.php?id=1&amp;L=1" target="_blank">link</a>';
         $this->assertSame($expectedContent, $this->fetchFrontendResponse($requestArguments)->getContent());
     }
@@ -30,7 +30,7 @@ public function urlGeneratedRespectAbsRefPrefixAndLinkVarsAndTarget()
      */
     public function emailViewHelperWorksAlsoWithSpamProtection()
     {
-        $requestArguments = array('url' => $this->getRenderUrl(1, 1, 'lib.fluid'));
+        $requestArguments = ['url' => $this->getRenderUrl(1, 1, 'lib.fluid')];
         $expectedContent = '<a href="javascript:linkTo_UnCryptMailto(\'ocknvq,kphqBjgnjwo0kq\');">info(AT)helhum(DOT)io</a>';
         $this->assertSame($expectedContent, $this->fetchFrontendResponse($requestArguments)->getContent());
     }
diff --git a/Tests/Unit/Configuration/RecordRenderingConfigurationBuilderTest.php b/Tests/Unit/Configuration/RecordRenderingConfigurationBuilderTest.php
diff --git a/Tests/Unit/Renderer/RecordRendererTest.php b/Tests/Unit/Renderer/RecordRendererTest.php
diff --git a/ext_localconf.php b/ext_localconf.php

Original file line number	Diff line number	Diff line change
`@@ -45,10 +45,10 @@ public function configurationFor($extensionName, $pluginName, $contextRecord = '`
`45`	`45`	`list($tableName, $uid) = $this->resolveTableNameAndUidFromContextString($contextRecord);`
`46`	`46`	`$pluginSignature = $this->buildPluginSignature($extensionName, $pluginName);`
`47`	`47`	`$renderingPath = $this->resolveRenderingPath($pluginSignature);`
`48`		`- return array(`
	`48`	`+ return [`
`49`	`49`	`'record' => $tableName . '_' . $uid,`
`50`	`50`	`'path' => $renderingPath,`
`51`		`- );`
	`51`	`+ ];`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`/**`
`@@ -68,11 +68,11 @@ protected function resolveTableNameAndUidFromContextString($contextRecord)`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`if ($contextRecord === 'currentPage') {`
`71`		`- $tableNameAndUid = array('pages', $this->renderingContext->getFrontendController()->id);`
	`71`	`+ $tableNameAndUid = ['pages', $this->renderingContext->getFrontendController()->id];`
`72`	`72`	`} else {`
`73`	`73`	`$tableNameAndUid = explode(':', $contextRecord);`
`74`	`74`	`if (count($tableNameAndUid) !== 2 \|\| empty($tableNameAndUid[0]) \|\| empty($tableNameAndUid[1]) \|\| !MathUtility::canBeInterpretedAsInteger($tableNameAndUid[1])) {`
`75`		`- $tableNameAndUid = array('pages', $this->renderingContext->getFrontendController()->id);`
	`75`	`+ $tableNameAndUid = ['pages', $this->renderingContext->getFrontendController()->id];`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`// TODO: maybe check if the record is available`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function canRender(Request $request)`
`57`	`57`	`*/`
`58`	`58`	`protected function resolveRenderingConfiguration(Request $request, RenderingContext $renderingContext)`
`59`	`59`	`{`
`60`		`- $configuration = array();`
	`60`	`+ $configuration = [];`
`61`	`61`
`62`	`62`	`if ($request->hasArgument('path')) {`
`63`	`63`	`$renderingPath = $request->getArgument('path');`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class AjaxActionViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractView`
`58`	`58`	`* @return string Rendered link`
`59`	`59`	`*`
`60`	`60`	`*/`
`61`		`- public function render($action = null, array $arguments = array(), $controller = null, $extensionName = null, $pluginName = null, $pageUid = null, $section = '', $format = '', $linkAccessRestrictedPages = false, array $additionalParams = array(), $absolute = false, $addQueryString = false, array $argumentsToBeExcludedFromQueryString = array(), $addQueryStringMethod = null, $contextRecord = 'current')`
	`61`	`+ public function render($action = null, array $arguments = [], $controller = null, $extensionName = null, $pluginName = null, $pageUid = null, $section = '', $format = '', $linkAccessRestrictedPages = false, array $additionalParams = [], $absolute = false, $addQueryString = false, array $argumentsToBeExcludedFromQueryString = [], $addQueryStringMethod = null, $contextRecord = 'current')`
`62`	`62`	`{`
`63`	`63`	`if ($pluginName === null) {`
`64`	`64`	`$pluginName = $this->controllerContext->getRequest()->getPluginName();`