Update php-cs-fixer (2.14.2 is not compatible with Composer 2) (#180)

* Update php-cs-fixer (2.14.2 is not compatible with Composer 2) * Fix CS
ezsystems · Nov 10, 2020 · a89e0e0 · a89e0e0
1 parent 72ae58e
commit a89e0e0
Show file tree

Hide file tree

Showing 183 changed files with 212 additions and 558 deletions.
diff --git a/.php_cs b/.php_cs
@@ -1,28 +1,6 @@
 <?php
-return PhpCsFixer\Config::create()
-    ->setRules([
-        '@Symfony' => true,
-        '@Symfony:risky' => true,
-        'concat_space' => ['spacing' => 'one'],
-        'simplified_null_return' => false,
-        'phpdoc_align' => false,
-        'phpdoc_separation' => false,
-        'phpdoc_to_comment' => false,
-        'cast_spaces' => false,
-        'blank_line_after_opening_tag' => false,
-        'single_blank_line_before_namespace' => false,
-        'phpdoc_annotation_without_dot' => false,
-        'phpdoc_no_alias_tag' => false,
-        'space_after_semicolon' => false,
-        'yoda_style' => false,
-        'no_break_comment' => false,
 
-        // 2019 style updates with cs-fixer 2.14, all above are in sync with kernel
-        '@PHPUnit57Migration:risky' => true,
-        'array_syntax' => ['syntax' => 'short'],
-        'static_lambda' => true,
-    ])
-    ->setRiskyAllowed(true)
+return EzSystems\EzPlatformCodeStyle\PhpCsFixer\EzPlatformInternalConfigFactory::build()
     ->setFinder(
         PhpCsFixer\Finder::create()
             ->in(__DIR__)
@@ -32,5 +10,4 @@ return PhpCsFixer\Config::create()
                 'bundle/Resources/init_ini',
             ])
             ->files()->name('*.php')
-    )
-;
+    );
diff --git a/bootstrap.php b/bootstrap.php
@@ -1,12 +1,8 @@
 <?php
+
 /**
- * File containing the bootstrapping of eZ Publish API for unit test use.
- *
- * Setups class loading.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 use eZ\Publish\Core\MVC\Legacy\Kernel as LegacyKernel;
 use eZ\Publish\Core\MVC\Legacy\Kernel\CLIHandler as LegacyKernelCLI;

diff --git a/bundle/Cache/LegacyCachePurger.php b/bundle/Cache/LegacyCachePurger.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyCachePurger class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Cache;
 

diff --git a/bundle/Cache/PersistenceCachePurger.php b/bundle/Cache/PersistenceCachePurger.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the PersistenceCachePurger class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Cache;
 
@@ -179,6 +177,7 @@ public function contentVersion($contentId, $versionNo)
      * Also used when clearing content type meta data cache in admin cache interface (no id).
      *
      * @param int|null $id Purges all contentType cache if null
+     *
      * @throws \eZ\Publish\Core\Base\Exceptions\InvalidArgumentType On invalid $id type
      */
     public function contentType($id = null)
@@ -202,6 +201,7 @@ public function contentType($id = null)
      * In legacy kernel used when editing/removing content type group, so there is always an id.
      *
      * @param int $id
+     *
      * @throws \eZ\Publish\Core\Base\Exceptions\InvalidArgumentType On invalid $id type
      */
     public function contentTypeGroup($id)
@@ -224,6 +224,7 @@ public function contentTypeGroup($id)
      * In legacy kernel used when editing section, so there is always an id.
      *
      * @param int $id
+     *
      * @throws \eZ\Publish\Core\Base\Exceptions\InvalidArgumentType On invalid $id type
      */
     public function section($id)
@@ -283,6 +284,7 @@ public function stateAssign($contentId)
      * In legacy kernel used when clearing meta info cache on users in eZUser, never with id.
      *
      * @param int|null $id Purges all users cache if null
+     *
      * @throws \eZ\Publish\Core\Base\Exceptions\InvalidArgumentType On invalid $id type
      */
     public function user($id = null)

diff --git a/bundle/Cache/Switchable.php b/bundle/Cache/Switchable.php
@@ -1,7 +1,6 @@
 <?php
+
 /**
- * This file is part of the eZ Publish Kernel package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
@@ -24,6 +23,7 @@ public function switchOff()
 
     /**
      * Checks if the switch is off.
+     *
      * @return bool
      */
     public function isSwitchedOn()
@@ -33,6 +33,7 @@ public function isSwitchedOn()
 
     /**
      * Checks if the switch is off.
+     *
      * @return bool
      */
     public function isSwitchedOff()

diff --git a/bundle/Cache/SwitchableHttpCachePurger.php b/bundle/Cache/SwitchableHttpCachePurger.php
@@ -1,7 +1,6 @@
 <?php
+
 /**
- * This file is part of the EzPublishLegacyBridge package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */

diff --git a/bundle/Collector/LegacyTemplatesCollector.php b/bundle/Collector/LegacyTemplatesCollector.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * This file is part of the eZ Publish Kernel package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Collector;
 

diff --git a/bundle/Collector/TemplateDebugInfo.php b/bundle/Collector/TemplateDebugInfo.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * This file is part of the eZ Publish Kernel package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Collector;
 

diff --git a/bundle/Command/LegacyBundleInstallCommand.php b/bundle/Command/LegacyBundleInstallCommand.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyBundleInstallCommand class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Command;
 
@@ -65,6 +63,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
      * @param OutputInterface $output
      *
      * @throws \RuntimeException If a target link/directory exists and $options[force] isn't set to true
+     *
      * @return string The resulting link/directory
      */
     protected function linkLegacyExtension($extensionPath, array $options = [], OutputInterface $output)
@@ -135,6 +134,7 @@ protected function linkLegacyExtension($extensionPath, array $options = [], Outp
 
     /**
      * Removes the cwd from $path.
+     *
      * @param string $path
      */
     private function removeCwd($path)

diff --git a/bundle/Command/LegacyConfigurationCommand.php b/bundle/Command/LegacyConfigurationCommand.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyConfigurationCommand class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Command;
 

diff --git a/bundle/Command/LegacyEmbedScriptCommand.php b/bundle/Command/LegacyEmbedScriptCommand.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyEmbedScriptCommand class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Command;
 

diff --git a/bundle/Command/LegacyInitCommand.php b/bundle/Command/LegacyInitCommand.php
@@ -1,7 +1,6 @@
 <?php
+
 /**
- * File containing the LegacyInitCommand class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */

diff --git a/bundle/Command/LegacySrcSymlinkCommand.php b/bundle/Command/LegacySrcSymlinkCommand.php
@@ -1,7 +1,6 @@
 <?php
+
 /**
- * File containing the LegacySrcSymlinkCommand class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */

diff --git a/bundle/Command/LegacyWrapperInstallCommand.php b/bundle/Command/LegacyWrapperInstallCommand.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyWrapperInstallCommand class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Command;
 

diff --git a/bundle/Composer/ScriptHandler.php b/bundle/Composer/ScriptHandler.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the ScriptHandler class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Composer;
 

diff --git a/bundle/Controller.php b/bundle/Controller.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * This file is part of the eZ Publish Kernel package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle;
 

diff --git a/bundle/Controller/LegacyKernelController.php b/bundle/Controller/LegacyKernelController.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyKernelController class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Controller;
 

diff --git a/bundle/Controller/LegacyRestController.php b/bundle/Controller/LegacyRestController.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyRestController class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Controller;
 

diff --git a/bundle/Controller/LegacySetupController.php b/bundle/Controller/LegacySetupController.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacySetupController class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Controller;
 

diff --git a/bundle/Controller/LegacyTreeMenuController.php b/bundle/Controller/LegacyTreeMenuController.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyTreeMenuController class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Controller;
 

diff --git a/bundle/Controller/PreviewController.php b/bundle/Controller/PreviewController.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the PreviewController class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Controller;
 

diff --git a/bundle/Controller/WebsiteToolbarController.php b/bundle/Controller/WebsiteToolbarController.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the WebsiteToolbarController class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Controller;
 

diff --git a/bundle/DependencyInjection/Compiler/LegacyBundlesPass.php b/bundle/DependencyInjection/Compiler/LegacyBundlesPass.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyBundlesPass class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\DependencyInjection\Compiler;
 

diff --git a/bundle/DependencyInjection/Compiler/LegacyPass.php b/bundle/DependencyInjection/Compiler/LegacyPass.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * File containing the LegacyPass class.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\DependencyInjection\Compiler;
 

diff --git a/bundle/DependencyInjection/Compiler/LegacySessionPass.php b/bundle/DependencyInjection/Compiler/LegacySessionPass.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * This file is part of the eZ Publish LegacyBridge package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\DependencyInjection\Compiler;
 

diff --git a/bundle/DependencyInjection/Compiler/PageServicePass.php b/bundle/DependencyInjection/Compiler/PageServicePass.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
- * This file is part of the eZ LegacyBridge package.
- *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\DependencyInjection\Compiler;