Updated friendsofphp/php-cs-fixer from v2.16.4 to v2.17.3, including its dependencies (see details), also updated coding standard rules a bit and fixed offending code.

hostep · hostep · commit 5193e83cfe6e · 2021-01-07T18:26:40.000+01:00
- Updating composer/semver (1.5.1 =&gt; 1.7.2)
  - Updating composer/xdebug-handler (1.4.2 =&gt; 1.4.5)
  - Updating doctrine/annotations (1.10.3 =&gt; 1.11.1)
  - Updating friendsofphp/php-cs-fixer (v2.16.4 =&gt; v2.17.3)
  - Updating php-cs-fixer/diff (v1.3.0 =&gt; v1.3.1)
  - Updating symfony/console (v4.4.11 =&gt; v4.4.18)
  - Updating symfony/deprecation-contracts (v2.1.3 =&gt; v2.2.0)
  - Updating symfony/event-dispatcher (v4.4.11 =&gt; v4.4.18)
  - Updating symfony/filesystem (v5.1.3 =&gt; v5.2.1)
  - Updating symfony/finder (v5.1.3 =&gt; v5.2.1)
  - Updating symfony/options-resolver (v5.1.3 =&gt; v5.2.1)
  - Updating symfony/polyfill-ctype (v1.18.0 =&gt; v1.22.0)
  - Updating symfony/polyfill-mbstring (v1.18.0 =&gt; v1.22.0)
  - Updating symfony/polyfill-php70 (v1.18.0 =&gt; v1.20.0)
  - Updating symfony/polyfill-php72 (v1.18.0 =&gt; v1.22.0)
  - Updating symfony/polyfill-php73 (v1.18.0 =&gt; v1.22.0)
  - Updating symfony/polyfill-php80 (v1.18.0 =&gt; v1.22.0)
  - Updating symfony/process (v4.4.11 =&gt; v4.4.18)
  - Updating symfony/service-contracts (v2.1.3 =&gt; v2.2.0)
  - Updating symfony/stopwatch (v5.1.3 =&gt; v5.2.1)
diff --git a/.php_cs b/.php_cs
@@ -9,15 +9,24 @@ return PhpCsFixer\Config::create()
     ->setRules([
         '@Symfony'               => true,
         'array_syntax'           => ['syntax' => 'short'],
-        'binary_operator_spaces' => ['default' => null],
+        'binary_operator_spaces' => ['default' => null, 'operators' => ['=>' => 'align']],
         'concat_space'           => ['spacing' => 'one'],
         'declare_strict_types'   => true,
-        'ordered_imports'        => ['sort_algorithm' => 'alpha'],
-        'phpdoc_align'           => false,
-        'phpdoc_separation'      => false,
+        'no_alias_functions'     => true,
+        'no_useless_sprintf'     => true,
+        'ordered_imports'        => [
+            'imports_order' => [
+                'class',
+                'function',
+                'const',
+            ],
+            'sort_algorithm' => 'alpha'
+        ],
+        'phpdoc_align'           => ['align' => 'left'],
         'phpdoc_summary'         => false,
-        'yoda_style'             => null,
+        'self_accessor'          => true,
         'single_line_throw'      => false,
+        'yoda_style'             => null,
     ])
     ->setFinder($finder)
 ;
diff --git a/Checker/Catalog/Category/UrlKey/EmptyUrlKey.php b/Checker/Catalog/Category/UrlKey/EmptyUrlKey.php
@@ -64,11 +64,11 @@ private function checkForEmptyUrlKeyAttributeValues(): array
                 ->addAttributeToFilter([
                     [
                         'attribute' => UrlKeyChecker::URL_KEY_ATTRIBUTE,
-                        'null' => true,
+                        'null'      => true,
                     ],
                     [
                         'attribute' => UrlKeyChecker::URL_KEY_ATTRIBUTE,
-                        'eq' => '',
+                        'eq'        => '',
                     ],
                 ], null, $joinType)
             ;
diff --git a/Checker/Catalog/Product/UrlKey/EmptyUrlKey.php b/Checker/Catalog/Product/UrlKey/EmptyUrlKey.php
@@ -75,11 +75,11 @@ private function checkForEmptyUrlKeyAttributeValues(): array
                 ->addAttributeToFilter([
                     [
                         'attribute' => UrlKeyChecker::URL_KEY_ATTRIBUTE,
-                        'null' => true,
+                        'null'      => true,
                     ],
                     [
                         'attribute' => UrlKeyChecker::URL_KEY_ATTRIBUTE,
-                        'eq' => '',
+                        'eq'        => '',
                     ],
                 ], null, $joinType)
             ;
diff --git a/Model/ResourceModel/Catalog/Category/UrlKeyCollection.php b/Model/ResourceModel/Catalog/Category/UrlKeyCollection.php
@@ -85,7 +85,7 @@ public function createDataObject(array $arguments = []): DataObject
         foreach ($arguments as $key => $value) {
             $attribute = new AttributeValue([
                 AttributeInterface::ATTRIBUTE_CODE => $key,
-                AttributeInterface::VALUE => $value,
+                AttributeInterface::VALUE          => $value,
             ]);
 
             $attributes[] = $attribute;
diff --git a/Model/ResourceModel/Catalog/Category/UrlPathCollection.php b/Model/ResourceModel/Catalog/Category/UrlPathCollection.php
@@ -85,7 +85,7 @@ public function createDataObject(array $arguments = []): DataObject
         foreach ($arguments as $key => $value) {
             $attribute = new AttributeValue([
                 AttributeInterface::ATTRIBUTE_CODE => $key,
-                AttributeInterface::VALUE => $value,
+                AttributeInterface::VALUE          => $value,
             ]);
 
             $attributes[] = $attribute;
diff --git a/Model/ResourceModel/Catalog/Product/UrlKeyCollection.php b/Model/ResourceModel/Catalog/Product/UrlKeyCollection.php
@@ -85,7 +85,7 @@ public function createDataObject(array $arguments = []): DataObject
         foreach ($arguments as $key => $value) {
             $attribute = new AttributeValue([
                 AttributeInterface::ATTRIBUTE_CODE => $key,
-                AttributeInterface::VALUE => $value,
+                AttributeInterface::VALUE          => $value,
             ]);
 
             $attributes[] = $attribute;
diff --git a/Model/ResourceModel/Catalog/Product/UrlPathCollection.php b/Model/ResourceModel/Catalog/Product/UrlPathCollection.php
@@ -85,7 +85,7 @@ public function createDataObject(array $arguments = []): DataObject
         foreach ($arguments as $key => $value) {
             $attribute = new AttributeValue([
                 AttributeInterface::ATTRIBUTE_CODE => $key,
-                AttributeInterface::VALUE => $value,
+                AttributeInterface::VALUE          => $value,
             ]);
 
             $attributes[] = $attribute;
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     "require-dev": {
         "bitexpert/phpstan-magento": "^0.3.0",
         "ergebnis/composer-normalize": "^2.2",
-        "friendsofphp/php-cs-fixer": "^2.16",
+        "friendsofphp/php-cs-fixer": "^2.17",
         "magento/magento-coding-standard": "^5.0",
         "phpcompatibility/php-compatibility": "^9.2",
         "phpstan/extension-installer": "^1.0",
diff --git a/composer.lock b/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -64,11 +64,11 @@ private function checkForEmptyUrlKeyAttributeValues(): array`
`64`	`64`	`->addAttributeToFilter([`
`65`	`65`	`[`
`66`	`66`	`'attribute' => UrlKeyChecker::URL_KEY_ATTRIBUTE,`
`67`		`- 'null' => true,`
	`67`	`+ 'null' => true,`
`68`	`68`	`],`
`69`	`69`	`[`
`70`	`70`	`'attribute' => UrlKeyChecker::URL_KEY_ATTRIBUTE,`
`71`		`- 'eq' => '',`
	`71`	`+ 'eq' => '',`
`72`	`72`	`],`
`73`	`73`	`], null, $joinType)`
`74`	`74`	`;`
Original file line number	Diff line number	Diff line change
`@@ -75,11 +75,11 @@ private function checkForEmptyUrlKeyAttributeValues(): array`
`75`	`75`	`->addAttributeToFilter([`
`76`	`76`	`[`
`77`	`77`	`'attribute' => UrlKeyChecker::URL_KEY_ATTRIBUTE,`
`78`		`- 'null' => true,`
	`78`	`+ 'null' => true,`
`79`	`79`	`],`
`80`	`80`	`[`
`81`	`81`	`'attribute' => UrlKeyChecker::URL_KEY_ATTRIBUTE,`
`82`		`- 'eq' => '',`
	`82`	`+ 'eq' => '',`
`83`	`83`	`],`
`84`	`84`	`], null, $joinType)`
`85`	`85`	`;`