Fixing collections with abstract methods

italolelis · Jul 28, 2014 · ed839e9 · ed839e9
1 parent bf167da
commit ed839e9
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 130 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Easy/Collections/AbstractCollection.php b/src/Easy/Collections/AbstractCollection.php
@@ -135,4 +135,22 @@ public function toKeysArrays()
     {
         return array_keys($this->array);
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function concat(ICollectionConvertable $collection)
+    {
+        $this->array = array_merge_recursive($this->array,
+                                             $collection->toArray());
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromItems(Traversable $items)
+    {
+        return new static($items);
+    }
 }
diff --git a/src/Easy/Collections/CollectionArray.php b/src/Easy/Collections/CollectionArray.php
@@ -139,24 +139,6 @@ public function map($p)
         return static::fromArray(array_map($p, $this->array));
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function concat(ICollectionConvertable $collection)
-    {
-        $this->array = array_merge_recursive($this->array,
-                                             $collection->toArray());
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromItems(Traversable $items)
-    {
-        return new static($items);
-    }
-
     /**
      * {@inheritdoc}
      */

diff --git a/src/Easy/Collections/ImmutableVector.php b/src/Easy/Collections/ImmutableVector.php
@@ -1,16 +1,11 @@
 <?php
 
 // Copyright (c) Lellys Informática. All rights reserved. See License.txt in the project root for license information.
-
 namespace Easy\Collections;
 
-use Closure;
 use Easy\Collections\AbstractCollection;
 use Easy\Collections\IConstIndexAccess;
 use Easy\Collections\ImmutableVector;
-use Easy\Collections\Linq\Criteria;
-use Easy\Collections\Linq\Expr\ClosureExpressionVisitor;
-use Easy\Generics\IEquatable;
 use InvalidArgumentException;
 use OutOfBoundsException;
 use Traversable;
@@ -93,50 +88,4 @@ protected static function convertFromArray($arr)
         }
         return $vector;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function filter(Closure $p)
-    {
-        return ImmutableVector::fromArray(array_filter($this->array, $p));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function matching(Criteria $criteria)
-    {
-        $expr = $criteria->getWhereExpression();
-        $filtered = $this->array;
-
-        if ($expr) {
-            $visitor = new ClosureExpressionVisitor();
-            $filter = $visitor->dispatch($expr);
-            $filtered = array_filter($filtered, $filter);
-        }
-
-        if ($orderings = $criteria->getOrderings()) {
-            $next = null;
-            foreach (array_reverse($orderings) as $field => $ordering) {
-                $next = ClosureExpressionVisitor::sortByField($field, $ordering == 'DESC' ? -1 : 1, $next);
-            }
-
-            if ($next === null) {
-                throw new InvalidArgumentException("The next value needs to be a callable function");
-            }
-
-            usort($filtered, $next);
-        }
-
-        $offset = $criteria->getFirstResult();
-        $length = $criteria->getMaxResults();
-
-        if ($offset || $length) {
-            $filtered = array_slice($filtered, (int) $offset, $length);
-        }
-
-        return ImmutableVector::fromArray($filtered);
-    }
-
-}
+}
diff --git a/src/Easy/Collections/Queue.php b/src/Easy/Collections/Queue.php
@@ -60,18 +60,16 @@ public function peek()
         return $this->array[0];
     }
 
-    public function concat(ICollectionConvertable $collection)
-    {
-
-    }
-
     public static function fromArray(array $arr)
     {
-
-    }
-
-    public static function fromItems(\Traversable $items)
-    {
-
+        $collection = new Queue();
+        foreach ($arr as $v) {
+            if (is_array($v)) {
+                $collection->enqueue(static::fromArray($v));
+            } else {
+                $collection->enqueue($v);
+            }
+        }
+        return $collection;
     }
 }