Fix parameter priority bug

colinodell · colinodell · commit 90ddf0599ef8 · 2018-01-14T09:08:53.000-05:00
diff --git a/src/Json5Decoder.php b/src/Json5Decoder.php
@@ -88,7 +88,7 @@ public static function decode($source, $associative = false, $depth = 512, $opti
         }
 
         // Fall back to JSON5 if that fails
-        $associative = $associative || ($options & JSON_OBJECT_AS_ARRAY);
+        $associative = $associative === true || ($associative === null && $options & JSON_OBJECT_AS_ARRAY);
         $castBigIntToString = $options & JSON_BIGINT_AS_STRING;
 
         $decoder = new self((string)$source, $associative, $depth, $castBigIntToString);
diff --git a/test/Functional/OptionsTest.php b/test/Functional/OptionsTest.php
@@ -25,7 +25,7 @@ public function testAssocFalseWithNoOptionsSet()
     public function testAssocFalseWithAssocOption()
     {
         $result = Json5Decoder::decode('{"foo": true}', false, 512, JSON_OBJECT_AS_ARRAY);
-        $this->assertInternalType('array', $result);
+        $this->assertInstanceOf('\stdClass', $result);
     }
 
     public function testBigIntWithNoOptionsSet()

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public static function decode($source, $associative = false, $depth = 512, $opti`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`// Fall back to JSON5 if that fails`
`91`		`- $associative = $associative \|\| ($options & JSON_OBJECT_AS_ARRAY);`
	`91`	`+ $associative = $associative === true \|\| ($associative === null && $options & JSON_OBJECT_AS_ARRAY);`
`92`	`92`	`$castBigIntToString = $options & JSON_BIGINT_AS_STRING;`
`93`	`93`
`94`	`94`	`$decoder = new self((string)$source, $associative, $depth, $castBigIntToString);`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public function testAssocFalseWithNoOptionsSet()`
`25`	`25`	`public function testAssocFalseWithAssocOption()`
`26`	`26`	`{`
`27`	`27`	`$result = Json5Decoder::decode('{"foo": true}', false, 512, JSON_OBJECT_AS_ARRAY);`
`28`		`- $this->assertInternalType('array', $result);`
	`28`	`+ $this->assertInstanceOf('\stdClass', $result);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public function testBigIntWithNoOptionsSet()`