Empty model now become {} after json_encode

- `->toArray()` method has been removed in favor of PHP function `iterator_to_array`

Author: acelot

src/Struct.php

@@ -10,7 +10,6 @@
 use Respect\Validation\Exceptions\NestedValidationException;
 use Respect\Validation\Rules\AllOf;
 use Respect\Validation\Rules\Key as ValidationKey;
-use Respect\Validation\Rules\KeySet;
 
 abstract class Struct implements \Iterator, \Countable, \JsonSerializable
 {
@@ -120,7 +119,7 @@ public function get(string $key, $default = null)
      */
     public function set(string $key, $value)
     {
-        $data = $this->toArray();
+        $data = iterator_to_array($this);
         $data[$key] = $value;
         return new static($data);
     }
@@ -133,35 +132,24 @@ public function set(string $key, $value)
      */
     public function delete(string $key)
     {
-        $data = $this->toArray();
+        $data = iterator_to_array($this);
         unset($data[$key]);
         return new static($data);
     }
 
     /**
-     * @return array
-     */
-    public function toArray(): array
-    {
-        return array_reduce($this->__defined_props, function ($carry, $prop) {
-            $carry[$prop] = $this->{$prop};
-            return $carry;
-        }, []);
-    }
-
-    /**
-     * @return array
+     * @return object
      */
     public function jsonSerialize()
     {
-        $data = [];
+        $data = new \stdClass();
         foreach (static::getSchema()->getProps() as $prop) {
             if (!$this->has($prop->getName())) {
                 continue;
             }
 
             $value = $this->get($prop->getName());
-            $data[$prop->getName()] = static::jsonSerializeValue($value);
+            $data->{$prop->getName()} = static::jsonSerializeValue($value);
         }
 
         return $data;

tests/Fixture/CanBeEmptyModel.php

@@ -0,0 +1,29 @@
+<?php declare(strict_types=1);
+
+namespace Acelot\Struct\Tests\Fixture;
+
+use Acelot\Struct\Schema;
+use Acelot\Struct\Schema\Prop;
+use Acelot\Struct\Struct;
+
+/**
+ * @property-read mixed $a
+ * @property-read mixed $b
+ * @property-read mixed $c
+ */
+class CanBeEmptyModel extends Struct
+{
+    public static function getSchema(): Schema
+    {
+        return new Schema(
+            Prop::create('a')
+                ->notRequired(),
+
+            Prop::create('b')
+                ->notRequired(),
+
+            Prop::create('c')
+                ->notRequired()
+        );
+    }
+}

tests/Unit/StructTest.php

@@ -5,6 +5,7 @@
 use Acelot\Struct\Exception\UndefinedPropertyException;
 use Acelot\Struct\Exception\ValidationException;
 use Acelot\Struct\Schema;
+use Acelot\Struct\Tests\Fixture\CanBeEmptyModel;
 use Acelot\Struct\Tests\Fixture\CreateUserModel;
 use PHPUnit\Framework\Error\Notice;
 use PHPUnit\Framework\TestCase;
@@ -31,7 +32,7 @@ public function testConstructAndOtherMethods()
             'login' => 'superhacker',
             'password' => 'correcthorsebatterystaple',
             'birthday' => new \DateTimeImmutable('1988-08-08')
-        ], $model->toArray());
+        ], iterator_to_array($model));
 
         $this->assertTrue(property_exists($model, 'login'));
         $this->assertTrue($model->has('login'));
@@ -133,8 +134,12 @@ public function testJsonSerialize()
             'birthday' => new \DateTimeImmutable('1988-08-08', new \DateTimeZone('UTC'))
         ]);
 
-        $json = json_encode($model);
-        $this->assertEquals('{"login":"superhacker","password":"correcthorsebatterystaple","birthday":"1988-08-08T00:00:00.000+00:00"}',
-            $json);
+        $this->assertEquals(
+            '{"login":"superhacker","password":"correcthorsebatterystaple","birthday":"1988-08-08T00:00:00.000+00:00"}',
+            json_encode($model)
+        );
+
+        $emptyModel = new CanBeEmptyModel([]);
+        $this->assertEquals('{}', json_encode($emptyModel));
     }
 }