Add ArrayValue::toNumbersArray

spec/PlainArraySpec.php

@@ -4,6 +4,8 @@
 
 use GW\Value\ArrayValue;
 use GW\Value\Filters;
+use GW\Value\Numberable\JustInteger;
+use GW\Value\NumbersArray;
 use GW\Value\PlainArray;
 use GW\Value\Sorts;
 use GW\Value\StringsArray;
@@ -673,6 +675,15 @@ function it_can_be_converted_to_StringsArray()
         $stringsArray->toNativeStrings()->shouldBeLike(['one', 'two', 'three']);
     }
 
+    function it_can_be_converted_to_NumbersArray()
+    {
+        $this->beConstructedWith(['1', 2.1, new JustInteger(3)]);
+
+        $numbersArray = $this->toNumbersArray();
+        $numbersArray->shouldBeAnInstanceOf(NumbersArray::class);
+        $numbersArray->toNativeNumbers()->shouldBeLike([1, 2.1, 3]);
+    }
+
     function it_can_tell_if_has_element_or_not()
     {
         $this->beConstructedWith(['one', '2', 'three']);

spec/PlainStringsArraySpec.php

@@ -565,6 +565,15 @@ function it_returns_PlainArray_containing_regex_matches()
         $matches->shouldBeLike(new PlainArray([['Lorem', 'Lorem'], ['dolor', 'dolor']]));
     }
 
+    function it_can_be_converted_to_NumbersArray()
+    {
+        $this->beConstructedWithStrings('1', '2.1', '3.0');
+
+        $this->toNumbersArray()
+            ->toNativeNumbers()
+            ->shouldBeLike([1, 2.1, 3.0]);
+    }
+
     private function beConstructedWithStrings(string ...$strings): void
     {
         $this->beConstructedWith(Wrap::array($strings));

src/ArrayValue.php

@@ -191,4 +191,6 @@ public function notEmpty(): ArrayValue;
     public function toAssocValue(): AssocValue;
 
     public function toStringsArray(): StringsArray;
+
+    public function toNumbersArray(): NumbersArray;
 }

src/NumberValue.php

@@ -7,42 +7,42 @@ interface NumberValue extends Value, Numberable
     // comparators
 
     /**
-     * @param int|float|Numberable $other
+     * @param int|float|numeric-string|Numberable $other
      * @return int {-1, 0, 1}
      */
     public function compare($other): int;
 
     /**
-     * @param int|float|Numberable $other
+     * @param int|float|numeric-string|Numberable $other
      */
     public function equals($other): bool;
 
     // basic math
 
     /**
-     * @param int|float|Numberable $other
+     * @param int|float|numeric-string|Numberable $other
      */
     public function add($other): NumberValue;
 
     /**
-     * @param int|float|Numberable $other
+     * @param int|float|numeric-string|Numberable $other
      */
     public function subtract($other): NumberValue;
 
     /**
-     * @param int|float|Numberable $other
+     * @param int|float|numeric-string|Numberable $other
      */
     public function multiply($other): NumberValue;
 
     /**
-     * @param int|float|Numberable $other
+     * @param int|float|numeric-string|Numberable $other
      */
     public function divide($other): NumberValue;
 
     public function abs(): NumberValue;
 
     /**
-     * @param int|float|Numberable $divider
+     * @param int|float|numeric-string|Numberable $divider
      */
     public function modulo($divider): NumberValue;
 

src/NumbersArray.php

@@ -30,6 +30,9 @@ public function unique(?callable $comparator = null): NumbersArray;
     /** @return NumberValue[] */
     public function toArray(): array;
 
+    /** @return array<int|float> */
+    public function toNativeNumbers(): array;
+
     /**
      * @param callable(NumberValue):bool $filter
      */

src/PlainArray.php

@@ -23,6 +23,7 @@
 use GW\Value\Arrayable\Splice;
 use GW\Value\Arrayable\UniqueByComparator;
 use GW\Value\Arrayable\UniqueByString;
+use GW\Value\Numberable\ToNumberValue;
 use function array_map;
 use function array_reverse;
 use function count;
@@ -449,4 +450,9 @@ public function toStringsArray(): StringsArray
     {
         return Wrap::stringsArray($this->items->toArray());
     }
+
+    public function toNumbersArray(): NumbersArray
+    {
+        return new PlainNumbersArray($this->map(new ToNumberValue()));
+    }
 }

src/PlainNumbersArray.php

@@ -174,7 +174,7 @@ public function unshift($value): NumbersArray
     }
 
     /**
-     * @param NumberValue $value
+     * @param NumberValue|null $value
      */
     public function shift(&$value = null): NumbersArray
     {
@@ -313,6 +313,11 @@ public function toStringsArray(): StringsArray
         return $this->numbers->toStringsArray();
     }
 
+    public function toNumbersArray(): NumbersArray
+    {
+        return $this;
+    }
+
     public function first(): ?NumberValue
     {
         return $this->numbers->first();

src/PlainStringsArray.php

@@ -2,6 +2,8 @@
 
 namespace GW\Value;
 
+use GW\Value\Numberable\ToNumberValue;
+use GW\Value\Stringable\ToNativeString;
 use GW\Value\Stringable\ToStringValue;
 use Traversable;
 use function in_array;
@@ -214,7 +216,7 @@ public function toArray(): array
     public function toNativeStrings(): array
     {
         return $this->strings
-            ->map(fn(StringValue $item): string => $item->toString())
+            ->map(new ToNativeString())
             ->toArray();
     }
 
@@ -615,4 +617,9 @@ public function toStringsArray(): self
     {
         return $this;
     }
+
+    public function toNumbersArray(): NumbersArray
+    {
+        return new PlainNumbersArray($this->strings->map(new ToNativeString())->map(new ToNumberValue()));
+    }
 }

src/Stringable/ToNativeString.php

@@ -0,0 +1,13 @@
+<?php declare(strict_types=1);
+
+namespace GW\Value\Stringable;
+
+use GW\Value\StringValue;
+
+final class ToNativeString
+{
+    public function __invoke(StringValue $stringValue): string
+    {
+        return $stringValue->toString();
+    }
+}