Merge branch '2.4-develop' of https://github.com/mage-os/mirror-magento2 into 2.4-develop

mage-os-ci · mage-os-ci · commit c05f21fd9ced · 2026-02-20T10:54:06.000Z
diff --git a/dev/tests/api-functional/phpunit_graphql.xml.dist b/dev/tests/api-functional/phpunit_graphql.xml.dist
@@ -8,7 +8,7 @@
  */
 -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.5/phpunit.xsd"
          colors="true"
          columns="max"
          beStrictAboutTestsThatDoNotTestAnything="false"
diff --git a/dev/tests/api-functional/phpunit_rest.xml.dist b/dev/tests/api-functional/phpunit_rest.xml.dist
@@ -8,7 +8,7 @@
  */
 -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.5/phpunit.xsd"
          colors="true"
          columns="max"
          beStrictAboutTestsThatDoNotTestAnything="false"
diff --git a/dev/tests/api-functional/phpunit_soap.xml.dist b/dev/tests/api-functional/phpunit_soap.xml.dist
@@ -8,7 +8,7 @@
  */
 -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.5/phpunit.xsd"
          colors="true"
          columns="max"
          beStrictAboutTestsThatDoNotTestAnything="false"
diff --git a/dev/tests/integration/framework/tests/unit/phpunit.xml.dist b/dev/tests/integration/framework/tests/unit/phpunit.xml.dist
@@ -6,7 +6,7 @@
  */
 -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.5/phpunit.xsd"
          colors="true"
          columns="max"
          beStrictAboutTestsThatDoNotTestAnything="false"
diff --git a/dev/tests/integration/phpunit.xml.dist b/dev/tests/integration/phpunit.xml.dist
@@ -6,7 +6,7 @@
  */
 -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.5/phpunit.xsd"
          colors="true"
          columns="max"
          beStrictAboutTestsThatDoNotTestAnything="false"
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Stomp/UseCase/WaitAndNotWaitMessagesTest.php b/dev/tests/integration/testsuite/Magento/Framework/Stomp/UseCase/WaitAndNotWaitMessagesTest.php
@@ -79,9 +79,9 @@ protected function setUp(): void
     /**
      * Get message object, creating it lazily
      *
-     * @return AsyncTestData
+     * @return object
      */
-    private function getMsgObject(): AsyncTestData
+    private function getMsgObject(): object
     {
         if (!$this->msgObject) {
             // phpstan:ignore "Class Magento\TestModuleAsyncStomp\Model\AsyncTestData not found."
@@ -95,9 +95,8 @@ private function getMsgObject(): AsyncTestData
      */
     public function testWaitForMessages(): void
     {
-        if ($this->connectionType === 'amqp') {
-            $this->markTestSkipped('STOMP test skipped because AMQP connection is available.
-            This test is STOMP-specific.');
+        if ($this->connectionType !== 'stomp') {
+            $this->markTestSkipped('This test is STOMP-specific and requires STOMP connection.');
         }
 
         $this->publisherConsumerController->stopConsumers();
@@ -132,8 +131,7 @@ public function testWaitForMessages(): void
     public function testNotWaitForMessages(): void
     {
         if ($this->connectionType !== 'stomp') {
-            $this->markTestSkipped('STOMP test skipped because AMQP connection is available.
-            This test is STOMP-specific.');
+            $this->markTestSkipped('This test is STOMP-specific and requires STOMP connection.');
         }
 
         $this->publisherConsumerController->stopConsumers();
@@ -196,7 +194,9 @@ private function writeConfig(array $config): void
      */
     protected function tearDown(): void
     {
+        if ($this->config !== null) {
+            $this->writeConfig($this->config);
+        }
         parent::tearDown();
-        $this->writeConfig($this->config);
     }
 }
diff --git a/dev/tests/setup-integration/framework/tests/unit/phpunit.xml.dist b/dev/tests/setup-integration/framework/tests/unit/phpunit.xml.dist
@@ -6,7 +6,7 @@
  */
 -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.1/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.5/phpunit.xsd"
          colors="true"
          columns="max"
          beStrictAboutTestsThatDoNotTestAnything="false"
diff --git a/dev/tests/setup-integration/phpunit.xml.dist b/dev/tests/setup-integration/phpunit.xml.dist
@@ -6,7 +6,7 @@
  */
 -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.5/phpunit.xsd"
          colors="true"
          columns="max"
          beStrictAboutTestsThatDoNotTestAnything="false"
diff --git a/dev/tests/static/framework/tests/unit/phpunit.xml.dist b/dev/tests/static/framework/tests/unit/phpunit.xml.dist
@@ -6,7 +6,7 @@
  */
 -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.5/phpunit.xsd"
          colors="true"
          columns="max"
          beStrictAboutTestsThatDoNotTestAnything="false"
diff --git a/dev/tests/static/phpunit-all.xml.dist b/dev/tests/static/phpunit-all.xml.dist
@@ -8,7 +8,7 @@
  */
 -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.1/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.5/phpunit.xsd"
          colors="true"
          columns="max"
          bootstrap="./framework/bootstrap.php"
diff --git a/dev/tests/static/phpunit.xml.dist b/dev/tests/static/phpunit.xml.dist
@@ -8,7 +8,7 @@
  */
 -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.5/phpunit.xsd"
          colors="true" columns="max"
          beStrictAboutTestsThatDoNotTestAnything="false"
          bootstrap="./framework/bootstrap.php">
diff --git a/dev/tests/unit/phpunit.xml.dist b/dev/tests/unit/phpunit.xml.dist
@@ -6,7 +6,7 @@
  */
 -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.5/phpunit.xsd"
          colors="true"
          columns="max"
          beStrictAboutTestsThatDoNotTestAnything="false"

Original file line number	Diff line number	Diff line change
`@@ -79,9 +79,9 @@ protected function setUp(): void`
`79`	`79`	`/**`
`80`	`80`	`* Get message object, creating it lazily`
`81`	`81`	`*`
`82`		`- * @return AsyncTestData`
	`82`	`+ * @return object`
`83`	`83`	`*/`
`84`		`- private function getMsgObject(): AsyncTestData`
	`84`	`+ private function getMsgObject(): object`
`85`	`85`	`{`
`86`	`86`	`if (!$this->msgObject) {`
`87`	`87`	`// phpstan:ignore "Class Magento\TestModuleAsyncStomp\Model\AsyncTestData not found."`
`@@ -95,9 +95,8 @@ private function getMsgObject(): AsyncTestData`
`95`	`95`	`*/`
`96`	`96`	`public function testWaitForMessages(): void`
`97`	`97`	`{`
`98`		`- if ($this->connectionType === 'amqp') {`
`99`		`- $this->markTestSkipped('STOMP test skipped because AMQP connection is available.`
`100`		`- This test is STOMP-specific.');`
	`98`	`+ if ($this->connectionType !== 'stomp') {`
	`99`	`+ $this->markTestSkipped('This test is STOMP-specific and requires STOMP connection.');`
`101`	`100`	`}`
`102`	`101`
`103`	`102`	`$this->publisherConsumerController->stopConsumers();`
`@@ -132,8 +131,7 @@ public function testWaitForMessages(): void`
`132`	`131`	`public function testNotWaitForMessages(): void`
`133`	`132`	`{`
`134`	`133`	`if ($this->connectionType !== 'stomp') {`
`135`		`- $this->markTestSkipped('STOMP test skipped because AMQP connection is available.`
`136`		`- This test is STOMP-specific.');`
	`134`	`+ $this->markTestSkipped('This test is STOMP-specific and requires STOMP connection.');`
`137`	`135`	`}`
`138`	`136`
`139`	`137`	`$this->publisherConsumerController->stopConsumers();`
`@@ -196,7 +194,9 @@ private function writeConfig(array $config): void`
`196`	`194`	`*/`
`197`	`195`	`protected function tearDown(): void`
`198`	`196`	`{`
	`197`	`+ if ($this->config !== null) {`
	`198`	`+ $this->writeConfig($this->config);`
	`199`	`+ }`
`199`	`200`	`parent::tearDown();`
`200`		`- $this->writeConfig($this->config);`
`201`	`201`	`}`
`202`	`202`	`}`