MCLOUD-13148: Added support for PHP8.4

Author: prateek-karanpuria-adobe

Test/Functional/Acceptance/AcceptanceCest.php

@@ -7,6 +7,11 @@
 
 namespace Magento\CloudComponents\Test\Functional\Acceptance;
 
+/**
+ * Class AcceptanceCest
+ *
+ * This class provides acceptance tests for Magento Cloud components.
+ */
 abstract class AcceptanceCest
 {
     /**

Test/Unit/Model/UrlFinder/EntityTest.php

@@ -43,7 +43,7 @@ class EntityTest extends TestCase
     protected function setUp(): void
     {
         $this->urlFactoryMock = $this->createMock(UrlFactory::class);
-        $this->urlFinderMock = $this->getMockForAbstractClass(UrlFinderInterface::class);
+        $this->urlFinderMock = $this->createMock(UrlFinderInterface::class);
         $this->urlFixerMock = $this->createMock(UrlFixer::class);
     }
 
@@ -68,55 +68,90 @@ public function testGet()
             ->method('getId')
             ->willReturn('store2');
 
-        $urlMock1 = $this->getMockForAbstractClass(UrlInterface::class);
-        $urlMock1->expects($this->once())
-            ->method('getUrl')
-            ->with('/path1')
-            ->willReturn('http://site1.com/path1');
-        $urlMock1->expects($this->once())
+        $urlMock1 = $this->createMock(UrlInterface::class);
+        $urlMock1
+            ->expects($this->any())
             ->method('setScope')
             ->with('store1')
             ->willReturnSelf();
-        $urlMock2 = $this->getMockForAbstractClass(UrlInterface::class);
-        $urlMock2->expects($this->once())
+        $urlMock1
+            ->expects($this->any())
+            ->method('getUrl')
+            ->with('/path1')
+            ->willReturn('http://site1.com/path1');
+
+        $urlMock2 = $this->createMock(UrlInterface::class);
+        $urlMock2
+            ->expects($this->any())
             ->method('getUrl')
             ->with('/path2')
             ->willReturn('http://site2.com/path2');
-        $urlMock2->expects($this->once())
+        $urlMock2
+            ->expects($this->any())
             ->method('setScope')
             ->with('store2')
             ->willReturnSelf();
 
         $urlRewriteMock1 = $this->createMock(UrlRewrite::class);
-        $urlRewriteMock1->expects($this->once())
+        $urlRewriteMock1
+            ->expects($this->once())
             ->method('getRequestPath')
             ->willReturn('/path1');
         $urlRewriteMock2 = $this->createMock(UrlRewrite::class);
-        $urlRewriteMock2->expects($this->once())
+        $urlRewriteMock2
+            ->expects($this->once())
             ->method('getRequestPath')
             ->willReturn('/path2');
 
-        $this->urlFactoryMock->expects($this->exactly(2))
+        $this->urlFactoryMock
+            ->expects($this->exactly(2))
             ->method('create')
-            ->willReturnOnConsecutiveCalls($urlMock1, $urlMock2);
-        $this->urlFinderMock->expects($this->exactly(2))
+            ->willReturnCallback(function () use ($urlMock1, $urlMock2) {
+                static $callCount = 0;
+                $callCount++;
+
+                if ($callCount === 1) {
+                    return $urlMock1;
+                }
+
+                return $urlMock2;
+            });
+
+        $this->urlFinderMock
+            ->expects($this->exactly(2))
             ->method('findAllByData')
-            ->withConsecutive(
-                [['store_id' => 'store1', 'entity_type' => 'category']],
-                [['store_id' => 'store2', 'entity_type' => 'category']]
-            )
-            ->willReturnOnConsecutiveCalls(
-                [$urlRewriteMock1],
-                [$urlRewriteMock2]
-            );
-
-        $this->urlFixerMock->expects($this->exactly(2))
+            ->willReturnCallback(function ($data) use ($urlRewriteMock1, $urlRewriteMock2) {
+                $expected1 = ['store_id' => 'store1', 'entity_type' => 'category'];
+                $expected2 = ['store_id' => 'store2', 'entity_type' => 'category'];
+
+                if (array_intersect_assoc($expected1, $data) == $expected1) {
+                    return [$urlRewriteMock1];
+                }
+
+                if (array_intersect_assoc($expected2, $data) == $expected2) {
+                    return [$urlRewriteMock2];
+                }
+
+                return [];
+            });
+
+        $this->urlFixerMock
+            ->expects($this->exactly(2))
             ->method('run')
-            ->withConsecutive(
-                [$storeMock1, 'http://site1.com/path1'],
-                [$storeMock2, 'http://site2.com/path2']
-            )
-            ->willReturnOnConsecutiveCalls('http://site1.com/fixed/path1', 'http://site2.com/fixed/path2');
+            ->willReturnCallback(function ($store, $url) use ($storeMock1, $storeMock2) {
+                static $callCount = 0;
+                $callCount++;
+
+                if ($callCount === 1 && $store === $storeMock1 && $url === '/path1') {
+                    return 'http://site1.com/fixed/path1';
+                }
+
+                if ($callCount === 2 && $store === $storeMock2 && $url === '/path2') {
+                    return 'http://site2.com/fixed/path2';
+                }
+
+                return '';
+            });
 
         $entity = $this->createEntity('category', [$storeMock1, $storeMock2]);
 

Test/Unit/Model/UrlFixerTest.php

@@ -73,7 +73,7 @@ public function testRunWithConfigRewrites(
     /**
      * @return array
      */
-    public function runDataProvider(): array
+    public static function runDataProvider(): array
     {
         return [
             'rewrites enabled, url without "magento" part' => [

Test/Unit/phpunit.xml.dist

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.1/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/10.5/phpunit.xsd"
          colors="true"
          columns="max"
          bootstrap="../../vendor/autoload.php"

composer.json

@@ -2,7 +2,7 @@
   "name": "magento/magento-cloud-components",
   "description": "Cloud Components Module for Magento 2.x",
   "type": "magento2-module",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "require": {
     "php": "^8.0",
     "ext-json": "*",
@@ -22,9 +22,9 @@
     "codeception/module-rest": "^3.0",
     "consolidation/robo": "^3.0",
     "phpmd/phpmd": "@stable",
-    "phpstan/phpstan": "~1.2.0",
-    "phpunit/phpunit": "^9.5",
-    "squizlabs/php_codesniffer": "^3.0"
+    "phpstan/phpstan": "~1.2.0 || ^2.0",
+    "phpunit/phpunit": "^9.5 || ^10.5",
+    "squizlabs/php_codesniffer": "^3.7"
   },
   "config": {
     "sort-packages": true