Merge pull request #2 from REZ1DENT3/dev

hhvm patch
DeimosProject · Jan 11, 2017 · 1f0badf · 1f0badf
2 parents 9cf4cdd + a3dfc43
commit 1f0badf
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/demo/test.php b/demo/test.php
@@ -7,4 +7,4 @@
 
 var_dump($helper->arr()->get([
     'name' => 'Max'
-], 'name'));
+], 'name'));
diff --git a/src/Helper/Helpers/Arr/Arr.php b/src/Helper/Helpers/Arr/Arr.php
@@ -17,7 +17,7 @@ class Arr extends AbstractHelper
      *
      * @return array
      */
-    public function map(array $storage, callable $callback)
+    public function map(array $storage, $callback)
     {
         return array_map($callback, $storage);
     }
@@ -28,11 +28,15 @@ public function map(array $storage, callable $callback)
      *
      * @return array
      */
-    public function filter(array $storage, callable $callback)
+    public function filter(array $storage, $callback)
     {
-        if (defined('HHVM_VERSION'))
+        try
         {
-            $array = []; // fixme : hhvm please
+            return array_filter($storage, $callback, ARRAY_FILTER_USE_BOTH);
+        }
+        catch (\Exception $exception)
+        {
+            $array = [];
             foreach ($storage as $key => $value)
             {
                 if ($callback($value, $key))
@@ -43,8 +47,6 @@ public function filter(array $storage, callable $callback)
 
             return $array;
         }
-
-        return array_filter($storage, $callback, ARRAY_FILTER_USE_BOTH);
     }
 
     /**

diff --git a/tests/Tests/ArrTest.php b/tests/Tests/ArrTest.php
@@ -51,10 +51,18 @@ public function testFilterHHVM()
 
         if (!defined('HHVM_VERSION'))
         {
-            define('HHVM_VERSION', 1);
+            define('HHVM_VERSION', 'hhvm');
         }
 
-        $this->testFilter();
+        $resultArray = $this->helper()->arr()->filter($this->array, function (&$var, $key)
+        {
+            return is_int($key);
+        });
+
+        foreach ($resultArray as $key => $value)
+        {
+            $this->assertTrue(is_int($key));
+        }
 
     }