Merge pull request #197 from buggregator/hotfix/194

Fixes an issue with decoding `null` values using the Json Value object.
buggregator · Jun 9, 2024 · ccc422c · ccc422c
2 parents 35204db + 1426613
commit ccc422c
Show file tree

Hide file tree

Showing 12 changed files with 91 additions and 10 deletions.
diff --git a/app/database/Factory/EventFactory.php b/app/database/Factory/EventFactory.php
@@ -4,7 +4,7 @@
 
 namespace Database\Factory;
 
-use App\Application\Domain\Entity\Json;
+use App\Application\Domain\ValueObjects\Json;
 use App\Application\Domain\ValueObjects\Uuid;
 use Database\Factory\Partials\InspectorType;
 use Database\Factory\Partials\MonologType;

diff --git a/app/database/Factory/WebhookFactory.php b/app/database/Factory/WebhookFactory.php
@@ -4,7 +4,7 @@
 
 namespace Database\Factory;
 
-use App\Application\Domain\Entity\Json;
+use App\Application\Domain\ValueObjects\Json;
 use App\Application\Domain\ValueObjects\Uuid;
 use Modules\Webhooks\Domain\ValueObject\Url;
 use Modules\Webhooks\Domain\Webhook;

diff --git a/app/modules/Events/Domain/Event.php b/app/modules/Events/Domain/Event.php
@@ -4,7 +4,7 @@
 
 namespace Modules\Events\Domain;
 
-use App\Application\Domain\Entity\Json;
+use App\Application\Domain\ValueObjects\Json;
 use App\Application\Domain\ValueObjects\Uuid;
 use Cycle\Annotated\Annotation\Column;
 use Cycle\Annotated\Annotation\Entity;

diff --git a/app/modules/Events/Interfaces/Commands/StoreEventHandler.php b/app/modules/Events/Interfaces/Commands/StoreEventHandler.php
@@ -6,7 +6,7 @@
 
 use App\Application\Commands\FindProjectByKey;
 use App\Application\Commands\HandleReceivedEvent;
-use App\Application\Domain\Entity\Json;
+use App\Application\Domain\ValueObjects\Json;
 use Modules\Events\Application\EventMetrics;
 use Modules\Events\Domain\Event;
 use Modules\Events\Domain\EventRepositoryInterface;

diff --git a/app/modules/Webhooks/Application/WebhookFactory.php b/app/modules/Webhooks/Application/WebhookFactory.php
@@ -4,7 +4,7 @@
 
 namespace Modules\Webhooks\Application;
 
-use App\Application\Domain\Entity\Json;
+use App\Application\Domain\ValueObjects\Json;
 use App\Application\Domain\ValueObjects\Uuid;
 use Modules\Webhooks\Domain\ValueObject\Url;
 use Modules\Webhooks\Domain\Webhook;

diff --git a/app/modules/Webhooks/Domain/Webhook.php b/app/modules/Webhooks/Domain/Webhook.php
@@ -4,7 +4,7 @@
 
 namespace Modules\Webhooks\Domain;
 
-use App\Application\Domain\Entity\Json;
+use App\Application\Domain\ValueObjects\Json;
 use App\Application\Domain\ValueObjects\Uuid;
 use Cycle\Annotated\Annotation\Column;
 use Cycle\Annotated\Annotation\Entity;

diff --git a/app/modules/Webhooks/Domain/WebhookFactoryInterface.php b/app/modules/Webhooks/Domain/WebhookFactoryInterface.php
@@ -4,7 +4,7 @@
 
 namespace Modules\Webhooks\Domain;
 
-use App\Application\Domain\Entity\Json;
+use App\Application\Domain\ValueObjects\Json;
 use Modules\Webhooks\Domain\ValueObject\Url;
 
 interface WebhookFactoryInterface

diff --git a/app/modules/Webhooks/Integartion/CycleOrm/WebhookRegistry.php b/app/modules/Webhooks/Integartion/CycleOrm/WebhookRegistry.php
@@ -4,7 +4,7 @@
 
 namespace Modules\Webhooks\Integartion\CycleOrm;
 
-use App\Application\Domain\Entity\Json;
+use App\Application\Domain\ValueObjects\Json;
 use App\Application\Domain\ValueObjects\Uuid;
 use Modules\Webhooks\Application\Locator\Webhook;
 use Modules\Webhooks\Application\Locator\WebhookRegistryInterface;

diff --git a/app/src/Application/Domain/Entity/ExtendedTypecast.php b/app/src/Application/Domain/Entity/ExtendedTypecast.php
@@ -4,6 +4,7 @@
 
 namespace App\Application\Domain\Entity;
 
+use App\Application\Domain\ValueObjects\Json;
 use App\Application\Domain\ValueObjects\Uuid;
 use Cycle\ORM\Parser\CastableInterface;
 use Cycle\ORM\Parser\UncastableInterface;

diff --git a/app/src/Application/Domain/Entity/Json.php → .../Application/Domain/ValueObjects/Json.php b/app/src/Application/Domain/Entity/Json.php → .../Application/Domain/ValueObjects/Json.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Application\Domain\Entity;
+namespace App\Application\Domain\ValueObjects;
 
 final readonly class Json implements \JsonSerializable, \Stringable
 {
@@ -20,7 +20,9 @@ final public static function typecast(mixed $value): self
         }
 
         try {
-            return new self(\json_decode($value, true));
+            return new self(
+                (array) \json_decode($value, true),
+            );
         } catch (\JsonException $e) {
             throw new \InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
         }

diff --git a/tests/Unit/Application/Domain/ValueObjects/JsonTest.php b/tests/Unit/Application/Domain/ValueObjects/JsonTest.php
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Application\Domain\ValueObjects;
+
+use App\Application\Domain\ValueObjects\Json;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+
+final class JsonTest extends TestCase
+{
+    public static function jsonDataProvider(): iterable
+    {
+        yield 'null' => [
+            'null',
+            [],
+        ];
+
+        yield 'empty-string' => [
+            '',
+            [],
+        ];
+
+        yield 'empty' => [
+            '{}',
+            [],
+        ];
+
+        yield 'simple' => [
+            '{"key": "value"}',
+            ['key' => 'value'],
+        ];
+    }
+
+    #[DataProvider('jsonDataProvider')]
+    public function testDecode(string $json, mixed $expected): void
+    {
+        $object = Json::typecast($json);
+
+        $this->assertEquals($expected, $object->jsonSerialize());
+    }
+}
diff --git a/tests/Unit/Application/Domain/ValueObjects/UuidTest.php b/tests/Unit/Application/Domain/ValueObjects/UuidTest.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Application\Domain\ValueObjects;
+
+use App\Application\Domain\ValueObjects\Uuid;
+use PHPUnit\Framework\TestCase;
+
+final class UuidTest extends TestCase
+{
+    public function testGenerate(): void
+    {
+        $uuid1 = Uuid::generate();
+        $uuid2 = Uuid::generate();
+
+        $this->assertNotEquals((string) $uuid1, (string) $uuid2);
+    }
+
+    public function testEquals(): void
+    {
+        $uuid1 = Uuid::generate();
+        $uuid2 = Uuid::generate();
+
+        $this->assertTrue($uuid1->equals($uuid1));
+        $this->assertFalse($uuid1->equals($uuid2));
+    }
+
+    public function testFromString(): void
+    {
+        $uuid = Uuid::fromString($string = 'f47ac10b-58cc-4372-a567-0e02b2c3d479');
+
+        $this->assertEquals($string, (string) $uuid);
+    }
+}