wip

Author: fab2s

src/Attribute/With.php

@@ -10,14 +10,10 @@
 namespace fab2s\Dt0\Attribute;
 
 use Attribute;
-use fab2s\Dt0\Exception\AttributeException;
 
 #[Attribute(Attribute::TARGET_CLASS)]
 class With extends WithAbstract
 {
-    /**
-     * @throws AttributeException
-     */
     public function __construct(
         WithProp|string ...$withCasts,
     ) {

src/Attribute/WithProp.php

@@ -9,38 +9,27 @@
 
 namespace fab2s\Dt0\Attribute;
 
-use fab2s\Dt0\Caster\CasterInterface;
-use fab2s\Dt0\Exception\AttributeException;
-
 class WithProp extends WithPropAbstract
 {
-    public readonly ?string $getter;
-    public readonly CasterInterface|string|null $caster;
+    public readonly string|bool|null $getter;
+    public readonly ?string $name;
 
-    /**
-     * @throws AttributeException
-     */
     public function __construct(
         ?string $name = null,
-        ?string $getter = null,
-        CasterInterface|string|null $caster = null,
+        string|bool|null $getter = null,
     ) {
-        $this->caster = $this->getCasterInstance($caster);
-        $this->getter = $getter ?? $name;
+        $this->name   = $name;
+        $this->getter = $getter;
 
-        if ($name !== null) {
-            $this->setPropName($name);
+        if ($this->name !== null) {
+            $this->setPropName($this->name);
         }
     }
 
-    /**
-     * @throws AttributeException
-     */
     public static function make(
         ?string $name = null,
         ?string $getter = null,
-        CasterInterface|string|null $cast = null,
     ): static {
-        return new static($name, $getter, $cast);
+        return new static($name, $getter);
     }
 }

src/Attribute/WithPropAbstract.php

@@ -9,16 +9,13 @@
 
 namespace fab2s\Dt0\Attribute;
 
-use fab2s\Dt0\Caster\CasterInterface;
-use fab2s\Dt0\Concern\HasCasterInstance;
 use fab2s\Dt0\Concern\HasDeclaringFqn;
 use fab2s\Dt0\Concern\HasPropName;
 
 abstract class WithPropAbstract implements WithPropInterface
 {
-    use HasCasterInstance;
     use HasDeclaringFqn;
     use HasPropName;
-    public readonly ?string $getter;
-    public readonly CasterInterface|string|null $caster;
+    public readonly ?string $name;
+    public readonly string|bool|null $getter;
 }

src/Caster/ArrayOfCaster.php

@@ -46,6 +46,16 @@ public function __construct(
         $this->scalarCaster = $this->logicalType instanceof ScalarType ? new ScalarCaster($this->logicalType) : null;
     }
 
+    /**
+     * @throws CasterException
+     */
+    public static function make(
+        /** @var class-string<Dt0|UnitEnum>|ScalarType|string $type */
+        ScalarType|string $type,
+    ): static {
+        return new static($type);
+    }
+
     /**
      * @throws CasterException
      * @throws Dt0Exception

src/Caster/CarbonCaster.php

@@ -30,6 +30,16 @@ public function __construct(
         $this->dateTimeClass = $immutable ? CarbonImmutable::class : Carbon::class;
     }
 
+    /**
+     * @throws Exception
+     */
+    public static function make(
+        DateTimeZone|string|null $timeZone = null,
+        bool $immutable = true,
+    ): static {
+        return new static($timeZone, $immutable);
+    }
+
     /**
      * @throws Exception
      */

src/Caster/NoOpCaster.php renamed to src/Caster/CasterCollection.php

@@ -9,17 +9,4 @@
 
 namespace fab2s\Dt0\Caster;
 
-use fab2s\Dt0\Dt0;
-
-class NoOpCaster extends CasterAbstract
-{
-    public static function make(): static
-    {
-        return new static;
-    }
-
-    public function cast(mixed $value, Dt0|array|null $data = null): mixed
-    {
-        return $value;
-    }
-}
+class CasterCollection extends CasterCollectionAbstract {}

src/Caster/DateTimeCaster.php

@@ -31,6 +31,16 @@ public function __construct(
         $this->dateTimeClass = $immutable ? DateTimeImmutable::class : DateTime::class;
     }
 
+    /**
+     * @throws DateInvalidTimeZoneException
+     */
+    public static function make(
+        DateTimeZone|string|null $timeZone = null,
+        bool $immutable = true,
+    ): static {
+        return new static($timeZone, $immutable);
+    }
+
     /**
      * @throws Exception
      */

src/Caster/DateTimeFormatCaster.php

@@ -31,6 +31,16 @@ public function __construct(
         $this->dateTimeClass = DateTimeImmutable::class;
     }
 
+    /**
+     * @throws DateInvalidTimeZoneException
+     */
+    public static function make(
+        string $format,
+        DateTimeZone|string|null $timeZone = null,
+    ): static {
+        return new static($format, $timeZone);
+    }
+
     /**
      * @throws Exception
      */

src/Caster/Dt0Caster.php

@@ -13,11 +13,13 @@
 use fab2s\Dt0\Exception\CasterException;
 use fab2s\Dt0\Exception\Dt0Exception;
 use JsonException;
+use ReflectionException;
 
 class Dt0Caster extends CasterAbstract
 {
     /**
      * @throws Dt0Exception
+     * @throws CasterException
      */
     public function __construct(
         /** @var class-string<Dt0> */
@@ -28,9 +30,21 @@ public function __construct(
         }
     }
 
+    /**
+     * @throws Dt0Exception
+     * @throws CasterException
+     */
+    public static function make(
+        /** @var class-string<Dt0> $dt0Fqn */
+        string $dt0Fqn,
+    ): static {
+        return new static($dt0Fqn);
+    }
+
     /**
      * @throws Dt0Exception
      * @throws JsonException
+     * @throws ReflectionException
      */
     public function cast(mixed $value, array|Dt0|null $data = null): ?Dt0
     {

src/Caster/MathCaster.php

@@ -22,6 +22,12 @@ public function __construct(
         $this->precision = max(0, $precision);
     }
 
+    public static function make(
+        int $precision = Math::PRECISION,
+    ): static {
+        return new static($precision);
+    }
+
     public function cast(mixed $value, array|Dt0|null $data = null): Math
     {
         return Math::number($value)->setPrecision($this->precision);