split instance implementation from constructor

Author: Baptouuuu

src/Constraint.php

@@ -51,6 +51,19 @@ public static function of(callable $assert): self
         return new self(Of::callable($assert));
     }
 
+    /**
+     * @template A of object
+     * @psalm-pure
+     *
+     * @param class-string<A> $class
+     *
+     * @return self<mixed, A>
+     */
+    public static function instance(string $class): self
+    {
+        return new self(Constraint\Instance::of($class));
+    }
+
     /**
      * @psalm-pure
      * @template A

src/Constraint/Instance.php

@@ -0,0 +1,51 @@
+<?php
+declare(strict_types = 1);
+
+namespace Innmind\Validation\Constraint;
+
+use Innmind\Validation\Failure;
+use Innmind\Immutable\Validation;
+
+/**
+ * @internal
+ * @template-covariant T of object
+ * @implements Implementation<mixed, T>
+ * @psalm-immutable
+ */
+final class Instance implements Implementation
+{
+    /** @var class-string<T> */
+    private string $class;
+
+    /**
+     * @param class-string<T> $class
+     */
+    private function __construct(string $class)
+    {
+        $this->class = $class;
+    }
+
+    #[\Override]
+    public function __invoke(mixed $value): Validation
+    {
+        /** @var Validation<Failure, T> */
+        return match ($value instanceof $this->class) {
+            true => Validation::success($value),
+            false => Validation::fail(Failure::of("Value is not an instance of {$this->class}")),
+        };
+    }
+
+    /**
+     * @internal
+     * @template A of object
+     * @psalm-pure
+     *
+     * @param class-string<A> $class
+     *
+     * @return self<A>
+     */
+    public static function of(string $class): self
+    {
+        return new self($class);
+    }
+}

src/Instance.php

@@ -3,46 +3,13 @@
 
 namespace Innmind\Validation;
 
-use Innmind\Immutable\{
-    Validation,
-    Predicate,
-};
-
 /**
- * @template-covariant T of object
- * @implements Constraint\Provider<mixed, T>
  * @psalm-immutable
  */
-final class Instance implements Constraint\Provider
+final class Instance
 {
-    /** @var class-string<T> */
-    private string $class;
-
-    /**
-     * @param class-string<T> $class
-     */
-    private function __construct(string $class)
+    private function __construct()
     {
-        $this->class = $class;
-    }
-
-    /**
-     * @return Validation<Failure, T>
-     */
-    public function __invoke(mixed $value): Validation
-    {
-        /** @var Validation<Failure, T> */
-        return match ($value instanceof $this->class) {
-            true => Validation::success($value),
-            false => Validation::fail(Failure::of("Value is not an instance of {$this->class}")),
-        };
-    }
-
-    #[\Override]
-    public function toConstraint(): Constraint
-    {
-        /** @psalm-suppress InvalidArgument */
-        return Constraint::of($this(...));
     }
 
     /**
@@ -51,62 +18,10 @@ public function toConstraint(): Constraint
      *
      * @param class-string<A> $class
      *
-     * @return self<A>
-     */
-    public static function of(string $class): self
-    {
-        return new self($class);
-    }
-
-    /**
-     * @template V
-     *
-     * @param Constraint<T, V> $constraint
-     *
-     * @return Constraint<mixed, V>
-     */
-    public function and(Constraint $constraint): Constraint
-    {
-        return $this
-            ->toConstraint()
-            ->and($constraint);
-    }
-
-    /**
-     * @template V
-     *
-     * @param Constraint<mixed, V> $constraint
-     *
-     * @return Constraint<mixed, T|V>
-     */
-    public function or(Constraint $constraint): Constraint
-    {
-        return $this
-            ->toConstraint()
-            ->or($constraint);
-    }
-
-    /**
-     * @template V
-     *
-     * @param callable(T): V $map
-     *
-     * @return Constraint<mixed, V>
-     */
-    public function map(callable $map): Constraint
-    {
-        return $this
-            ->toConstraint()
-            ->map($map);
-    }
-
-    /**
-     * @return Predicate<T>
+     * @return Constraint<mixed, A>
      */
-    public function asPredicate(): Predicate
+    public static function of(string $class): Constraint
     {
-        return $this
-            ->toConstraint()
-            ->asPredicate();
+        return Constraint::instance($class);
     }
 }