Merge branch 'v1-develop' into v1

Author: hostep

Makefile

@@ -12,7 +12,8 @@ check: checkstyle checkquality test
 checkstyle:
 	vendor/bin/php-cs-fixer fix --dry-run --diff --stop-on-violation --allow-risky=yes
 	vendor/bin/phpcs --standard=Magento2 --ignore=./vendor/ .
-	vendor/bin/phpcs --standard=PHPCompatibility --runtime-set testVersion 7.0- --ignore=./vendor/ .
+	vendor/bin/phpcs --standard=PHPCompatibility --runtime-set testVersion 7.0- --ignore=./vendor/,./Test/ .
+	vendor/bin/phpcs --standard=PHPCompatibility --runtime-set testVersion 7.1- ./Test/
 	composer normalize --dry-run
 
 .PHONY: checkquality

Model/ResourceModel/Catalog/Category/UrlKeyCollection.php

@@ -59,6 +59,10 @@ public function loadData($printQuery = false, $logQuery = false)
 
             $this->_setIsLoaded();
 
+            // fill $this->_totalRecords by calling getSize
+            // if we don't do this and leave this up to Magento, it will do it too late in Magento 2.4.x
+            $this->getSize();
+
             // page the data, need to do this after setting the data as loaded,
             // otherwise the getCurPage would create a recursive problem
             $startIndex = ($this->getCurPage() - 1) * $this->getPageSize();

Model/ResourceModel/Catalog/Category/UrlPathCollection.php

@@ -59,6 +59,10 @@ public function loadData($printQuery = false, $logQuery = false)
 
             $this->_setIsLoaded();
 
+            // fill $this->_totalRecords by calling getSize
+            // if we don't do this and leave this up to Magento, it will do it too late in Magento 2.4.x
+            $this->getSize();
+
             // page the data, need to do this after setting the data as loaded,
             // otherwise the getCurPage would create a recursive problem
             $startIndex = ($this->getCurPage() - 1) * $this->getPageSize();

Model/ResourceModel/Catalog/Product/UrlKeyCollection.php

@@ -59,6 +59,10 @@ public function loadData($printQuery = false, $logQuery = false)
 
             $this->_setIsLoaded();
 
+            // fill $this->_totalRecords by calling getSize
+            // if we don't do this and leave this up to Magento, it will do it too late in Magento 2.4.x
+            $this->getSize();
+
             // page the data, need to do this after setting the data as loaded,
             // otherwise the getCurPage would create a recursive problem
             $startIndex = ($this->getCurPage() - 1) * $this->getPageSize();

Model/ResourceModel/Catalog/Product/UrlPathCollection.php

@@ -59,6 +59,10 @@ public function loadData($printQuery = false, $logQuery = false)
 
             $this->_setIsLoaded();
 
+            // fill $this->_totalRecords by calling getSize
+            // if we don't do this and leave this up to Magento, it will do it too late in Magento 2.4.x
+            $this->getSize();
+
             // page the data, need to do this after setting the data as loaded,
             // otherwise the getCurPage would create a recursive problem
             $startIndex = ($this->getCurPage() - 1) * $this->getPageSize();

Test/Checker/Catalog/Product/UrlKey/DuplicateUrlKeyTest.php

@@ -21,7 +21,7 @@ class DuplicateUrlKeyTest extends TestCase
     /** @var ObjectManagerHelper */
     private $objectManagerHelper;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManagerHelper = new ObjectManagerHelper($this);
     }
@@ -56,6 +56,7 @@ function ($productData) use ($storeId) {
 
         $collectionsPerStoreId = array_map(
             function ($productsData) {
+                /** @var MockObject $productCollectionMock */
                 $productCollectionMock = $this->objectManagerHelper
                     ->getCollectionMock(ProductCollection::class, $productsData);
 

composer.json

@@ -12,9 +12,9 @@
     ],
     "require": {
         "php": "~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0",
-        "magento/framework": "^100.1 || ^101.0 || ^102.0",
-        "magento/module-backend": "^100.1 || ^101.0",
-        "magento/module-catalog": "^101.0 || ^102.0 || ^103.0",
+        "magento/framework": "^100.1 || ^101.0 || ^102.0 || ^103.0",
+        "magento/module-backend": "^100.1 || ^101.0 || ^102.0",
+        "magento/module-catalog": "^101.0 || ^102.0 || ^103.0 || ^104.0",
         "magento/module-cron": "^100.1",
         "magento/module-store": "^100.1 || ^101.0",
         "magento/module-ui": "^100.1 || ^101.0",
@@ -28,8 +28,8 @@
         "phpcompatibility/php-compatibility": "^9.2",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan": "^0.12.26",
-        "phpunit/phpunit": "^7.5",
-        "vimeo/psalm": "^3.11"
+        "phpunit/phpunit": "^9.0",
+        "vimeo/psalm": "^3.12"
     },
     "config": {
         "sort-packages": true