The new level 9 of phpstan is pretty crazy. And Magento coding standards don't seem to like the assert function calls for some reason ...

hostep · hostep · commit b077bf077ecc · 2021-11-10T22:23:15.000+01:00
diff --git a/Checker/Catalog/Category/UrlKey/DuplicateUrlKey.php b/Checker/Catalog/Category/UrlKey/DuplicateUrlKey.php
@@ -59,6 +59,8 @@ private function checkForDuplicatedUrlKeyAttributeValues(): array
                 $categories = $this->urlPathsInfo[$urlPath];
 
                 foreach ($categories as $category) {
+                    assert(is_numeric($category->getEntityId()));
+
                     $categoriesWithProblems[] = [
                         'catId'   => (int) $category->getEntityId(),
                         'name'    => $category->getName(),
diff --git a/Checker/Catalog/Category/UrlKey/EmptyUrlKey.php b/Checker/Catalog/Category/UrlKey/EmptyUrlKey.php
@@ -100,6 +100,8 @@ private function getCategoriesWithProblems(int $storeId, CategoryCollection $col
             ;
 
             if ($isOverridden || $storeId === Store::DEFAULT_STORE_ID) {
+                assert(is_numeric($category->getEntityId()));
+
                 $problems[] = [
                     'catId'   => (int) $category->getEntityId(),
                     'name'    => $category->getName(),
diff --git a/Checker/Catalog/Category/UrlPath.php b/Checker/Catalog/Category/UrlPath.php
@@ -75,6 +75,8 @@ public function checkForIncorrectUrlPathAttributeValues(): array
                 if (!$this->doesCategoryUrlPathMatchCalculatedUrlPath($category, $storeId)) {
                     $correctUrlPath = $this->getCalculatedUrlPathForCategory($category, $storeId);
 
+                    assert(is_numeric($category->getId()));
+
                     $problems[] = [
                         'catId'   => (int) $category->getId(),
                         'name'    => $category->getName(),
@@ -117,6 +119,8 @@ public function getCalculatedUrlPathForCategory(Category $category, int $storeId
             $this->fetchAllCategoriesWithUrlPathCalculatedByUrlKey();
         }
 
+        assert(is_numeric($category->getId()));
+
         $categoryId = (int) $category->getId();
         $key = $this->getArrayKeyForCategoryAndStoreId($categoryId, $storeId);
 
@@ -140,6 +144,8 @@ private function fetchAllCategoriesWithUrlPathCalculatedByUrlKey()
 
             $allCategories = $this->getAllVisibleCategoriesWithStoreId($storeId);
             foreach ($allCategories as $category) {
+                assert(is_numeric($category->getId()));
+
                 $categoryId = (int) $category->getId();
 
                 $path = $category->getPath() ?: '';
diff --git a/Checker/Catalog/Product/UrlKey/DuplicateUrlKey.php b/Checker/Catalog/Product/UrlKey/DuplicateUrlKey.php
@@ -25,6 +25,7 @@ class DuplicateUrlKey
     private $progressIndex;
     private $productCollectionFactory;
     private $attributeScopeOverriddenValueFactory;
+    /** @var array<string, string> */
     private $cachedProductUrlKeyData;
     private $cachedProductSkusByIds;
 
@@ -112,6 +113,8 @@ private function checkForDuplicatedUrlKeyAttributeValues(): array
     private function storeProductUrlKeyData(int $storeId, ProductCollection $collection)
     {
         foreach ($collection as $product) {
+            assert(is_numeric($product->getEntityId()));
+
             $productId     = $product->getEntityId();
             $productSku    = $product->getSku();
             $productUrlKey = $product->getUrlKey();
diff --git a/Checker/Catalog/Product/UrlKey/EmptyUrlKey.php b/Checker/Catalog/Product/UrlKey/EmptyUrlKey.php
@@ -122,6 +122,8 @@ private function getProductsWithProblems(int $storeId, ProductCollection $collec
             ;
 
             if ($isOverridden || $storeId === Store::DEFAULT_STORE_ID) {
+                assert(is_numeric($product->getEntityId()));
+
                 $problems[] = [
                     'productId' => (int) $product->getEntityId(),
                     'sku'       => $product->getSku(),
diff --git a/Checker/Catalog/Product/UrlPath.php b/Checker/Catalog/Product/UrlPath.php
@@ -91,6 +91,8 @@ private function getProductsWithProblems(int $storeId, ProductCollection $collec
             ;
 
             if ($isOverridden || $storeId === Store::DEFAULT_STORE_ID) {
+                assert(is_numeric($product->getEntityId()));
+
                 $problems[] = [
                     'productId' => (int) $product->getEntityId(),
                     'sku'       => $product->getSku(),
diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ check: checkstyle checkquality test
 .PHONY: checkstyle
 checkstyle:
 	vendor/bin/php-cs-fixer fix --dry-run --diff --stop-on-violation --allow-risky=yes
-	vendor/bin/phpcs -s --standard=Magento2 --ignore=./vendor/ .
+	vendor/bin/phpcs -s --standard=Magento2 --exclude=Magento2.Security.InsecureFunction --ignore=./vendor/ .
 	vendor/bin/phpcs -s --standard=PHPCompatibility --runtime-set testVersion 7.0- --ignore=./vendor/,./Test/ .
 	vendor/bin/phpcs -s --standard=PHPCompatibility --runtime-set testVersion 7.1- ./Test/
 	composer normalize --dry-run
diff --git a/Model/ResourceModel/Catalog/Category/UrlKeyCollection.php b/Model/ResourceModel/Catalog/Category/UrlKeyCollection.php
@@ -43,7 +43,9 @@ public function loadData($printQuery = false, $logQuery = false)
         if (!$this->isLoaded()) {
             $urlKeys = $this->storage->read(UrlKeyChecker::STORAGE_IDENTIFIER);
             foreach ($urlKeys as $urlKey) {
-                $this->addItem($this->createDataObject($urlKey));
+                if (is_array($urlKey)) {
+                    $this->addItem($this->createDataObject($urlKey));
+                }
             }
 
             foreach ($this->_orders as $field => $direction) {
@@ -83,6 +85,7 @@ public function createDataObject(array $arguments = []): DataObject
     {
         $arguments['hash'] = sha1(json_encode($arguments) ?: '');
 
+        /** @var DataObject */
         $obj = $this->_entityFactory->create($this->_itemObjectClass, ['data' => $arguments]);
 
         $attributes = [];
diff --git a/Model/ResourceModel/Catalog/Category/UrlPathCollection.php b/Model/ResourceModel/Catalog/Category/UrlPathCollection.php
@@ -43,7 +43,9 @@ public function loadData($printQuery = false, $logQuery = false)
         if (!$this->isLoaded()) {
             $urlPaths = $this->storage->read(UrlPathChecker::STORAGE_IDENTIFIER);
             foreach ($urlPaths as $urlPath) {
-                $this->addItem($this->createDataObject($urlPath));
+                if (is_array($urlPath)) {
+                    $this->addItem($this->createDataObject($urlPath));
+                }
             }
 
             foreach ($this->_orders as $field => $direction) {
@@ -83,6 +85,7 @@ public function createDataObject(array $arguments = []): DataObject
     {
         $arguments['hash'] = sha1(json_encode($arguments) ?: '');
 
+        /** @var DataObject */
         $obj = $this->_entityFactory->create($this->_itemObjectClass, ['data' => $arguments]);
 
         $attributes = [];
diff --git a/Model/ResourceModel/Catalog/Product/UrlKeyCollection.php b/Model/ResourceModel/Catalog/Product/UrlKeyCollection.php
@@ -43,7 +43,9 @@ public function loadData($printQuery = false, $logQuery = false)
         if (!$this->isLoaded()) {
             $urlKeys = $this->storage->read(UrlKeyChecker::STORAGE_IDENTIFIER);
             foreach ($urlKeys as $urlKey) {
-                $this->addItem($this->createDataObject($urlKey));
+                if (is_array($urlKey)) {
+                    $this->addItem($this->createDataObject($urlKey));
+                }
             }
 
             foreach ($this->_orders as $field => $direction) {
@@ -83,6 +85,7 @@ public function createDataObject(array $arguments = []): DataObject
     {
         $arguments['hash'] = sha1(json_encode($arguments) ?: '');
 
+        /** @var DataObject */
         $obj = $this->_entityFactory->create($this->_itemObjectClass, ['data' => $arguments]);
 
         $attributes = [];
diff --git a/Model/ResourceModel/Catalog/Product/UrlPathCollection.php b/Model/ResourceModel/Catalog/Product/UrlPathCollection.php
@@ -43,7 +43,9 @@ public function loadData($printQuery = false, $logQuery = false)
         if (!$this->isLoaded()) {
             $urlPaths = $this->storage->read(UrlPathChecker::STORAGE_IDENTIFIER);
             foreach ($urlPaths as $urlPath) {
-                $this->addItem($this->createDataObject($urlPath));
+                if (is_array($urlPath)) {
+                    $this->addItem($this->createDataObject($urlPath));
+                }
             }
 
             foreach ($this->_orders as $field => $direction) {
@@ -83,6 +85,7 @@ public function createDataObject(array $arguments = []): DataObject
     {
         $arguments['hash'] = sha1(json_encode($arguments) ?: '');
 
+        /** @var DataObject */
         $obj = $this->_entityFactory->create($this->_itemObjectClass, ['data' => $arguments]);
 
         $attributes = [];
diff --git a/Storage/CacheStorage.php b/Storage/CacheStorage.php
@@ -33,7 +33,13 @@ public function read(string $identifier): array
     {
         $data = $this->cache->load($this->getModuleCacheIdentifier($identifier)) ?: '{}';
 
-        return json_decode($data, true);
+        $data = json_decode($data, true);
+
+        if ($data === null || !is_array($data)) {
+            $data = [];
+        }
+
+        return $data;
     }
 
     private function getModuleCacheIdentifier(string $identifier): string
diff --git a/Storage/FileStorage.php b/Storage/FileStorage.php
@@ -68,7 +68,12 @@ public function read(string $identifier): array
             $data = '{}';
         }
 
-        return json_decode($data, true);
+        $data = json_decode($data, true);
+        if ($data === null || !is_array($data)) {
+            $data = [];
+        }
+
+        return $data;
     }
 
     private function getFilename(string $identifier): string
@@ -82,7 +87,7 @@ private function getPath(): string
             self::CONFIG_PATH
         );
 
-        if ($path === '' || $path === null) {
+        if ($path === '' || $path === null || !is_string($path)) {
             $path = 'var/tmp';
         }
 
diff --git a/Storage/Meta.php b/Storage/Meta.php
@@ -124,7 +124,9 @@ private function getStartTime(string $storageIdentifier): int
     {
         $metaData = $this->storage->read($storageIdentifier);
         if (!empty($metaData) && array_key_exists('started', $metaData)) {
-            return $metaData['started'];
+            assert(is_numeric($metaData['started']));
+
+            return (int) $metaData['started'];
         }
 
         return 0;

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,8 @@ private function getCategoriesWithProblems(int $storeId, CategoryCollection $col`
`100`	`100`	`;`
`101`	`101`
`102`	`102`	`if ($isOverridden \|\| $storeId === Store::DEFAULT_STORE_ID) {`
	`103`	`+ assert(is_numeric($category->getEntityId()));`
	`104`	`+`
`103`	`105`	`$problems[] = [`
`104`	`106`	`'catId' => (int) $category->getEntityId(),`
`105`	`107`	`'name' => $category->getName(),`
Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,8 @@ private function getProductsWithProblems(int $storeId, ProductCollection $collec`
`122`	`122`	`;`
`123`	`123`
`124`	`124`	`if ($isOverridden \|\| $storeId === Store::DEFAULT_STORE_ID) {`
	`125`	`+ assert(is_numeric($product->getEntityId()));`
	`126`	`+`
`125`	`127`	`$problems[] = [`
`126`	`128`	`'productId' => (int) $product->getEntityId(),`
`127`	`129`	`'sku' => $product->getSku(),`
Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,8 @@ private function getProductsWithProblems(int $storeId, ProductCollection $collec`
`91`	`91`	`;`
`92`	`92`
`93`	`93`	`if ($isOverridden \|\| $storeId === Store::DEFAULT_STORE_ID) {`
	`94`	`+ assert(is_numeric($product->getEntityId()));`
	`95`	`+`
`94`	`96`	`$problems[] = [`
`95`	`97`	`'productId' => (int) $product->getEntityId(),`
`96`	`98`	`'sku' => $product->getSku(),`