Merge branch '6.5' into 7.3

sebastianbergmann · Sep 8, 2018 · 88e64e6 · 88e64e6
2 parents 479ebc4 + d47ccd9
commit 88e64e6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/ChangeLog-6.5.md b/ChangeLog-6.5.md
@@ -4,8 +4,9 @@ All notable changes of the PHPUnit 6.5 release series are documented in this fil
 
 ## [6.5.13] - 2018-MM-DD
 
-* Fixed [#3254](https://github.com/sebastianbergmann/phpunit/issues/3254): TextUI test runner cannot run a `Test` instance that is not a `TestSuite`
 * Fixed [#3181](https://github.com/sebastianbergmann/phpunit/issues/3181): `--filter` should be case-insensitive
+* Fixed [#3234](https://github.com/sebastianbergmann/phpunit/issues/3234): `assertArraySubset()` with `$strict=true` does not display differences properly
+* Fixed [#3254](https://github.com/sebastianbergmann/phpunit/issues/3254): TextUI test runner cannot run a `Test` instance that is not a `TestSuite`
 
 ## [6.5.12] - 2018-08-22
 

diff --git a/src/Framework/Constraint/ArraySubset.php b/src/Framework/Constraint/ArraySubset.php
@@ -78,8 +78,8 @@ public function evaluate($other, $description = '', $returnResult = false)
             $f = new ComparisonFailure(
                 $patched,
                 $other,
-                \print_r($patched, true),
-                \print_r($other, true)
+                \var_export($patched, true),
+                \var_export($other, true)
             );
 
             $this->fail($other, $description, $f);

diff --git a/tests/unit/Framework/Constraint/ArraySubsetTest.php b/tests/unit/Framework/Constraint/ArraySubsetTest.php
@@ -79,8 +79,8 @@ public function testEvaluateFailMessage(): void
         } catch (ExpectationFailedException $expectedException) {
             $comparisonFailure = $expectedException->getComparisonFailure();
             $this->assertNotNull($comparisonFailure);
-            $this->assertContains('[foo] => bar', $comparisonFailure->getExpectedAsString());
-            $this->assertContains('[baz] => bar', $comparisonFailure->getActualAsString());
+            $this->assertContains("'foo' => 'bar'", $comparisonFailure->getExpectedAsString());
+            $this->assertContains("'baz' => 'bar'", $comparisonFailure->getActualAsString());
         }
     }
 }