Use current php-cs-fixer rules

Author: MalteWunsch

.php_cs.dist

@@ -1,20 +1,23 @@
 <?php
 
 return PhpCsFixer\Config::create()
-    ->setRules(array(
+    ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
-//         'array_syntax' => array('syntax' => 'long'),
+        'array_syntax' => array('syntax' => 'short'),
         'no_unreachable_default_argument_value' => false,
         'braces' => array('allow_single_line_closure' => true),
         'heredoc_to_nowdoc' => false,
         'phpdoc_annotation_without_dot' => false,
-    ))
+    ])
     ->setRiskyAllowed(true)
     ->setFinder(
         PhpCsFixer\Finder::create()
             ->in(__DIR__)
-            ->notPath('Tests/Fixtures/cache/')
+            ->notPath('conf/')
+            ->notPath('tmp/')
+            ->notPath('node_modules/')    
+            ->notPath('var/cache')
             ->notPath('vendor/')
     )
 ;

Handler/EmbeddedShortcodeHandler.php

@@ -33,10 +33,10 @@ class EmbeddedShortcodeHandler
 
     /**
      * @param FragmentHandler $fragmentHandler
-     * @param string $controllerName
-     * @param string $renderer
+     * @param string          $controllerName
+     * @param string          $renderer
      * @param LoggerInterface $logger
-     * @param RequestStack $requestStack
+     * @param RequestStack    $requestStack
      */
     public function __construct(
         FragmentHandler $fragmentHandler,
@@ -79,7 +79,7 @@ public function __invoke(ShortcodeInterface $shortcode)
                 $this->renderer
             );
         } catch (\InvalidArgumentException $exception) {
-            if ($this->renderer === 'esi') {
+            if ('esi' === $this->renderer) {
                 throw new \InvalidArgumentException(
                     'An InvalidArgumentException occured while trying to render the shortcode '
                     .$shortcode->getShortcodeText().'. You\'ve probably tried to use the ESI rendering  strategy for '

Tests/Functional/ShortcodeFacadeTest.php

@@ -4,7 +4,6 @@
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Controller\ControllerReference;
 use Symfony\Component\HttpKernel\Fragment\FragmentHandler;
 

Tests/Functional/ShortcodeTest.php

@@ -35,6 +35,7 @@ protected function setUp(): void
 
     /**
      * @param array|string|null $customParameters use of strings is deprecated, use array instead.
+     *
      * @return Crawler
      */
     protected function getRenderedExampleHtml(?array $customParameters = null): string
@@ -44,6 +45,7 @@ protected function getRenderedExampleHtml(?array $customParameters = null): stri
 
     /**
      * @param array|string|null $customParameters use of strings is deprecated, use array instead.
+     *
      * @return Crawler
      */
     protected function crawlRenderedExample(/*array*/ $customParameters = null): Crawler
@@ -64,8 +66,9 @@ protected function crawlRenderedExample(/*array*/ $customParameters = null): Cra
     }
 
     /**
-     * @param int $expectedStatusCode
-     * @param array|string|null $customParameters use of strings is deprecated, use array instead.
+     * @param int               $expectedStatusCode
+     * @param array|string|null $customParameters   use of strings is deprecated, use array instead.
+     *
      * @return Crawler
      */
     protected function assertHttpStatusCodeWhenCrawlingRenderedExample(
@@ -80,6 +83,7 @@ protected function assertHttpStatusCodeWhenCrawlingRenderedExample(
 
     /**
      * @param array|string|null $customParameters use of strings is deprecated, use array instead.
+     *
      * @return Crawler
      */
     private function getUrlWithRenderedExample(/*array*/ $customParameters = null): string
@@ -96,14 +100,14 @@ private function getUrlWithRenderedExample(/*array*/ $customParameters = null):
 
     private function getCustomParametersAsString($customParametersAsMixed): ?string
     {
-        if (is_string($customParametersAsMixed)) {
+        if (\is_string($customParametersAsMixed)) {
             return $customParametersAsMixed;
         }
 
-        if (is_array($customParametersAsMixed)) {
+        if (\is_array($customParametersAsMixed)) {
             $customParametersAsString = '';
             foreach ($customParametersAsMixed as $name => $value) {
-                $customParametersAsString .= $name .'='.$value.' ';
+                $customParametersAsString .= $name.'='.$value.' ';
             }
 
             return $customParametersAsString;