Merge pull request #17 from kartenmacherei/fix-handling-of-json-arrays

Extend Json Body to handle pure json arrays
kartenmacherei · Apr 10, 2024 · e2cdc1f · e2cdc1f
2 parents 56b43e8 + f45b712
commit e2cdc1f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/src/Http/Request/Body/JsonBody.php b/src/Http/Request/Body/JsonBody.php
@@ -10,7 +10,7 @@
 
 class JsonBody extends Body
 {
-    /** @var JsonObject */
+    /** @var JsonObject|JsonArray */
     private $json;
 
     /** @var string */
@@ -33,7 +33,8 @@ public function query(string $selector)
         return $this->json->query($selector);
     }
 
-    public function getJson(): JsonObject
+    /** @return JsonArray|JsonObject */
+    public function getJson()
     {
         return $this->json;
     }
@@ -48,15 +49,19 @@ public function getEncodedString(): string
      *
      * @throws EnsureException
      *
-     * @return JsonObject
+     * @return JsonObject|JsonArray
      */
-    private function decode(string $jsonString): JsonObject
+    private function decode(string $jsonString)
     {
         $decoded = json_decode($jsonString, false);
         if (json_last_error() !== JSON_ERROR_NONE) {
             throw new EnsureException(sprintf('JSON body could not be decoded: %s', json_last_error_msg()));
         }
 
+        if (is_array($decoded)) {
+            return new JsonArray($decoded);
+        }
+
         return new JsonObject($decoded);
     }
 }
diff --git a/tests/Unit/Http/Request/Body/JsonBodyTest.php b/tests/Unit/Http/Request/Body/JsonBodyTest.php
@@ -5,6 +5,7 @@
 namespace Kartenmacherei\HttpFramework\UnitTest\Http;
 
 use Kartenmacherei\HttpFramework\Http\EnsureException;
+use Kartenmacherei\HttpFramework\Http\JsonArray;
 use Kartenmacherei\HttpFramework\Http\JsonObject;
 use Kartenmacherei\HttpFramework\Http\Request\Body\JsonBody;
 use PHPUnit\Framework\TestCase;
@@ -13,6 +14,7 @@
  * @covers \Kartenmacherei\HttpFramework\Http\Request\Body\JsonBody
  *
  * @uses \Kartenmacherei\HttpFramework\Http\JsonObject
+ * @uses \Kartenmacherei\HttpFramework\Http\JsonArray
  */
 class JsonBodyTest extends TestCase
 {
@@ -45,4 +47,13 @@ public function testQueryReturnsExpectedValue(): void
         $body = new JsonBody($jsonString);
         $this->assertSame('bar', $body->query('foo'));
     }
+
+    public function testGetJsonReturnsJsonArrayForArrayStrings(): void
+    {
+        $jsonString = '["foo","bar"]';
+        $body = new JsonBody($jsonString);
+        $expected = new JsonArray(json_decode($jsonString));
+
+        $this->assertEquals($expected, $body->getJson());
+    }
 }