Реализация метода фильтрации масива

petrgrishin · Jun 1, 2014 · f1171ac · f1171ac
1 parent 9c7ef83
commit f1171ac
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/src/ArrayAccess.php b/src/ArrayAccess.php
@@ -8,6 +8,7 @@
 
 use PetrGrishin\ArrayAccess\Exception\ArrayAccessException;
 use PetrGrishin\ArrayMap\ArrayMap;
+use PetrGrishin\ArrayMap\Exception\ArrayMapException;
 
 class ArrayAccess {
     /** @var array */
@@ -150,7 +151,7 @@ public function map($callback) {
             $this->data = ArrayMap::create($this->data)
                 ->map($callback)
                 ->getArray();
-        } catch (\PetrGrishin\ArrayMap\Exception\ArrayMapException $e) {
+        } catch (ArrayMapException $e) {
             throw new ArrayAccessException(sprintf('Error when mapping: %s', $e->getMessage()), null, $e);
         }
         return $this;
@@ -161,9 +162,20 @@ public function mergeWith(array $data, $recursive = true) {
             $this->data = ArrayMap::create($this->data)
                 ->mergeWith($data, $recursive)
                 ->getArray();
-        } catch (\PetrGrishin\ArrayMap\Exception\ArrayMapException $e) {
+        } catch (ArrayMapException $e) {
             throw new ArrayAccessException(sprintf('Error when merge: %s', $e->getMessage()), null, $e);
         }
         return $this;
     }
+
+    public function filter($callback) {
+        try {
+            $this->data = ArrayMap::create($this->data)
+                ->filter($callback)
+                ->getArray();
+        } catch (ArrayMapException $e) {
+            throw new ArrayAccessException(sprintf('Error when filter: %s', $e->getMessage()), null, $e);
+        }
+        return $this;
+    }
 }
diff --git a/tests/unit/ArrayAccessTest.php b/tests/unit/ArrayAccessTest.php
@@ -189,4 +189,22 @@ public function testRecursiveMergeWith() {
         $instance->mergeWith(array('a' => array(2), 'd', 'e'));
         $this->assertEquals(array('a' => array(1, 2), 'b', 'c', 'd', 'e'), $instance->getArray());
     }
+
+    public function testFiltering() {
+        $original = array('a' => 1, 'b' => 2, 'c' => 3);
+        $instance = ArrayAccess::create($original);
+        $instance->filter(function ($value) {
+            return $value > 2;
+        });
+        $this->assertEquals(array('c' => 3), $instance->getArray());
+    }
+
+    public function testFilteringUseKeys() {
+        $original = array('a' => 1, 'b' => 2, 'c' => 3);
+        $instance = ArrayAccess::create($original);
+        $instance->filter(function ($value, $key) {
+            return $key === 'c';
+        });
+        $this->assertEquals(array('c' => 3), $instance->getArray());
+    }
 }