Merge remote-tracking branch 'origin/2.4.7-beta3-develop' into Sync-2…

….4-develop-with-2.4.7-beta3-develop
magento · Mar 6, 2024 · db82f0b · db82f0b
2 parents adb8dd5 + 1227768
commit db82f0b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/App/GraphQlCheckoutMutationsStateTest.php b/dev/tests/integration/testsuite/Magento/GraphQl/App/GraphQlCheckoutMutationsStateTest.php
@@ -39,7 +39,7 @@ protected function setUp(): void
             $this->markTestSkipped('GraphQlStateDiff class is not available on this version of Magento.');
         }
 
-        $this->graphQlStateDiff = new GraphQlStateDiff();
+        $this->graphQlStateDiff = new GraphQlStateDiff($this);
         parent::setUp();
     }
 

diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/App/GraphQlCustomerMutationsTest.php b/dev/tests/integration/testsuite/Magento/GraphQl/App/GraphQlCustomerMutationsTest.php
@@ -36,7 +36,7 @@ protected function setUp(): void
             $this->markTestSkipped('GraphQlStateDiff class is not available on this version of Magento.');
         }
 
-        $this->graphQlStateDiff = new GraphQlStateDiff();
+        $this->graphQlStateDiff = new GraphQlStateDiff($this);
         parent::setUp();
     }
 

diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/App/GraphQlStateTest.php b/dev/tests/integration/testsuite/Magento/GraphQl/App/GraphQlStateTest.php
@@ -39,7 +39,7 @@ protected function setUp(): void
             $this->markTestSkipped('GraphQlStateDiff class is not available on this version of Magento.');
         }
 
-        $this->graphQlStateDiff = new GraphQlStateDiff();
+        $this->graphQlStateDiff = new GraphQlStateDiff($this);
         parent::setUp();
     }
 

diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/App/State/GraphQlStateDiff.php b/dev/tests/integration/testsuite/Magento/GraphQl/App/State/GraphQlStateDiff.php
@@ -57,9 +57,18 @@ class GraphQlStateDiff
 
     /**
      * Constructor
+     *
+     * @param TestCase $test
      */
-    public function __construct()
+    public function __construct(TestCase $test)
     {
+        if (8 == PHP_MAJOR_VERSION && 3 == PHP_MINOR_VERSION && PHP_RELEASE_VERSION  < 5) {
+            $test->markTestSkipped(
+                "This test isn't compatible with PHP 8.3 versions less than PHP 8.3.5 because of "
+                . "bug in garbage collector. https://github.com/php/php-src/issues/13569"
+                . " will roll back in AC-11491"
+            );
+        }
         $this->objectManagerBeforeTest = Bootstrap::getObjectManager();
         $this->objectManagerForTest = new ObjectManager($this->objectManagerBeforeTest);
         $this->objectManagerForTest->getFactory()->setObjectManager($this->objectManagerForTest);