Merge branch 'v1-develop' into v1

hostep · hostep · commit 7cf173297a05 · 2021-03-04T22:01:34.000+01:00
diff --git a/.php_cs b/.php_cs
@@ -8,16 +8,27 @@ $finder = PhpCsFixer\Finder::create()
 return PhpCsFixer\Config::create()
     ->setRules([
         '@Symfony'               => true,
+        '@PSR12'                 => 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,
+        'visibility_required'    => ['property', 'method'], // removed 'const' since we still support PHP 7.0 for now
+        '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.php b/Checker/Catalog/Product/UrlKey.php
@@ -6,7 +6,6 @@
 
 use Baldwin\UrlDataIntegrityChecker\Checker\Catalog\Product\UrlKey\DuplicateUrlKey as DuplicateUrlKeyChecker;
 use Baldwin\UrlDataIntegrityChecker\Checker\Catalog\Product\UrlKey\EmptyUrlKey as EmptyUrlKeyChecker;
-use Baldwin\UrlDataIntegrityChecker\Console\Progress;
 
 class UrlKey
 {
@@ -15,16 +14,13 @@ class UrlKey
 
     private $duplicateUrlKeyChecker;
     private $emptyUrlKeyChecker;
-    private $progress;
 
     public function __construct(
         DuplicateUrlKeyChecker $duplicateUrlKeyChecker,
-        EmptyUrlKeyChecker $emptyUrlKeyChecker,
-        Progress $progress
+        EmptyUrlKeyChecker $emptyUrlKeyChecker
     ) {
         $this->duplicateUrlKeyChecker = $duplicateUrlKeyChecker;
         $this->emptyUrlKeyChecker = $emptyUrlKeyChecker;
-        $this->progress = $progress;
     }
 
     /**
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/Cron/ScheduleJob.php b/Cron/ScheduleJob.php
@@ -42,8 +42,8 @@ public function schedule(string $jobCode): bool
         $schedule
             ->setJobCode($jobCode)
             ->setStatus(CronScheduleModel::STATUS_PENDING)
-            ->setCreatedAt(strftime('%Y-%m-%d %H:%M:%S', $createdAtTime))
-            ->setScheduledAt(strftime('%Y-%m-%d %H:%M', $scheduledAtTime))
+            ->setCreatedAt(strftime('%Y-%m-%d %H:%M:%S', $createdAtTime) ?: '')
+            ->setScheduledAt(strftime('%Y-%m-%d %H:%M', $scheduledAtTime) ?: '')
             ->save();
 
         return true;
diff --git a/Makefile b/Makefile
@@ -18,6 +18,9 @@ checkstyle:
 
 .PHONY: checkquality
 checkquality:
+	vendor/bin/phpstan analyse
+	vendor/bin/psalm
+
 	xmllint --noout --schema vendor/magento/module-backend/etc/menu.xsd            etc/adminhtml/menu.xml
 	xmllint --noout --schema vendor/magento/framework/App/etc/routes.xsd           etc/adminhtml/routes.xml
 	xmllint --noout --schema vendor/magento/framework/Acl/etc/acl.xsd              etc/acl.xml
@@ -35,9 +38,6 @@ checkquality:
 	xmllint --noout                                                                view/adminhtml/ui_component/baldwin_urldataintegritychecker_grid_catalog_product_urlkey.xml # schema validation doesn't work here since the xsd includes another xsd ..
 	xmllint --noout                                                                view/adminhtml/ui_component/baldwin_urldataintegritychecker_grid_catalog_product_urlpath.xml # schema validation doesn't work here since the xsd includes another xsd ..
 
-	vendor/bin/phpstan analyse
-	vendor/bin/psalm
-
 .PHONY: test
 test:
 	vendor/bin/phpunit Test/
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
@@ -21,10 +21,10 @@
         "symfony/console": "^2.5 || ^3.0 || ^4.0 || ^5.0"
     },
     "require-dev": {
-        "bitexpert/phpstan-magento": "^0.3.0",
+        "bitexpert/phpstan-magento": "^0.6.0",
         "ergebnis/composer-normalize": "^2.2",
-        "friendsofphp/php-cs-fixer": "^2.16",
-        "magento/magento-coding-standard": "^5.0",
+        "friendsofphp/php-cs-fixer": "^2.18",
+        "magento/magento-coding-standard": "^6.0",
         "phpcompatibility/php-compatibility": "^9.2",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan": "^0.12.26",
diff --git a/composer.lock b/composer.lock
diff --git a/phpstan.neon b/phpstan.neon

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`	`;`