refactor(assert): replace AssertTypeSuccess with AssertionComposite in assertion classes

Author: roxblnfk

src/Assert/Internal/Assertion/AssertArray.php

@@ -7,7 +7,7 @@
 use Testo\Assert\Api\Builtin\ArrayType;
 use Testo\Assert\Internal\Assertion\Traits\IterableTrait;
 use Testo\Assert\State\AssertTypeFailure;
-use Testo\Assert\State\AssertTypeSuccess;
+use Testo\Assert\State\AssertionComposite;
 use Testo\Assert\StaticState;
 
 /**
@@ -21,7 +21,7 @@ class AssertArray implements ArrayType
 
     public function __construct(
         private readonly array $value,
-        private readonly AssertTypeSuccess $parent,
+        private readonly AssertionComposite $parent,
     ) {}
 
     /**
@@ -33,7 +33,7 @@ public function __construct(
      */
     public static function validateAndCreate(mixed $value): self
     {
-        \is_array($value) or StaticState::fail(AssertTypeFailure::create('array', $value));
+        \is_array($value) or StaticState::typeFail('array', $value);
 
         $parent = StaticState::typeSuccess('array', $value);
         return new self($value, $parent);
@@ -58,7 +58,7 @@ public function hasKeys(int|string ...$keys): static
         $m = \count($keys) === 1 ? '' : 's';
         $str = "has key$m " . \implode(', ', $keys);
         if ($failedKeys === []) {
-            $this->parent->log($str);
+            $this->parent->success($str);
             return $this;
         }
 
@@ -73,7 +73,7 @@ public function hasKeys(int|string ...$keys): static
     public function isList(string $message = ''): static
     {
         if (\array_is_list($this->value)) {
-            $this->parent->log('is list');
+            $this->parent->success('is list');
             return $this;
         }
 

src/Assert/Internal/Assertion/AssertFloat.php

@@ -7,7 +7,7 @@
 use Testo\Assert\Api\Builtin\FloatType;
 use Testo\Assert\Internal\Assertion\Traits\NumericTrait;
 use Testo\Assert\State\AssertTypeFailure;
-use Testo\Assert\State\AssertTypeSuccess;
+use Testo\Assert\State\AssertionComposite;
 use Testo\Assert\StaticState;
 use Testo\Assert\Support;
 
@@ -22,7 +22,7 @@ class AssertFloat implements FloatType
 
     public function __construct(
         private readonly float $value,
-        private readonly AssertTypeSuccess $parent,
+        private readonly AssertionComposite $parent,
     ) {}
 
     /**
@@ -34,7 +34,7 @@ public function __construct(
      */
     public static function validateAndCreate(mixed $value): self
     {
-        \is_float($value) or StaticState::fail(AssertTypeFailure::create('float', $value));
+        \is_float($value) or StaticState::typeFail('float', $value);
 
         $parent = StaticState::typeSuccess('float', $value);
         return new self($value, $parent);

src/Assert/Internal/Assertion/AssertInt.php

@@ -7,7 +7,7 @@
 use Testo\Assert\Api\Builtin\IntType;
 use Testo\Assert\Internal\Assertion\Traits\NumericTrait;
 use Testo\Assert\State\AssertTypeFailure;
-use Testo\Assert\State\AssertTypeSuccess;
+use Testo\Assert\State\AssertionComposite;
 use Testo\Assert\StaticState;
 use Testo\Assert\Support;
 
@@ -22,7 +22,7 @@ class AssertInt implements IntType
 
     public function __construct(
         private readonly int $value,
-        private readonly AssertTypeSuccess $parent,
+        private readonly AssertionComposite $parent,
     ) {}
 
     /**
@@ -34,7 +34,7 @@ public function __construct(
      */
     public static function validateAndCreate(mixed $value): self
     {
-        \is_int($value) or StaticState::fail(AssertTypeFailure::create('int', $value));
+        \is_int($value) or StaticState::typeFail('int', $value);
 
         $parent = StaticState::typeSuccess('int', $value);
         return new self($value, $parent);

src/Assert/Internal/Assertion/AssertIterable.php

@@ -7,7 +7,7 @@
 use Testo\Assert\Api\Builtin\IterableType;
 use Testo\Assert\Internal\Assertion\Traits\IterableTrait;
 use Testo\Assert\State\AssertTypeFailure;
-use Testo\Assert\State\AssertTypeSuccess;
+use Testo\Assert\State\AssertionComposite;
 use Testo\Assert\StaticState;
 use Testo\Assert\Support;
 
@@ -22,7 +22,7 @@ class AssertIterable implements IterableType
 
     public function __construct(
         private readonly iterable $value,
-        private readonly AssertTypeSuccess $parent,
+        private readonly AssertionComposite $parent,
     ) {}
 
     /**
@@ -34,7 +34,7 @@ public function __construct(
      */
     public static function validateAndCreate(mixed $value): self
     {
-        \is_iterable($value) or StaticState::fail(AssertTypeFailure::create('iterable', $value));
+        \is_iterable($value) or StaticState::typeFail('iterable', $value);
 
         $parent = StaticState::typeSuccess('iterable', $value);
         return new self($value, $parent);

src/Assert/Internal/Assertion/AssertJson.php

@@ -9,7 +9,7 @@
 use Testo\Assert\Api\Json\JsonCommon;
 use Testo\Assert\Api\Json\JsonObject;
 use Testo\Assert\Api\Json\JsonStructure;
-use Testo\Assert\State\AssertTypeSuccess;
+use Testo\Assert\State\AssertionComposite;
 
 /**
  * Implementation of JSON assertions.
@@ -20,7 +20,7 @@ class AssertJson implements JsonAbstract
 {
     public function __construct(
         private mixed $value,
-        private readonly AssertTypeSuccess $parent,
+        private readonly AssertionComposite $parent,
     ) {}
 
     /**

src/Assert/Internal/Assertion/AssertNumeric.php

@@ -6,7 +6,7 @@
 
 use Testo\Assert\Api\Builtin\IntType;
 use Testo\Assert\Internal\Assertion\Traits\NumericTrait;
-use Testo\Assert\State\AssertTypeSuccess;
+use Testo\Assert\State\AssertionComposite;
 
 /**
  * Assertion utilities for numeric data type.
@@ -19,6 +19,6 @@ class AssertNumeric implements IntType
 
     public function __construct(
         public int|float $value,
-        private readonly AssertTypeSuccess $parent,
+        private readonly AssertionComposite $parent,
     ) {}
 }

src/Assert/Internal/Assertion/AssertObject.php

@@ -7,7 +7,7 @@
 use Testo\Assert\Api\Builtin\ObjectType;
 use Testo\Assert\State\AssertException;
 use Testo\Assert\State\AssertTypeFailure;
-use Testo\Assert\State\AssertTypeSuccess;
+use Testo\Assert\State\AssertionComposite;
 use Testo\Assert\StaticState;
 
 /**
@@ -19,7 +19,7 @@ final class AssertObject implements ObjectType
 {
     public function __construct(
         private readonly object $value,
-        private readonly AssertTypeSuccess $parent,
+        private readonly AssertionComposite $parent,
     ) {}
 
     /**
@@ -33,7 +33,7 @@ public function __construct(
      */
     public static function validateAndCreate(mixed $value): self
     {
-        \is_object($value) or StaticState::fail(AssertTypeFailure::create('object', $value));
+        \is_object($value) or StaticState::typeFail('object', $value);
 
         $parent = StaticState::typeSuccess('object', $value);
         return new self($value, $parent);
@@ -44,7 +44,7 @@ public function instanceOf(string $expected, string $message = ''): self
     {
         $str = "is instance of `{$expected}`";
         $this->value instanceof $expected
-            ? $this->parent->log($str, $message)
+            ? $this->parent->success($str, $message)
             : throw $this->parent->fail($str, 'got `' . $this->value::class . '` instead', $message);
         return $this;
     }

src/Assert/Internal/Assertion/AssertString.php

@@ -7,7 +7,7 @@
 use Testo\Assert\Api\Builtin\StringType;
 use Testo\Assert\State\AssertException;
 use Testo\Assert\State\AssertTypeFailure;
-use Testo\Assert\State\AssertTypeSuccess;
+use Testo\Assert\State\AssertionComposite;
 use Testo\Assert\StaticState;
 use Testo\Assert\Support;
 
@@ -20,7 +20,7 @@ class AssertString implements StringType
 {
     public function __construct(
         private readonly string $value,
-        private readonly AssertTypeSuccess $parent,
+        private readonly AssertionComposite $parent,
     ) {}
 
     /**
@@ -33,7 +33,7 @@ public function __construct(
      */
     public static function validateAndCreate(mixed $value): self
     {
-        \is_string($value) or StaticState::fail(AssertTypeFailure::create('string', $value));
+        \is_string($value) or StaticState::typeFail('string', $value);
 
         $parent = StaticState::typeSuccess('string', $value);
         return new self($value, $parent);

src/Assert/Internal/Assertion/Traits/IterableTrait.php

@@ -4,14 +4,14 @@
 
 namespace Testo\Assert\Internal\Assertion\Traits;
 
-use Testo\Assert\State\AssertTypeSuccess;
+use Testo\Assert\State\AssertionComposite;
 use Testo\Assert\Support;
 
 /**
  * Contains assertion methods for iterable values.
  *
  * @property iterable $value
- * @property AssertTypeSuccess $parent
+ * @property AssertionComposite $parent
  */
 trait IterableTrait
 {
@@ -21,7 +21,7 @@ public function contains(mixed $needle, string $message = ''): static
         $str = 'contains `' . Support::stringify($needle) . '`';
         foreach ($this->value as $item) {
             if ($item === $needle) {
-                $this->parent->log($str);
+                $this->parent->success($str);
                 return $this;
             }
         }
@@ -40,7 +40,7 @@ public function sameSizeAs(iterable $expected, string $message = ''): static
         $countThis = self::countIterable($this->value);
         $countExpected = self::countIterable($expected);
         if ($countThis === $countExpected) {
-            $this->parent->log($str);
+            $this->parent->success($str);
             return $this;
         }
 
@@ -72,7 +72,7 @@ public function allOf(string $type, string $message = ''): static
             );
         }
 
-        $this->parent->log($str);
+        $this->parent->success($str);
         return $this;
     }
 
@@ -82,7 +82,7 @@ public function hasCount(int $expected): static
         $count = self::countIterable($this->value);
         $str = "has count `$expected`";
         if ($count === $expected) {
-            $this->parent->log($str);
+            $this->parent->success($str);
             return $this;
         }
 

src/Assert/Internal/Assertion/Traits/NumericTrait.php

@@ -5,12 +5,12 @@
 namespace Testo\Assert\Internal\Assertion\Traits;
 
 use Testo\Assert\State\AssertException;
-use Testo\Assert\State\AssertTypeSuccess;
+use Testo\Assert\State\AssertionComposite;
 
 /**
  * Contains methods for comparing numeric values
  * @property int|float $value
- * @property AssertTypeSuccess $parent
+ * @property AssertionComposite $parent
  */
 trait NumericTrait
 {
@@ -25,7 +25,7 @@ public function greaterThan(int|float $min, string $message = ''): self
     {
         $str = "greater than `{$min}`";
         if ($this->value > $min) {
-            $this->parent->log($str, $message);
+            $this->parent->success($str, $message);
             return $this;
         }
 
@@ -47,7 +47,7 @@ public function greaterThanOrEqual(int|float $min, string $message = ''): self
     {
         $str = "greater than or equal to `{$min}`";
         if ($this->value >= $min) {
-            $this->parent->log($str, $message);
+            $this->parent->success($str, $message);
             return $this;
         }
 
@@ -69,7 +69,7 @@ public function lessThan(int|float $max, string $message = ''): self
     {
         $str = "less than `{$max}`";
         if ($this->value < $max) {
-            $this->parent->log($str, $message);
+            $this->parent->success($str, $message);
             return $this;
         }
 
@@ -91,7 +91,7 @@ public function lessThanOrEqual(int|float $max, string $message = ''): self
     {
         $str = "less than or equal to `{$max}`";
         if ($this->value <= $max) {
-            $this->parent->log($str, $message);
+            $this->parent->success($str, $message);
             return $this;
         }