zicht / itertools

src/Zicht/Itertools/lib/SortedIterator.php

Spacing +3 added lines, -3 removed lines

@@ -57,13 +57,13 @@ 
     public function __construct(\Closure $func, \Iterator $iterable, $reverse = false)
     {
         if ($reverse) {
-            $cmp = function ($a, $b) use ($func) {
+            $cmp = function($a, $b) use ($func) {
                 $orderA = $a['order'];
                 $orderB = $b['order'];
                 return $orderA == $orderB ? 0 : ($orderA < $orderB ? 1 : -1);
             };
         } else {
-            $cmp = function ($a, $b) use ($func) {
+            $cmp = function($a, $b) use ($func) {
                 $orderA = $a['order'];
                 $orderB = $b['order'];
                 return $orderA == $orderB ? 0 : ($orderA < $orderB ? -1 : 1);
@@ -72,7 +72,7 @@ 
 
         $data = [];
         foreach ($iterable as $key => $value) {
-            $data []= array('key' => $key, 'value' => $value, 'order' => call_user_func($func, $value, $key));
+            $data [] = array('key' => $key, 'value' => $value, 'order' => call_user_func($func, $value, $key));
         }
 
         $this->mergesort($data, $cmp);

Braces +10 added lines, -6 removed lines

@@ -114,8 +114,9 @@ 
     protected function mergesort(array &$array, \Closure $cmp_function)
     {
         // Arrays of size < 2 require no action.
-        if (count($array) < 2)
-            return;
+        if (count($array) < 2) {
+                    return;
+        }
 
         // Split the array in half
         $halfway = count($array) / 2;
@@ -138,15 +139,18 @@ 
         while ($ptr1 < count($array1) && $ptr2 < count($array2)) {
             if (call_user_func($cmp_function, $array1[$ptr1], $array2[$ptr2]) < 1) {
                 $array[] = $array1[$ptr1++];
-            }
-            else {
+            } else {
                 $array[] = $array2[$ptr2++];
             }
         }
 
         // Merge the remainder
-        while ($ptr1 < count($array1)) $array[] = $array1[$ptr1++];
-        while ($ptr2 < count($array2)) $array[] = $array2[$ptr2++];
+        while ($ptr1 < count($array1)) {
+            $array[] = $array1[$ptr1++];
+        }
+        while ($ptr2 < count($array2)) {
+            $array[] = $array2[$ptr2++];
+        }
         return;
     }
 }

src/Zicht/Itertools/lib/MapIterator.php

Spacing +3 added lines, -3 removed lines

@@ -61,11 +61,11 @@ 
 
     public function __construct(\Closure $valueFunc /* [\Closure $keyFunc], \Iterator $iterable1, [\Iterator $iterable2, [...]] */)
     {
-        parent::__construct(\MultipleIterator::MIT_NEED_ALL| \MultipleIterator::MIT_KEYS_NUMERIC);
+        parent::__construct(\MultipleIterator::MIT_NEED_ALL|\MultipleIterator::MIT_KEYS_NUMERIC);
         $args = func_get_args();
         $argsContainsKeyFunc = $args[1] instanceof \Closure;
         $this->valueFunc = $args[0];
-        $this->keyFunc = $argsContainsKeyFunc ? $args[1] : function () { return $this->genericKeysToKey(func_get_args()); };
+        $this->keyFunc = $argsContainsKeyFunc ? $args[1] : function() { return $this->genericKeysToKey(func_get_args()); };
         foreach (array_slice($args, $argsContainsKeyFunc ? 2 : 1) as $iterable) {
             if (!$iterable instanceof \Iterator) {
                 throw new \InvalidArgumentException(sprintf('Argument %d must be an iterator'));
@@ -86,7 +86,7 @@ 
         foreach ($keys as $key) {
             if ($key !== $value) {
                 // the keys are different, we will make a new string identifying this entry
-                return join(':', array_map(function ($key) { return (string)$key; }, $keys));
+                return join(':', array_map(function($key) { return (string)$key; }, $keys));
             }
         }
 

src/Zicht/Itertools/lib/GroupbyIterator.php

Spacing +1 added lines, -1 removed lines

@@ -160,7 +160,7 @@
         $array = iterator_to_array($this);
         array_walk(
             $array,
-            function (&$value) {
+            function(&$value) {
                 /** @var GroupedIterator $value */
                 $value = $value->toArray();
             }

src/Zicht/Itertools/lib/ZipIterator.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 
     public function __construct(/* \Iterator $iterable1, \Iterator $iterable2, ... */)
     {
-        parent::__construct(\MultipleIterator::MIT_NEED_ALL| \MultipleIterator::MIT_KEYS_NUMERIC);
+        parent::__construct(\MultipleIterator::MIT_NEED_ALL|\MultipleIterator::MIT_KEYS_NUMERIC);
         foreach (func_get_args() as $iterable) {
             if (!$iterable instanceof \Iterator) {
                 throw new \InvalidArgumentException(sprintf('Argument %d must be an iterator'));

src/Zicht/Itertools/lib/SliceIterator.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
         }
 
         $this->index = 0;
-        $this->start = $start < 0 ? $length + $start: $start;
+        $this->start = $start < 0 ? $length + $start : $start;
         $this->end = $end === null ? null : ($end < 0 ? $length + $end : $end);
         parent::__construct($iterable);
     }

src/Zicht/Itertools/mappings.php

Spacing +10 added lines, -10 removed lines

@@ -16,7 +16,7 @@ 
  */
 function lstrip($chars = " \t\n\r\0\x0B")
 {
-    return function ($value) use ($chars) {
+    return function($value) use ($chars) {
         return ltrim($value, $chars);
     };
 }
@@ -29,7 +29,7 @@ 
  */
 function rstrip($chars = " \t\n\r\0\x0B")
 {
-    return function ($value) use ($chars) {
+    return function($value) use ($chars) {
         return rtrim($value, $chars);
     };
 }
@@ -42,7 +42,7 @@ 
  */
 function strip($chars = " \t\n\r\0\x0B")
 {
-    return function ($value) use ($chars) {
+    return function($value) use ($chars) {
         return trim($value, $chars);
     };
 }
@@ -54,7 +54,7 @@ 
  */
 function length()
 {
-    return function ($value) {
+    return function($value) {
         if (is_null($value)) {
             return 0;
         }
@@ -74,7 +74,7 @@ 
  */
 function key()
 {
-    return function ($value, $key) {
+    return function($value, $key) {
         return $key;
     };
 }
@@ -86,7 +86,7 @@ 
  */
 function lower()
 {
-    return function ($value) {
+    return function($value) {
         return strtolower($value);
     };
 }
@@ -98,7 +98,7 @@ 
  */
 function upper()
 {
-    return function ($value) {
+    return function($value) {
         return strtoupper($value);
     };
 }
@@ -134,7 +134,7 @@ 
 {
     $strategies = array_map('\Zicht\Itertools\conversions\mixedToValueGetter', $strategies);
 
-    return function ($value, $key) use ($strategies) {
+    return function($value, $key) use ($strategies) {
         $res = [];
         foreach ($strategies as $strategyKey => $strategy) {
             $res[$strategyKey] = $strategy($value, $key);
@@ -156,7 +156,7 @@ 
         $max = getrandmax();
     }
 
-    return function () use ($min, $max) {
+    return function() use ($min, $max) {
         return rand($min, $max);
     };
 }
@@ -170,7 +170,7 @@ 
 function type($strategy = null)
 {
     $strategy = conversions\mixedToValueGetter($strategy);
-    return function ($value) use ($strategy) {
+    return function($value) use ($strategy) {
         $value = $strategy($value);
         return is_object($value) ? get_class($value) : gettype($value);
     };

src/Zicht/Itertools/filters.php

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
 function type($class, $strategy = null)
 {
     $strategy = conversions\mixedToValueGetter($strategy);
-    return function ($value) use ($class, $strategy) {
+    return function($value) use ($class, $strategy) {
         return $strategy($value) instanceof $class;
     };
 }
@@ -58,7 +58,7 @@ 
         $haystack = iter\iterable($haystack)->values();
     }
     $strategy = conversions\mixedToValueGetter($strategy);
-    return function ($value) use ($haystack, $strategy, $strict) {
+    return function($value) use ($haystack, $strategy, $strict) {
         return in_array($strategy($value), $haystack, $strict);
     };
 }
@@ -80,7 +80,7 @@ 
         $haystack = iter\iterable($haystack)->values();
     }
     $strategy = conversions\mixedToValueGetter($strategy);
-    return function ($value) use ($haystack, $strategy, $strict) {
+    return function($value) use ($haystack, $strategy, $strict) {
         return !in_array($strategy($value), $haystack, $strict);
     };
 }
@@ -108,11 +108,11 @@ 
     }
     $strategy = conversions\mixedToValueGetter($strategy);
     if ($strict) {
-        return function ($value) use ($expected, $strategy) {
+        return function($value) use ($expected, $strategy) {
             return $expected === $strategy($value);
         };
     } else {
-        return function ($value) use ($expected, $strategy) {
+        return function($value) use ($expected, $strategy) {
             return $expected == $strategy($value);
         };
     }

src/Zicht/Itertools/itertools.php

Spacing +6 added lines, -6 removed lines

@@ -173,7 +173,7 @@ 
 function chain(/* $iterable, $iterable2, ... */)
 {
     $iterables = array_map(
-        function ($iterable) {
+        function($iterable) {
             return conversions\mixedToIterator($iterable);
         },
         func_get_args()
@@ -305,7 +305,7 @@ 
 function map($strategy, $iterable /*, $iterable2, ... */)
 {
     $iterables = array_map(
-        function ($iterable) {
+        function($iterable) {
             return conversions\mixedToIterator($iterable);
         },
         array_slice(func_get_args(), 1)
@@ -478,7 +478,7 @@ 
     }
 
     $strategy = conversions\mixedToValueGetter($strategy);
-    $isValid = function ($value, $key) use ($strategy) {
+    $isValid = function($value, $key) use ($strategy) {
         $tempVarPhp54 = $strategy($value, $key);
         return !empty($tempVarPhp54);
     };
@@ -503,7 +503,7 @@ 
     switch (sizeof($args)) {
         case 2:
             $strategy = conversions\mixedToValueGetter($args[0]);
-            $closure = function ($value, $key) use ($strategy) {
+            $closure = function($value, $key) use ($strategy) {
                 $tempVarPhp54 = call_user_func($strategy, $value, $key);
                 return !empty($tempVarPhp54);
             };
@@ -513,7 +513,7 @@ 
         case 3:
             $strategy = conversions\mixedToValueGetter($args[0]);
             $userClosure = $args[1];
-            $closure = function ($value, $key) use ($strategy, $userClosure) {
+            $closure = function($value, $key) use ($strategy, $userClosure) {
                 return call_user_func($userClosure, call_user_func($strategy, $value, $key));
             };
             $iterable = conversions\mixedToIterator($args[2]);
@@ -545,7 +545,7 @@ 
 function zip(/* $iterable, $iterable2, ... */)
 {
     $iterables = array_map(
-        function ($iterable) {
+        function($iterable) {
             return conversions\mixedToIterator($iterable);
         },
         func_get_args()

src/Zicht/Itertools/util/Mappings.php

Spacing +4 added lines, -4 removed lines

@@ -16,7 +16,7 @@ 
      */
     public static function lstrip($chars = " \t\n\r\0\x0B")
     {
-        return function ($value) use ($chars) {
+        return function($value) use ($chars) {
             return ltrim($value, $chars);
         };
     }
@@ -26,7 +26,7 @@ 
      */
     public static function rstrip($chars = " \t\n\r\0\x0B")
     {
-        return function ($value) use ($chars) {
+        return function($value) use ($chars) {
             return rtrim($value, $chars);
         };
     }
@@ -36,7 +36,7 @@ 
      */
     public static function strip($chars = " \t\n\r\0\x0B")
     {
-        return function ($value) use ($chars) {
+        return function($value) use ($chars) {
             return trim($value, $chars);
         };
     }
@@ -46,7 +46,7 @@ 
      */
     public static function length()
     {
-        return function ($value) {
+        return function($value) {
             return sizeof($value);
         };
     }