Merge branch 'v1.x' into v2.x

Author: jpresutti

FeastTests/JsonTest.php

@@ -173,6 +173,12 @@ public function testUnmarshalMarshal(): void
         $this->assertEquals($data, Json::marshal(Json::unmarshal($data, TestJsonItem::class)));
     }
 
+    public function testUnmarshalMarshalStdClass(): void
+    {
+        $data = '{"first_name":"FEAST","last_name":"Framework","test_item":{"first_name":"Jeremy","last_name":"Presutti","calls":4},"second_item":{"also_first_name":"Orlando","also_last_name":"Florida"},"items":[{"first_name":"PHP","last_name":"7.4","calls":null},{"first_name":"PHP","last_name":"8.0","calls":null}],"cards":["4",5,["6"]],"otherItems":{"first":{"first_name":"Json","last_name":"Serializer","calls":null},"second":{"first_name":"Item","last_name":"Parsing","calls":null}},"thirdItems":{"test":"theTest","test2":"theTest2"},"otherSet":[{"first_name":"Json","last_name":"Serializer","calls":null},{"first_name":"Item","last_name":"Parsing","calls":null}],"thirdSet":["theTest","theTest2"],"calls":null,"count":4,"aClass":{"test":"ItWorks"},"timestamp":"20210415","otherTimestamp":"2021-04-05T06:41:00-04:00","thirdTimestamp":"2021-04-15T20:56:24-04:00","fourthTimestamp":"20210405"}';
+        $this->assertEquals($data, Json::marshal(Json::unmarshal($data, stdClass::class)));
+    }
+
     public function testUnmarshalMarshalUnmarshalMarshal(): void
     {
         $data = '{"first_name":"FEAST","last_name":"Framework","test_item":{"first_name":"Jeremy","last_name":"Presutti","calls":4},"second_item":{"also_first_name":"Orlando","also_last_name":"Florida"},"items":[{"first_name":"PHP","last_name":"7.4","calls":null},{"first_name":"PHP","last_name":"8.0","calls":null}],"cards":["4",5,["6"]],"otherItems":{"first":{"first_name":"Json","last_name":"Serializer","calls":null},"second":{"first_name":"Item","last_name":"Parsing","calls":null}},"thirdItems":{"test":"theTest","test2":"theTest2"},"otherSet":[{"first_name":"Json","last_name":"Serializer","calls":null},{"first_name":"Item","last_name":"Parsing","calls":null}],"thirdSet":["theTest","theTest2"],"calls":null,"count":4,"aClass":{"test":"ItWorks"},"timestamp":"20210415","otherTimestamp":"2021-04-05T06:41:00-04:00","thirdTimestamp":"2021-04-15T20:56:24-04:00","fourthTimestamp":"20210405"}';

HttpController.php

@@ -93,11 +93,11 @@ public function forward(
     }
 
     /**
-     * @param object $responseObject
+     * @param object|array $responseObject
      * @param int|null $jsonResponsePropertyTypes (see https://www.php.net/manual/en/class.reflectionproperty.php#reflectionproperty.constants.modifiers)
      * @return void
      */
-    public function sendJsonResponse(object $responseObject, ?int $jsonResponsePropertyTypes = null): void
+    public function sendJsonResponse(object|array $responseObject, ?int $jsonResponsePropertyTypes = null): void
     {
         $this->response->setJsonWithResponseObject($responseObject, $jsonResponsePropertyTypes);
     }

Interfaces/ResponseInterface.php

@@ -87,10 +87,10 @@ public function getRedirectPath(): ?string;
     /**
      * Mark the Response as a JSON response and send the passed in object.
      *
-     * @param object $response
+     * @param object|array $response
      * @param int|null $jsonResponsePropertyTypes (see https://www.php.net/manual/en/class.reflectionproperty.php#reflectionproperty.constants.modifiers)
      */
-    public function setJsonWithResponseObject(object $response, ?int $jsonResponsePropertyTypes = null): void;
+    public function setJsonWithResponseObject(object|array $response, ?int $jsonResponsePropertyTypes = null): void;
 
     /**
      * Set an HTTP header. Overrides previous version set.

Json.php

@@ -41,14 +41,17 @@ class Json
      *
      * The field names are kept as is, unless a Feast\Attributes\JsonItem attribute decorates the property.
      *
-     * @param object $object
+     * @param object|array $object
      * @param int|null $propertyTypesFlag (see https://www.php.net/manual/en/class.reflectionproperty.php#reflectionproperty.constants.modifiers)
      * @return string
      * @throws ReflectionException
      * @see \Feast\Attributes\JsonItem
      */
-    public static function marshal(object $object, ?int $propertyTypesFlag = null): string
+    public static function marshal(object|array $object, ?int $propertyTypesFlag = null): string
     {
+        if ($object instanceof stdClass || is_array($object)) {
+            return json_encode($object);
+        }
         $return = new stdClass();
         $paramInfo = self::getClassParamInfo($object::class, $propertyTypesFlag);
         /**
@@ -98,15 +101,19 @@ public static function marshal(object $object, ?int $propertyTypesFlag = null):
      * @param class-string<returned>|returned $objectOrClass
      * @psalm-param object|class-string $objectOrClass
      * @param bool $skipConstructor
-     * @throws Exception\InvalidDateException
+     * @return returned|object
      * @throws JsonException
      * @throws ReflectionException
      * @throws ServerFailureException
+     * @throws Exception\InvalidDateException
      * @see \Feast\Attributes\JsonItem
-     * @return returned|object
      */
     public static function unmarshal(string $data, string|object $objectOrClass, bool $skipConstructor = false): object
     {
+        if ($objectOrClass === stdClass::class) {
+            /** @var stdClass */
+            return json_decode($data);
+        }
         if (is_string($objectOrClass)) {
             $object = self::getObjectFromClassString($objectOrClass, $skipConstructor);
         } else {

Response.php

@@ -39,7 +39,7 @@ class Response implements ServiceContainerItemInterface, ResponseInterface
 
     private ResponseCode $responseCode = ResponseCode::HTTP_CODE_200;
     private bool $isJson = false;
-    private object|null $jsonResponse = null;
+    private object|array|null $jsonResponse = null;
     private ?int $jsonResponsePropertyTypes = null;
     private ?string $redirectPath = null;
     /** @var array<string,string> */
@@ -152,10 +152,10 @@ public function redirect(string $path, ResponseCode $code = ResponseCode::HTTP_C
     /**
      * Mark the Response as a JSON response and send the passed in object.
      *
-     * @param object $response
+     * @param object|array $response
      * @param int|null $jsonResponsePropertyTypes (see https://www.php.net/manual/en/class.reflectionproperty.php#reflectionproperty.constants.modifiers)
      */
-    public function setJsonWithResponseObject(object $response, ?int $jsonResponsePropertyTypes = null): void
+    public function setJsonWithResponseObject(object|array $response, ?int $jsonResponsePropertyTypes = null): void
     {
         $this->jsonResponse = $response;
         $this->jsonResponsePropertyTypes = $jsonResponsePropertyTypes;