Merge pull request #180 from Sam152/main

freekmurze · web-flow · commit fc8c324aa49d · 2023-10-11T19:19:51.000+02:00
Fix #179 - assert difference between empty array and object.
diff --git a/src/Drivers/JsonDriver.php b/src/Drivers/JsonDriver.php
@@ -29,9 +29,9 @@ public function extension(): string
     public function match($expected, $actual)
     {
         if (is_string($actual)) {
-            $actual = json_decode($actual, true, 512, JSON_THROW_ON_ERROR);
+            $actual = json_decode($actual, false, 512, JSON_THROW_ON_ERROR);
         }
-        $expected = json_decode($expected, true, 512, JSON_THROW_ON_ERROR);
+        $expected = json_decode($expected, false, 512, JSON_THROW_ON_ERROR);
         Assert::assertJsonStringEqualsJsonString(json_encode($expected), json_encode($actual));
     }
 }
diff --git a/tests/Unit/Drivers/JsonDriverTest.php b/tests/Unit/Drivers/JsonDriverTest.php
@@ -134,6 +134,7 @@ public function it_can_not_serialize_resources()
      *           ["null", "null", true]
      *           ["1", "1", true]
      *           ["1.1", "1.1", true]
+     *           ["{\"empty\": []}", "{\"empty\":{}}", false]
      */
     public function it_can_match_json_strings(string $expected, string $actual, bool $assertion)
     {

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@ public function extension(): string`
`29`	`29`	`public function match($expected, $actual)`
`30`	`30`	`{`
`31`	`31`	`if (is_string($actual)) {`
`32`		`- $actual = json_decode($actual, true, 512, JSON_THROW_ON_ERROR);`
	`32`	`+ $actual = json_decode($actual, false, 512, JSON_THROW_ON_ERROR);`
`33`	`33`	`}`
`34`		`- $expected = json_decode($expected, true, 512, JSON_THROW_ON_ERROR);`
	`34`	`+ $expected = json_decode($expected, false, 512, JSON_THROW_ON_ERROR);`
`35`	`35`	`Assert::assertJsonStringEqualsJsonString(json_encode($expected), json_encode($actual));`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,7 @@ public function it_can_not_serialize_resources()`
`134`	`134`	`* ["null", "null", true]`
`135`	`135`	`* ["1", "1", true]`
`136`	`136`	`* ["1.1", "1.1", true]`
	`137`	`+ * ["{\"empty\": []}", "{\"empty\":{}}", false]`
`137`	`138`	`*/`
`138`	`139`	`public function it_can_match_json_strings(string $expected, string $actual, bool $assertion)`
`139`	`140`	`{`