TypedObjectArray merged in TypedArray

Author: s3b4stian

array-speed-test-v2.png

@@ -45,15 +45,33 @@ class TypedArray extends ArrayObject
      * //correct, only int passed to array.
      * $array = new TypedArray('int', [1, 2, 3, 4]);
      * $array[] = 5;
+     *
      * //throw InvalidArgumentException.
      * $array[] = 'a';
      *
      * //throw InvalidArgumentException.
      * $array = new TypedArray('int', [1, 'a', 3, 4]);
+     *
+     * //correct, only Foo class instances passed to array.
+     * $array = new TypedArray(Foo::class, [
+     *     new Foo(),
+     *     new Foo()
+     * ]);
+     *
+     * $array[] = new Foo();
+     *
+     * //throw InvalidArgumentException.
+     * $array[] = new Bar();
+     *
+     * //throw InvalidArgumentException.
+     * $array = new TypedArray(Foo::class, [
+     *     new Foo(),
+     *     new Bar()
+     * ]);
      * </code></pre>
      *
-     * <b>Note</b>: Allowed types are only <i>array</i>, <i>bool</i>, <i>callable</i>,
-     * <i>float</i>, <i>int</i>, <i>object</i> and <i>string</i>.
+     * <b>Note</b>: Allowed types are <i>array</i>, <i>bool</i>, <i>callable</i>,
+     * <i>float</i>, <i>int</i>, <i>object</i>, <i>string</i> and all existing classes.
      *
      * @param string $type  Type for values inside array.
      * @param array  $array Optional, if you wish initialize object with values.
@@ -64,6 +82,16 @@ class TypedArray extends ArrayObject
      */
     public function __construct(string $type, array $array = [])
     {
+        if (class_exists($type)) {
+            //I like lambda functions ;)
+            $this->allowedTypes[$type] = function ($a) use ($type) {
+                if ($a instanceof $type) {
+                    return true;
+                }
+                return false;
+            };
+        }
+
         //single class, multi type support :)
         if (!isset($this->allowedTypes[$type])) {
             throw new InvalidArgumentException(__CLASS__.': '.$type.' type passed to '.__METHOD__.' not supported.');
@@ -96,6 +124,12 @@ public function __construct(string $type, array $array = [])
      */
     public function offsetSet($index, $newval)
     {
+        if ($newval instanceof $this->type) {
+            parent::offsetSet($index, $newval);
+
+            return;
+        }
+
         if ($this->allowedTypes[$this->type]($newval)) {
             parent::offsetSet($index, $newval);
 

src/TypedArray.php

@@ -287,4 +287,97 @@ public function testIteratorClass()
             $this->assertEquals($value, $arrayAsParam[$key]);
         }
     }
+
+    /**
+     * Test new instance with not existent class.
+     *
+     * @expectedException InvalidArgumentException
+     */
+    public function testCreateInstanceWithNotExistentClass()
+    {
+        $this->assertInstanceOf(TypedArray::class, (new TypedArray(ArrayBadObject::class)));
+    }
+
+    /**
+     * Test new instance passing right typed array to constructor.
+     */
+    public function testCreateInstanceWithRightObjectTypedArray()
+    {
+        $this->assertInstanceOf(
+            TypedArray::class,
+            (
+                new TypedArray(
+                ArrayObject::class,
+                [
+                    new ArrayObject([1, 2, 3]),
+                    new ArrayObject([1.1, 2.2, 3.3]),
+                    new ArrayObject(['a', 'b', 'c']),
+                ]
+            )
+            )
+        );
+    }
+
+    /**
+     * Test new instance passing array with invalid element to constructor.
+     *
+     * @expectedException InvalidArgumentException
+     */
+    public function testCreateInstanceWithWrongObjectTypedArray()
+    {
+        $this->assertInstanceOf(
+            TypedArray::class,
+            (
+                new TypedArray(
+                ArrayObject::class,
+                [
+                    new ArrayObject([1, 2, 3]),
+                    new ArrayObject([1.1, 2.2, 3.3]),
+                    new SplStack(),
+                ]
+            )
+            )
+        );
+    }
+
+    /**
+     * Test assign to array a right typed value.
+     */
+    public function testAssignrRightTypedObjectValueToArray()
+    {
+        $array = new TypedArray(ArrayObject::class);
+        $array[] = new ArrayObject([1, 2, 3]);
+
+        $this->assertEquals(1, $array->count());
+    }
+
+    /**
+     * Test assign to array a wrong typed value.
+     *
+     * @expectedException InvalidArgumentException
+     */
+    public function testAssignWrongTypedObjectValueToArray()
+    {
+        $array = new TypedArray(ArrayObject::class);
+        $array[] = new SplStack();
+    }
+
+    /**
+     * Test iterator.
+     */
+    public function testObjectIteratorClass()
+    {
+        $arrayAsParam = [
+            new ArrayObject([1, 2, 3]),
+            new ArrayObject(['1', '2', '3']),
+            new ArrayObject([true, false, null]),
+            new ArrayObject([1.0, 2.0, 3.0])
+        ];
+
+        $array = new TypedArray(ArrayObject::class, $arrayAsParam);
+
+        foreach ($array as $key => $value) {
+            $this->assertEquals($value, $arrayAsParam[$key]);
+        }
+    }
 }