add test case for invalid json string

Author: TomasVotruba

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -14,13 +14,13 @@ class NodeScopeResolverTest extends TypeInferenceTestCase
 
 	public function dataFileAsserts(): iterable
 	{
-<<<<<<< HEAD
 		require_once __DIR__ . '/data/implode.php';
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/implode.php');
-=======
+
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/json-decode/narrow_type.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/json-decode/narrow_type_with_force_array.php');
->>>>>>> add test case for narrow typed json_decode
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/json-decode/invalid_type.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/json-decode/json_object_as_array.php');
 
 		require_once __DIR__ . '/data/bug2574.php';
 

tests/PHPStan/Analyser/data/json-decode/invalid_type.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Analyser\JsonDecode;
+
+use function PHPStan\Testing\assertType;
+
+$value = json_decode('{"key"}');
+assertType('null', $value);
+
+$value = json_decode('{"key"}', true);
+assertType('null', $value);
+
+$value = json_decode('{"key"}', null);
+assertType('null', $value);
+
+$value = json_decode('{"key"}', false);
+assertType('null', $value);

tests/PHPStan/Analyser/data/json-decode/json_object_as_array.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Analyser\JsonDecode;
+
+use function PHPStan\Testing\assertType;
+
+// @see https://3v4l.org/YFlHF
+function ($mixed) {
+	$value = json_decode($mixed, null, 512, JSON_OBJECT_AS_ARRAY);
+	assertType('mixed~stdClass', $value);
+};
+
+function ($mixed) {
+	$value = json_decode($mixed, null);
+	assertType('mixed', $value);
+};

tests/PHPStan/Analyser/data/json-decode/narrow_type_with_force_array.php

@@ -26,9 +26,3 @@ function ($mixed) {
 	$value = json_decode($mixed, true);
 	assertType('mixed~stdClass', $value);
 };
-
-// @see https://3v4l.org/YFlHF
-function ($mixed) {
-	$value = json_decode($mixed, null, 512, JSON_OBJECT_AS_ARRAY);
-	assertType('mixed~stdClass', $value);
-};