Upgrade ValidatedDTO (#266)

* Upgrade ValidatedDTO

* Fix pest error in PHP 8.0

---------

Co-authored-by: Deeka Wong <[email protected]>

publish/dto.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of friendsofhyperf/components.
+ *
+ * @link     https://github.com/friendsofhyperf/components
+ * @document https://github.com/friendsofhyperf/components/blob/3.0/README.md
+ * @contact  [email protected]
+ */
+return [
+    /*
+    |--------------------------------------------------------------------------
+    | REQUIRE CASTING
+    |--------------------------------------------------------------------------
+    |
+    | If this is set to true, you must configure a cast type for all properties of your DTOs.
+    | If a property doesn't have a cast type configured it will throw a
+    | \FriendsOfHyperf\ValidatedDTO\Exceptions\MissingCastTypeException exception
+    |
+    */
+    'require_casting' => false,
+];

src/Casting/DTOCast.php

@@ -12,7 +12,7 @@
 
 use FriendsOfHyperf\ValidatedDTO\Exception\CastException;
 use FriendsOfHyperf\ValidatedDTO\Exception\CastTargetException;
-use FriendsOfHyperf\ValidatedDTO\ValidatedDTO;
+use FriendsOfHyperf\ValidatedDTO\SimpleDTO;
 use Hyperf\Validation\ValidationException;
 use Throwable;
 
@@ -25,7 +25,7 @@ public function __construct(private string $dtoClass)
     /**
      * @throws CastException|CastTargetException|ValidationException
      */
-    public function cast(string $property, mixed $value): ValidatedDTO
+    public function cast(string $property, mixed $value): SimpleDTO
     {
         if (is_string($value)) {
             $value = json_decode($value, true);
@@ -39,11 +39,12 @@ public function cast(string $property, mixed $value): ValidatedDTO
             $dto = new $this->dtoClass($value);
         } catch (ValidationException $exception) {
             throw $exception;
-        } catch (Throwable) {
+        } catch (Throwable $exception) {
+            throw $exception;
             throw new CastException($property);
         }
 
-        if (! $dto instanceof ValidatedDTO) {
+        if (! $dto instanceof SimpleDTO) {
             throw new CastTargetException($property);
         }
 

src/Concerns/Wireable.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of friendsofhyperf/components.
+ *
+ * @link     https://github.com/friendsofhyperf/components
+ * @document https://github.com/friendsofhyperf/components/blob/3.0/README.md
+ * @contact  [email protected]
+ */
+namespace FriendsOfHyperf\ValidatedDTO\Concerns;
+
+use stdClass;
+
+trait Wireable
+{
+    public static function fromLivewire($value)
+    {
+        if (is_array($value)) {
+            return new static($value);
+        }
+
+        if (is_object($value) && method_exists($value, 'toArray')) {
+            return new static($value->toArray());
+        }
+
+        if ($value instanceof stdClass) {
+            return new static((array) $value);
+        }
+
+        return new static([]);
+    }
+
+    public function toLivewire(): array
+    {
+        return $this->toArray();
+    }
+}

src/ConfigProvider.php

@@ -20,6 +20,15 @@ public function __invoke(): array
             'commands' => [
                 Command\GeneratorCommand::class,
             ],
+
+            'publish' => [
+                [
+                    'id' => 'config',
+                    'description' => 'The config file of dto.',
+                    'source' => __DIR__ . '/../publish/dto.php',
+                    'destination' => BASE_PATH . '/config/autoload/dto.php',
+                ],
+            ],
         ];
     }
 }