Remove ArrayOfTypedValues and its references; refactor types and tests to align with new ArrayOfObjects implementation.

Author: georgedeploy

src/Abstract/Array/ArrayTypeInterface.php

@@ -27,6 +27,7 @@
  * @template TItem
  *
  * @extends IteratorAggregate<int, TItem>
+ * @extends ArrayOfObjectsAndUndefinedInterface<TItem>
  *
  * @psalm-immutable
  */

src/Abstract/Primitive/PrimitiveTypeInterface.php

@@ -4,6 +4,7 @@
 
 namespace PhpTypedValues\Abstract\Primitive;
 
+use JsonSerializable;
 use PhpTypedValues\Abstract\TypeInterface;
 use PhpTypedValues\Exception\TypeException;
 use PhpTypedValues\Undefined\Alias\Undefined;
@@ -22,7 +23,7 @@
  *
  * @psalm-immutable
  */
-interface PrimitiveTypeInterface extends TypeInterface
+interface PrimitiveTypeInterface extends TypeInterface, JsonSerializable
 {
     /**
      * Create an instance from a validated string representation.
@@ -44,4 +45,13 @@ public function toString(): string;
      * Alias of {@see toString} for convenient casting.
      */
     public function __toString(): string;
+
+    /**
+     * JSON representation of the value.
+     *
+     * Marked as mutation-free so Psalm treats calls as pure in immutable contexts.
+     *
+     * @psalm-mutation-free
+     */
+    public function jsonSerialize(): mixed;
 }

src/Array/ArrayOfObjects.php

@@ -4,10 +4,8 @@
 
 namespace PhpTypedValues\Array;
 
-use IteratorAggregate;
 use JsonSerializable;
 use PhpTypedValues\Abstract\Array\ArrayType;
-use PhpTypedValues\Abstract\Array\ArrayTypeInterface;
 use PhpTypedValues\Abstract\Primitive\PrimitiveType;
 use PhpTypedValues\Exception\ArrayTypeException;
 use PhpTypedValues\Undefined\Alias\Undefined;
@@ -21,33 +19,36 @@
  *
  * @template TItem of PrimitiveType
  *
- * @implements IteratorAggregate<int, TItem>
- *
- * @template-implements ArrayTypeInterface<TItem>
+ * @template-extends ArrayType<TItem>
  *
  * @psalm-immutable
  */
 readonly class ArrayOfObjects extends ArrayType
 {
+    /**
+     * @var list<TItem>
+     */
+    private array $value;
+
     /**
      * @param list<TItem> $value
      *
      * @throws ArrayTypeException
      */
-    public function __construct(private array $value)
+    public function __construct(array $value)
     {
         foreach ($value as $item) {
             if (!is_object($item)) {
                 throw new ArrayTypeException('Expected array of Object instances');
             }
         }
+
+        $this->value = $value;
     }
 
     /**
      * @param list<mixed> $value
      *
-     * @return ArrayOfObjects<TItem>
-     *
      * @throws ArrayTypeException
      */
     public static function fromArray(array $value): static
@@ -59,8 +60,6 @@ public static function fromArray(array $value): static
     /**
      * @param list<mixed> $value
      *
-     * @return ArrayOfObjects<TItem>
-     *
      * @throws ArrayTypeException
      */
     public static function tryFromArray(array $value): static
@@ -74,7 +73,7 @@ public static function tryFromArray(array $value): static
             }
         }
 
-        /** @var list<TItem> $value */
+        /** @var list<TItem> $valueWithUndefined */
         return new static($valueWithUndefined);
     }
 
@@ -120,6 +119,7 @@ public function toArray(): array
             if (!$item instanceof JsonSerializable) {
                 throw new ArrayTypeException('Conversion to array of scalars failed, should implement JsonSerializable interface');
             }
+
             $result[] = $item->jsonSerialize();
         }
 

src/Array/ArrayOfTypedValues.php

@@ -43,6 +43,9 @@
 echo $test->getFirstName()->toString() . PHP_EOL;
 echo $test->getHeight()->toString() . PHP_EOL;
 $nickNames = $test->getNickNames();
-echo $nickNames->isUndefined() . ' ' . $nickNames->isEmpty() . ' ' . $nickNames->hasUndefined() . ' ' . $nickNames->count() . PHP_EOL;
+echo ($nickNames->isUndefined() ? 'true' : 'false')
+    . ' ' . ($nickNames->isEmpty() ? 'true' : 'false')
+    . ' ' . ($nickNames->hasUndefined() ? 'true' : 'false')
+    . ' ' . $nickNames->count() . PHP_EOL;
 echo json_encode($nickNames->toArray(), JSON_THROW_ON_ERROR) . PHP_EOL;
 echo json_encode($test, JSON_THROW_ON_ERROR) . PHP_EOL;

src/Usage/Composite/Composite.php

@@ -109,9 +109,6 @@ public function getFirstName(): StringNonEmpty|Undefined
         return $this->firstName;
     }
 
-    /**
-     * @return ArrayOfObjects<TNickNames>
-     */
     public function getNickNames(): ArrayOfObjects
     {
         return $this->nickNames;

src/Usage/Example/WithArrays.php

@@ -1,18 +1,21 @@
 <?php
 
-namespace App\Usage\Primitive;
+namespace PhpTypedValues\Usage\Primitive;
 
 require_once 'vendor/autoload.php';
 
 use const JSON_THROW_ON_ERROR;
 use const PHP_EOL;
 
 use PhpTypedValues\Array\ArrayOfObjects;
+use PhpTypedValues\Bool\Alias\Boolean;
 use PhpTypedValues\Exception\ArrayTypeException;
 use PhpTypedValues\Integer\IntegerNonNegative;
 use PhpTypedValues\Undefined\Alias\Undefined;
 use PhpTypedValues\Usage\Example\OptionalFail;
 
+use function count;
+
 /**
  * Array.
  */
@@ -42,9 +45,9 @@
     ],
 );
 echo $collection->count() . PHP_EOL;
-echo $collection->hasUndefined() ? 'true' : 'false' . PHP_EOL;
-echo $collection->isEmpty() ? 'true' : 'false' . PHP_EOL;
-echo $collection->isUndefined() ? 'true' : 'false' . PHP_EOL;
+echo Boolean::fromBool($collection->hasUndefined())->toString() . PHP_EOL;
+echo Boolean::fromBool($collection->isEmpty())->toString() . PHP_EOL;
+echo Boolean::fromBool($collection->isUndefined())->toString() . PHP_EOL;
 
 foreach ($collection->value() as $item) {
     if (!$item instanceof Undefined) {
@@ -53,3 +56,7 @@
         echo 'Undefined' . PHP_EOL;
     }
 }
+
+// Demonstrate usage of getDefinedItems() to exclude Undefined values
+$defined = $collection->getDefinedItems();
+echo 'Defined items count: ' . count($defined) . PHP_EOL;

src/Usage/Primitive/Array.php

@@ -6,6 +6,8 @@
 
 use PhpTypedValues\Abstract\Primitive\PrimitiveType;
 use PhpTypedValues\Exception\TypeException;
+use stdClass;
+use Stringable;
 
 use function is_resource;