Merge branch 'v1' into v1-develop

Author: hostep

.php-auto-version

@@ -1 +1 @@
-php81
+php82

Makefile

@@ -10,7 +10,7 @@ check: checkstyle checkquality test
 
 .PHONY: checkstyle
 checkstyle:
-	vendor-bin/php-cs-fixer/vendor/bin/php-cs-fixer fix --dry-run --diff --stop-on-violation --allow-risky=yes
+	PHP_CS_FIXER_IGNORE_ENV=1 vendor-bin/php-cs-fixer/vendor/bin/php-cs-fixer fix --dry-run --diff --stop-on-violation --allow-risky=yes
 	vendor-bin/phpcs/vendor/bin/phpcs -s --standard=Magento2 --exclude=Magento2.Security.InsecureFunction,Magento2.Commenting.ClassPropertyPHPDocFormatting,Magento2.Annotation.MethodAnnotationStructure,Magento2.Annotation.MethodArguments,PSR12.Properties.ConstantVisibility --ignore=./vendor/,./vendor-bin/ .
 	vendor-bin/phpcs/vendor/bin/phpcs -s --standard=PHPCompatibility --runtime-set testVersion 7.0- --ignore=./vendor/,./vendor-bin/,./Test/ .
 	vendor-bin/phpcs/vendor/bin/phpcs -s --standard=PHPCompatibility --runtime-set testVersion 7.1- ./Test/

README.md

@@ -29,7 +29,7 @@ It should be up to the store owner to figure out how he/she wants to fix these p
 This module should be compatible with Magento 2.1.x, 2.2.x, 2.3.x and 2.4.x versions.  
 Some code in this module is using old ways of doing things. It could have been written in a more modern way (using message queues instead of cronjobs, use newer syntax for UI components, ...). But we wanted this module to be compatible with older versions of Magento, so we've chosen this route for now.
 
-The module should be compatible with PHP 7.0, 7.1, 7.2, 7.3, 7.4 and 8.1
+The module should be compatible with PHP 7.0, 7.1, 7.2, 7.3, 7.4, 8.1 and 8.2
 
 ## Installation
 

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

@@ -13,7 +13,6 @@
 use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
 use Magento\Framework\DataObject;
-use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class DuplicateUrlKeyTest extends TestCase
@@ -48,7 +47,6 @@ function ($productData) use ($storeId) {
 
         $collectionsPerStoreId = array_map(
             function ($productsData) {
-                /** @var MockObject $productCollectionMock */
                 $productCollectionMock = $this->getMockBuilder(ProductCollection::class)
                     ->disableOriginalConstructor()
                     ->getMock();
@@ -74,7 +72,6 @@ function ($productsData) {
             $dataPerStoreId
         );
 
-        /** @var StoresUtil&MockObject */
         $storesUtilMock = $this
             ->getMockBuilder(StoresUtil::class)
             ->disableOriginalConstructor()
@@ -83,13 +80,11 @@ function ($productsData) {
             ->method('getAllStoreIds')
             ->willReturn($storeIds);
 
-        /** @var Progress&MockObject */
         $progressMock = $this
             ->getMockBuilder(Progress::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        /** @var ProductCollectionFactory&MockObject */
         $productCollectionFactoryMock = $this
             ->getMockBuilder(ProductCollectionFactory::class)
             ->disableOriginalConstructor()
@@ -110,7 +105,6 @@ function ($productsData) {
             ->method('containsValue')
             ->willReturn(true);
 
-        /** @var AttributeScopeOverriddenValueFactory&MockObject */
         $attributeScopeOverriddenValueFactoryMock = $this
             ->getMockBuilder(AttributeScopeOverriddenValueFactory::class)
             ->disableOriginalConstructor()
@@ -120,7 +114,6 @@ function ($productsData) {
             ->method('create')
             ->willReturn($attributeScopeOverriddenValueMock);
 
-        /** @var ConfigUtil&MockObject */
         $configUtilMock = $this
             ->getMockBuilder(ConfigUtil::class)
             ->disableOriginalConstructor()

Test/Storage/CacheStorageTest.php

@@ -6,7 +6,6 @@
 
 use Baldwin\UrlDataIntegrityChecker\Storage\CacheStorage;
 use Magento\Framework\App\Cache as AppCache;
-use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class CacheStorageTest extends TestCase
@@ -19,7 +18,6 @@ public function testUpdatingNonExisting()
             'key2' => 'value2',
         ];
 
-        /** @var AppCache&MockObject */
         $cacheMock = $this
             ->getMockBuilder(AppCache::class)
             ->disableOriginalConstructor()
@@ -57,7 +55,6 @@ public function testUpdatingExisting()
             'key3' => 'value3',
         ];
 
-        /** @var AppCache&MockObject */
         $cacheMock = $this
             ->getMockBuilder(AppCache::class)
             ->disableOriginalConstructor()
@@ -95,7 +92,6 @@ public function testClear()
 
         $expectedData = [];
 
-        /** @var AppCache&MockObject */
         $cacheMock = $this
             ->getMockBuilder(AppCache::class)
             ->disableOriginalConstructor()

composer.json

@@ -11,7 +11,7 @@
         }
     ],
     "require": {
-        "php": "~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.1.0",
+        "php": "~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.1.0 || ~8.2.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",