Merge branch '11.5' into 12.0

Author: sebastianbergmann

ChangeLog-12.0.md

@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 12.0 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [12.0.6] - 2025-MM-DD
+
+### Fixed
+
+* [#6142](https://github.com/sebastianbergmann/phpunit/issues/6142): `$expected` and `$actual` are mixed up in failure description when `assertJsonFileEqualsJsonFile()` fails
+
 ## [12.0.5] - 2025-02-25
 
 ### Fixed
@@ -86,6 +92,7 @@ All notable changes of the PHPUnit 12.0 release series are documented in this fi
 * [#5801](https://github.com/sebastianbergmann/phpunit/issues/5801): Support for targeting traits with `#[CoversClass]` and `#[UsesClass]` attributes
 * [#5978](https://github.com/sebastianbergmann/phpunit/issues/5978): Support for PHP 8.2
 
+[12.0.6]: https://github.com/sebastianbergmann/phpunit/compare/12.0.5...12.0
 [12.0.5]: https://github.com/sebastianbergmann/phpunit/compare/12.0.4...12.0.5
 [12.0.4]: https://github.com/sebastianbergmann/phpunit/compare/12.0.3...12.0.4
 [12.0.3]: https://github.com/sebastianbergmann/phpunit/compare/12.0.2...12.0.3

src/Framework/Assert.php

@@ -2675,14 +2675,7 @@ final public static function assertJsonFileEqualsJsonFile(string $expectedFile,
         self::assertIsString($actualJson);
         self::assertJson($actualJson, $message);
 
-        $constraintExpected = new JsonMatches(
-            $expectedJson,
-        );
-
-        $constraintActual = new JsonMatches($actualJson);
-
-        self::assertThat($expectedJson, $constraintActual, $message);
-        self::assertThat($actualJson, $constraintExpected, $message);
+        self::assertThat($actualJson, new JsonMatches($expectedJson), $message);
     }
 
     /**
@@ -2706,14 +2699,7 @@ final public static function assertJsonFileNotEqualsJsonFile(string $expectedFil
         self::assertIsString($actualJson);
         self::assertJson($actualJson, $message);
 
-        $constraintExpected = new JsonMatches(
-            $expectedJson,
-        );
-
-        $constraintActual = new JsonMatches($actualJson);
-
-        self::assertThat($expectedJson, new LogicalNot($constraintActual), $message);
-        self::assertThat($actualJson, new LogicalNot($constraintExpected), $message);
+        self::assertThat($actualJson, LogicalNot(new JsonMatches($expectedJson)), $message);
     }
 
     /**

tests/end-to-end/regression/6142.phpt

@@ -0,0 +1,38 @@
+--TEST--
+https://github.com/sebastianbergmann/phpunit/issues/6142
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/6142/Issue6142Test.php';
+
+require_once __DIR__ . '/../../bootstrap.php';
+
+(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Runtime: %s
+
+F                                                                   1 / 1 (100%)
+
+Time: %s, Memory: %s
+
+There was 1 failure:
+
+1) PHPUnit\TestFixture\Issue6142\Issue6142Test::testOne
+Failed asserting that '{"key": false}\n
+' matches JSON string "{"key": true}
+".
+--- Expected
++++ Actual
+@@ @@
+ {
+-    "key": true
++    "key": false
+ }
+
+%sIssue6142Test.php:%d
+
+FAILURES!
+Tests: 1, Assertions: 7, Failures: 1.

tests/end-to-end/regression/6142/Issue6142Test.php

@@ -0,0 +1,23 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TestFixture\Issue6142;
+
+use PHPUnit\Framework\TestCase;
+
+final class Issue6142Test extends TestCase
+{
+    public function testOne(): void
+    {
+        $expected = __DIR__ . '/expected.json';
+        $actual   = __DIR__ . '/actual.json';
+
+        $this->assertJsonFileEqualsJsonFile($expected, $actual);
+    }
+}

tests/end-to-end/regression/6142/actual.json

@@ -0,0 +1 @@
+{"key": false}

tests/end-to-end/regression/6142/expected.json

@@ -0,0 +1 @@
+{"key": true}