Merge branch 'v1' into v1-develop

hostep · hostep · commit c03a7cc05dfc · 2021-03-22T09:56:59.000+01:00
diff --git a/Checker/Catalog/Category/UrlKey/DuplicateUrlKey.php b/Checker/Catalog/Category/UrlKey/DuplicateUrlKey.php
@@ -78,6 +78,8 @@ private function checkForDuplicatedUrlKeyAttributeValues(): array
      */
     private function getCategoryUrlPathsByStoreId(int $storeId): array
     {
+        $this->urlPathsInfo = [];
+
         $urlPaths = [];
 
         $categories = $this->urlPathChecker->getAllVisibleCategoriesWithStoreId($storeId);
diff --git a/Console/Progress.php b/Console/Progress.php
@@ -70,10 +70,6 @@ public function setMessage(string $message)
         }
     }
 
-    /**
-     * @psalm-suppress ReservedWord
-     * When we remove PHP 7.0 support from the composer.json file, we can remove this suppress line
-     */
     public function finish()
     {
         if ($this->canOutput()) {
diff --git a/Makefile b/Makefile
@@ -19,7 +19,6 @@ 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
diff --git a/composer.json b/composer.json
@@ -21,15 +21,14 @@
         "symfony/console": "^2.5 || ^3.0 || ^4.0 || ^5.0"
     },
     "require-dev": {
-        "bitexpert/phpstan-magento": "^0.6.0",
+        "bitexpert/phpstan-magento": "^0.7.0",
         "ergebnis/composer-normalize": "^2.2",
         "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",
-        "phpunit/phpunit": "^9.0",
-        "vimeo/psalm": "^3.12"
+        "phpunit/phpunit": "^9.0"
     },
     "config": {
         "sort-packages": true
diff --git a/composer.lock b/composer.lock
diff --git a/psalm.xml b/psalm.xml

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,8 @@ private function checkForDuplicatedUrlKeyAttributeValues(): array`
`78`	`78`	`*/`
`79`	`79`	`private function getCategoryUrlPathsByStoreId(int $storeId): array`
`80`	`80`	`{`
	`81`	`+ $this->urlPathsInfo = [];`
	`82`	`+`
`81`	`83`	`$urlPaths = [];`
`82`	`84`
`83`	`85`	`$categories = $this->urlPathChecker->getAllVisibleCategoriesWithStoreId($storeId);`
Original file line number	Diff line number	Diff line change
`@@ -70,10 +70,6 @@ public function setMessage(string $message)`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
`73`		`- /**`
`74`		`- * @psalm-suppress ReservedWord`
`75`		`- * When we remove PHP 7.0 support from the composer.json file, we can remove this suppress line`
`76`		`- */`
`77`	`73`	`public function finish()`
`78`	`74`	`{`
`79`	`75`	`if ($this->canOutput()) {`