mblarsen / arrgh

src/Arrgh.php

Doc Comments +9 added lines

@@ -184,6 +184,10 @@ 
     }
 
     /* Wraps a callable with the purpose of fixing bad PHP sort implementations */
+
+    /**
+     * @param Closure $callable
+     */
     static private function wrapCallable($callable)
     {
         $direction = Arrgh::getSortDirection();
@@ -195,6 +199,10 @@ 
     }
 
     /* Transforms the incoming calls to native calls */
+
+    /**
+     * @param Arrgh $object
+     */
     static private function invoke($method, $args, $object = null)
     {
         self::getSortDirection();
@@ -628,6 +636,7 @@ 
      *
      * @param array    A collection
      * @param callable A callable returning true or false depending on which way to partion the element—left or right.
+     * @param Closure $callable
      * @return [left, right] An array with two arrays—left and right.
      */
     static private function arrgh_partition($array, $callable)

Spacing +24 added lines, -24 removed lines

@@ -41,7 +41,7 @@ 
     /* Returns an array */
     public function toArray()
     {
-        $array = array_map(function ($item) {
+        $array = array_map(function($item) {
             if ($item instanceof Arrgh) {
                 return $item->toArray();
             }
@@ -187,7 +187,7 @@ 
     static private function wrapCallable($callable)
     {
         $direction = Arrgh::getSortDirection();
-        return function ($a, $b) use ($direction, $callable) {
+        return function($a, $b) use ($direction, $callable) {
             $result = $callable($a, $b);
             if ($result === 0) return $direction;
             return $result;
@@ -203,7 +203,7 @@ 
         $function_name = $snake;
         $function_name_prefixed = stripos($method, "array_") === 0 ? $snake : "array_" . $snake;
 
-        $all_function_names = [ $function_name, $function_name_prefixed ];
+        $all_function_names = [$function_name, $function_name_prefixed];
         $all_functions      = self::allFunctions();
 
         $matching_handler = null;
@@ -226,7 +226,7 @@ 
         // asort in PHP5 reverses equals ("arsort" doen't mess up for some reason)
         if ($matching_function === "asort") {
             $matching_function = "uasort";
-            array_push($args, function ($a, $b) { return strcasecmp($a, $b); });
+            array_push($args, function($a, $b) { return strcasecmp($a, $b); });
         }
         
         // Native array_column filters away null values. That means you cannot use array_column
@@ -240,13 +240,13 @@ 
             $column_key = $args[1];
             if (count($args) === 3) {
                 $column_id = $args[2];
-                $column_ids_new = array_map(function ($item) use ($column_id) { return isset($item[$column_id]) ? $item[$column_id] : null; }, $column_array);
-                $post_handler = function ($result) use ($column_ids_new) {
+                $column_ids_new = array_map(function($item) use ($column_id) { return isset($item[$column_id]) ? $item[$column_id] : null; }, $column_array);
+                $post_handler = function($result) use ($column_ids_new) {
                     return array_combine($column_ids_new, $result);
                 };
             }
             $args = [$column_array];
-            array_push($args, function ($item) use ($column_key) { return isset($item[$column_key]) ? $item[$column_key] : null; });
+            array_push($args, function($item) use ($column_key) { return isset($item[$column_key]) ? $item[$column_key] : null; });
         }
 
         // If chain unshift array onto argument stack
@@ -256,7 +256,7 @@ 
 
         // If some arrays are Arrghs map to array or if callable, wrap it in new callable with
         // info about sort direction.
-        $args = array_map(function ($arg) use ($matching_function) {
+        $args = array_map(function($arg) use ($matching_function) {
             if ($arg instanceof Arrgh) {
                 return $arg->array;
             } else if ($arg instanceof Closure) {
@@ -383,14 +383,14 @@ 
             return $array;
         }
         
-        $column = array_map(function ($item) use ($key) { return isset($item[$key]) ? $item[$key] : null; }, $array);
+        $column = array_map(function($item) use ($key) { return isset($item[$key]) ? $item[$key] : null; }, $array);
         array_multisort($column, ($direction_int === 1 ? SORT_ASC : SORT_DESC), $array);
         return $array;
     }
 
     static private function arrgh_collapse($array)
     {
-        return array_reduce($array, function ($merged, $item) {
+        return array_reduce($array, function($merged, $item) {
             if (is_array($item)) {
                 return $merged = array_merge($merged, $item);
             }
@@ -405,7 +405,7 @@ 
         if ($key) {
             $haystack = array_column($array, $key);
         } else {
-            $haystack = array_reduce($array, function ($merged, $item) {
+            $haystack = array_reduce($array, function($merged, $item) {
                 return $merged = array_merge($merged, array_values($item));
             }, []);
         }
@@ -415,13 +415,13 @@ 
     static private function arrgh_except($array, $except)
     {
         if (is_string($except)) {
-            $except = [ $except ];
+            $except = [$except];
         }
 
         $is_collection = Arrgh::arrgh_is_collection($array);
-        $array = $is_collection ? $array : [ $array ];
+        $array = $is_collection ? $array : [$array];
 
-        $result = array_map(function ($item) use ($except) {
+        $result = array_map(function($item) use ($except) {
             foreach ($except as $key) {
                 unset($item[$key]);
             }
@@ -437,13 +437,13 @@ 
     static private function arrgh_only($array, $only)
     {
         if (is_string($only)) {
-            $only = [ $only ];
+            $only = [$only];
         }
 
         $is_collection = Arrgh::arrgh_is_collection($array);
-        $array = $is_collection ? $array : [ $array ];
+        $array = $is_collection ? $array : [$array];
 
-        $result = array_map(function ($item) use ($only) {
+        $result = array_map(function($item) use ($only) {
             foreach ($item as $key => $value) {
                 if (!in_array($key, $only)) {
                     unset($item[$key]);
@@ -516,7 +516,7 @@ 
                 $next_node = $data;
             } else {
                 if ($is_collection) {
-                    $next_node = array_map(function ($item) use ($next_key) {
+                    $next_node = array_map(function($item) use ($next_key) {
                         if ($item !== null && array_key_exists($next_key, $item)) {
                             return $item[$next_key];
                         }
@@ -573,7 +573,7 @@ 
                             if ($collapse) {
                                 $result[] = $partial;
                             } else {
-                                $result[] = [ $partial ];
+                                $result[] = [$partial];
                             }
                         }
                     }
@@ -616,7 +616,7 @@ 
 
         $depth = 0;
         $child = array_shift($array);
-        while(Arrgh::arrgh_is_collection($child)) {
+        while (Arrgh::arrgh_is_collection($child)) {
             $depth += 1;
             $child = array_shift($child);
         }
@@ -634,24 +634,24 @@ 
     {
         $left = [];
         $right = [];
-        array_walk($array, function ($item, $key) use (&$left, &$right, $callable) {
+        array_walk($array, function($item, $key) use (&$left, &$right, $callable) {
             if ($callable($item, $key)) {
                 $left[] = $item;
             } else {
                 $right[] = $item;
             }
         });
-        return [ $left, $right ];
+        return [$left, $right];
     }
 
     static private function arrgh_even($array)
     {
-        return Arrgh::arrgh_partition($array, function ($item, $key) { return $key % 2 === 0; })[0];
+        return Arrgh::arrgh_partition($array, function($item, $key) { return $key % 2 === 0; })[0];
     }
 
     static private function arrgh_odd($array)
     {
-        return Arrgh::arrgh_partition($array, function ($item, $key) { return $key % 2 === 1; })[0];
+        return Arrgh::arrgh_partition($array, function($item, $key) { return $key % 2 === 1; })[0];
     }
 
     /* Synonym of shift */

Braces +9 added lines, -3 removed lines

@@ -189,7 +189,9 @@ 
         $direction = Arrgh::getSortDirection();
         return function ($a, $b) use ($direction, $callable) {
             $result = $callable($a, $b);
-            if ($result === 0) return $direction;
+            if ($result === 0) {
+                return $direction;
+            }
             return $result;
         };
     }
@@ -611,8 +613,12 @@ 
      */
     static private function arrgh_depth($array)
     {
-        if (empty($array) && is_array($array)) return 0;
-        if (!Arrgh::arrgh_is_collection($array)) return null;
+        if (empty($array) && is_array($array)) {
+            return 0;
+        }
+        if (!Arrgh::arrgh_is_collection($array)) {
+            return null;
+        }
 
         $depth = 0;
         $child = array_shift($array);

src/arrgh_functions.php

Braces +4 added lines, -2 removed lines

@@ -29,6 +29,8 @@
     }
 
     // Define so it will not be defiend again
-    if (!defined("ARRGH_IS_DEFINED")) define("ARRGH_IS_DEFINED", true);
-}
+    if (!defined("ARRGH_IS_DEFINED")) {
+        define("ARRGH_IS_DEFINED", true);
+    }
+    }