Athari / YaLinqo

YaLinqo/EnumerableGeneration.php

Doc Comments +12 added lines, -12 removed lines

@@ -13,7 +13,7 @@ 
      * @param array|\Iterator|\IteratorAggregate|Enumerable $source Source sequence.
      * @throws \InvalidArgumentException If source is not array or Traversible or Enumerable.
      * @throws \UnexpectedValueException If source contains no elements (checked during enumeration).
-     * @return Enumerable Endless list of items repeating the source sequence.
+     * @return EnumerableGeneration Endless list of items repeating the source sequence.
      * @package YaLinqo\Generation
      */
     public static function cycle ($source)
@@ -36,7 +36,7 @@ 
     /**
      * Returns an empty sequence.
      * <p><b>Syntax</b>: emptyEnum ()
-     * @return Enumerable
+     * @return EnumerableGeneration
      * @package YaLinqo\Generation
      */
     public static function emptyEnum ()
@@ -84,7 +84,7 @@ 
      * @param mixed $seedValue Initial state of the generator loop for values. Default: null.
      * @param callable|null $funcKey {(v, k) ==> key} State update function to run on key after every iteration of the generator loop. Default: increment.
      * @param mixed $seedKey Initial state of the generator loop ofr keys. Default: 0.
-     * @return Enumerable
+     * @return EnumerableGeneration
      * @package YaLinqo\Generation
      */
     public static function generate ($funcValue, $seedValue = null, $funcKey = null, $seedKey = null)
@@ -111,7 +111,7 @@ 
      * <p><b>Syntax</b>: toInfinity ([start [, step]])
      * @param int $start The first integer in the sequence. Default: 0.
      * @param int $step The difference between adjacent integers. Default: 1.
-     * @return Enumerable
+     * @return EnumerableGeneration
      * @package YaLinqo\Generation
      */
     public static function toInfinity ($start = 0, $step = 1)
@@ -129,7 +129,7 @@ 
      * @param string $subject The input string.
      * @param string $pattern The pattern to search for, as a string.
      * @param int $flags Can be a combination of the following flags: PREG_PATTERN_ORDER, PREG_SET_ORDER, PREG_OFFSET_CAPTURE. Default: PREG_SET_ORDER.
-     * @return Enumerable
+     * @return EnumerableGeneration
      * @see preg_match_all
      * @package YaLinqo\Generation
      */
@@ -146,7 +146,7 @@ 
      * <p><b>Syntax</b>: toNegativeInfinity ([start [, step]])
      * @param int $start The first integer in the sequence. Default: 0.
      * @param int $step The difference between adjacent integers. Default: 1.
-     * @return Enumerable
+     * @return EnumerableGeneration
      * @package YaLinqo\Generation
      */
     public static function toNegativeInfinity ($start = 0, $step = 1)
@@ -158,7 +158,7 @@ 
      * Returns a sequence that contains a single element with a specified value.
      * <p><b>Syntax</b>: returnEnum (element)
      * @param mixed $element The single element in the resulting sequence.
-     * @return Enumerable Observable sequence containing the single specified element.
+     * @return EnumerableGeneration Observable sequence containing the single specified element.
      * @package YaLinqo\Generation
      */
     public static function returnEnum ($element)
@@ -174,7 +174,7 @@ 
      * @param int $start The value of the first integer in the sequence.
      * @param int $count The number of integers to generate.
      * @param int $step The difference between adjacent integers. Default: 1.
-     * @return Enumerable A sequence that contains a range of integral numbers.
+     * @return EnumerableGeneration A sequence that contains a range of integral numbers.
      * @package YaLinqo\Generation
      */
     public static function range ($start, $count, $step = 1)
@@ -196,7 +196,7 @@ 
      * @param int $start The value of the first integer in the sequence.
      * @param int $count The number of integers to generate.
      * @param int $step The difference between adjacent integers. Default: 1.
-     * @return Enumerable A sequence that contains a range of integral numbers.
+     * @return EnumerableGeneration A sequence that contains a range of integral numbers.
      * @package YaLinqo\Generation
      */
     public static function rangeDown ($start, $count, $step = 1)
@@ -213,7 +213,7 @@ 
      * @param int $end The value of the last integer in the sequence (not included).
      * @param int $step The difference between adjacent integers. Default: 1.
      * @throws \InvalidArgumentException If step is not a positive number.
-     * @return Enumerable A sequence that contains a range of integral numbers.
+     * @return EnumerableGeneration A sequence that contains a range of integral numbers.
      * @package YaLinqo\Generation
      */
     public static function rangeTo ($start, $end, $step = 1)
@@ -242,7 +242,7 @@ 
      * @param int $element The value to be repeated.
      * @param int $count The number of times to repeat the value in the generated sequence. Default: null.
      * @throws \InvalidArgumentException If count is less than 0.
-     * @return Enumerable A sequence that contains a repeated value.
+     * @return EnumerableGeneration A sequence that contains a repeated value.
      * @package YaLinqo\Generation
      */
     public static function repeat ($element, $count = null)
@@ -261,7 +261,7 @@ 
      * @param string $subject The input string.
      * @param string $pattern The pattern to search for, as a string.
      * @param int $flags flags can be any combination of the following flags: PREG_SPLIT_NO_EMPTY, PREG_SPLIT_DELIM_CAPTURE, PREG_SPLIT_OFFSET_CAPTURE. Default: 0.
-     * @return Enumerable
+     * @return EnumerableGeneration
      * @see preg_split
      * @package YaLinqo\Generation
      */

Spacing +20 added lines, -20 removed lines

@@ -16,11 +16,11 @@ 
      * @return Enumerable Endless list of items repeating the source sequence.
      * @package YaLinqo\Generation
      */
-    public static function cycle ($source)
+    public static function cycle($source)
     {
         $source = self::from($source);
 
-        return new self(function () use ($source) {
+        return new self(function() use ($source) {
             $isEmpty = true;
             while (true) {
                 foreach ($source as $v) {
@@ -39,7 +39,7 @@ 
      * @return Enumerable
      * @package YaLinqo\Generation
      */
-    public static function emptyEnum ()
+    public static function emptyEnum()
     {
         return new self(new \EmptyIterator, false);
     }
@@ -59,7 +59,7 @@ 
      * @return Enumerable
      * @package YaLinqo\Generation
      */
-    public static function from ($source)
+    public static function from($source)
     {
         $it = null;
         if ($source instanceof Enumerable)
@@ -87,12 +87,12 @@ 
      * @return Enumerable
      * @package YaLinqo\Generation
      */
-    public static function generate ($funcValue, $seedValue = null, $funcKey = null, $seedKey = null)
+    public static function generate($funcValue, $seedValue = null, $funcKey = null, $seedKey = null)
     {
         $funcValue = Utils::createLambda($funcValue, 'v,k');
         $funcKey = Utils::createLambda($funcKey, 'v,k', false);
 
-        return new self(function () use ($funcValue, $funcKey, $seedValue, $seedKey) {
+        return new self(function() use ($funcValue, $funcKey, $seedValue, $seedKey) {
             $key = $seedKey === null ? ($funcKey ? $funcKey($seedValue, $seedKey) : 0) : $seedKey;
             $value = $seedValue === null ? $funcValue($seedValue, $seedKey) : $seedValue;
             yield $key => $value;
@@ -114,9 +114,9 @@ 
      * @return Enumerable
      * @package YaLinqo\Generation
      */
-    public static function toInfinity ($start = 0, $step = 1)
+    public static function toInfinity($start = 0, $step = 1)
     {
-        return new self(function () use ($start, $step) {
+        return new self(function() use ($start, $step) {
             $value = $start - $step;
             while (true)
                 yield $value += $step;
@@ -133,9 +133,9 @@ 
      * @see preg_match_all
      * @package YaLinqo\Generation
      */
-    public static function matches ($subject, $pattern, $flags = PREG_SET_ORDER)
+    public static function matches($subject, $pattern, $flags = PREG_SET_ORDER)
     {
-        return new self(function () use ($subject, $pattern, $flags) {
+        return new self(function() use ($subject, $pattern, $flags) {
             preg_match_all($pattern, $subject, $matches, $flags);
             return $matches !== false ? self::from($matches)->getIterator() : self::emptyEnum();
         });
@@ -149,7 +149,7 @@ 
      * @return Enumerable
      * @package YaLinqo\Generation
      */
-    public static function toNegativeInfinity ($start = 0, $step = 1)
+    public static function toNegativeInfinity($start = 0, $step = 1)
     {
         return self::toInfinity($start, -$step);
     }
@@ -161,7 +161,7 @@ 
      * @return Enumerable Observable sequence containing the single specified element.
      * @package YaLinqo\Generation
      */
-    public static function returnEnum ($element)
+    public static function returnEnum($element)
     {
         return self::repeat($element, 1);
     }
@@ -177,11 +177,11 @@ 
      * @return Enumerable A sequence that contains a range of integral numbers.
      * @package YaLinqo\Generation
      */
-    public static function range ($start, $count, $step = 1)
+    public static function range($start, $count, $step = 1)
     {
         if ($count <= 0)
             return self::emptyEnum();
-        return new self(function () use ($start, $count, $step) {
+        return new self(function() use ($start, $count, $step) {
             $value = $start - $step;
             while ($count-- > 0)
                 yield $value += $step;
@@ -199,7 +199,7 @@ 
      * @return Enumerable A sequence that contains a range of integral numbers.
      * @package YaLinqo\Generation
      */
-    public static function rangeDown ($start, $count, $step = 1)
+    public static function rangeDown($start, $count, $step = 1)
     {
         return self::range($start, $count, -$step);
     }
@@ -216,11 +216,11 @@ 
      * @return Enumerable A sequence that contains a range of integral numbers.
      * @package YaLinqo\Generation
      */
-    public static function rangeTo ($start, $end, $step = 1)
+    public static function rangeTo($start, $end, $step = 1)
     {
         if ($step <= 0)
             throw new \InvalidArgumentException(Errors::STEP_NEGATIVE);
-        return new self(function () use ($start, $end, $step) {
+        return new self(function() use ($start, $end, $step) {
             if ($start <= $end) {
                 for ($i = $start; $i < $end; $i += $step)
                     yield $i;
@@ -245,11 +245,11 @@ 
      * @return Enumerable A sequence that contains a repeated value.
      * @package YaLinqo\Generation
      */
-    public static function repeat ($element, $count = null)
+    public static function repeat($element, $count = null)
     {
         if ($count < 0)
             throw new \InvalidArgumentException(Errors::COUNT_LESS_THAN_ZERO);
-        return new self(function () use ($element, $count) {
+        return new self(function() use ($element, $count) {
             for ($i = 0; $i < $count || $count === null; $i++)
                 yield $element;
         });
@@ -265,7 +265,7 @@ 
      * @see preg_split
      * @package YaLinqo\Generation
      */
-    public static function split ($subject, $pattern, $flags = 0)
+    public static function split($subject, $pattern, $flags = 0)
     {
         return new self(
             new \ArrayIterator(preg_split($pattern, $subject, -1, $flags)),

Braces +37 added lines, -28 removed lines

@@ -27,8 +27,9 @@ 
                     yield $v;
                     $isEmpty = false;
                 }
-                if ($isEmpty)
-                    throw new \UnexpectedValueException(Errors::NO_ELEMENTS);
+                if ($isEmpty) {
+                                    throw new \UnexpectedValueException(Errors::NO_ELEMENTS);
+                }
             }
         });
     }
@@ -63,14 +64,15 @@ 
     public static function from ($source)
     {
         $it = null;
-        if ($source instanceof Enumerable)
-            return $source;
-        else if (is_array($source))
-            $it = new \ArrayIterator($source);
-        elseif ($source instanceof \IteratorAggregate)
-            $it = $source->getIterator();
-        elseif ($source instanceof \Traversable)
-            $it = $source;
+        if ($source instanceof Enumerable) {
+                    return $source;
+        } else if (is_array($source)) {
+                    $it = new \ArrayIterator($source);
+        } elseif ($source instanceof \IteratorAggregate) {
+                    $it = $source->getIterator();
+        } elseif ($source instanceof \Traversable) {
+                    $it = $source;
+        }
         if ($it !== null) {
             return new self($it, false);
         }
@@ -119,8 +121,9 @@ 
     {
         return new self(function () use ($start, $step) {
             $value = $start - $step;
-            while (true)
-                yield $value += $step;
+            while (true) {
+                            yield $value += $step;
+            }
         });
     }
 
@@ -180,12 +183,14 @@ 
      */
     public static function range ($start, $count, $step = 1)
     {
-        if ($count <= 0)
-            return self::emptyEnum();
+        if ($count <= 0) {
+                    return self::emptyEnum();
+        }
         return new self(function () use ($start, $count, $step) {
             $value = $start - $step;
-            while ($count-- > 0)
-                yield $value += $step;
+            while ($count-- > 0) {
+                            yield $value += $step;
+            }
         });
     }
 
@@ -219,16 +224,18 @@ 
      */
     public static function rangeTo ($start, $end, $step = 1)
     {
-        if ($step <= 0)
-            throw new \InvalidArgumentException(Errors::STEP_NEGATIVE);
+        if ($step <= 0) {
+                    throw new \InvalidArgumentException(Errors::STEP_NEGATIVE);
+        }
         return new self(function () use ($start, $end, $step) {
             if ($start <= $end) {
-                for ($i = $start; $i < $end; $i += $step)
-                    yield $i;
-            }
-            else {
-                for ($i = $start; $i > $end; $i -= $step)
-                    yield $i;
+                for ($i = $start; $i < $end; $i += $step) {
+                                    yield $i;
+                }
+            } else {
+                for ($i = $start; $i > $end; $i -= $step) {
+                                    yield $i;
+                }
             }
         });
     }
@@ -248,11 +255,13 @@ 
      */
     public static function repeat ($element, $count = null)
     {
-        if ($count < 0)
-            throw new \InvalidArgumentException(Errors::COUNT_LESS_THAN_ZERO);
+        if ($count < 0) {
+                    throw new \InvalidArgumentException(Errors::COUNT_LESS_THAN_ZERO);
+        }
         return new self(function () use ($element, $count) {
-            for ($i = 0; $i < $count || $count === null; $i++)
-                yield $element;
+            for ($i = 0; $i < $count || $count === null; $i++) {
+                            yield $element;
+            }
         });
     }
 

YaLinqo/EnumerablePagination.php

Spacing +24 added lines, -24 removed lines

@@ -17,7 +17,7 @@ 
      * @return mixed The value at the key in the source sequence.
      * @package YaLinqo\Pagination
      */
-    public function elementAt ($key)
+    public function elementAt($key)
     {
         /** @var $it \Iterator|\ArrayAccess */
         $it = $this->getIterator();
@@ -44,7 +44,7 @@ 
      * @return mixed default value if the key is not found in the source sequence; otherwise, the value at the specified key in the source sequence.
      * @package YaLinqo\Pagination
      */
-    public function elementAtOrDefault ($key, $default = null)
+    public function elementAtOrDefault($key, $default = null)
     {
         /** @var $it \Iterator|\ArrayAccess */
         $it = $this->getIterator();
@@ -72,7 +72,7 @@ 
      * @return mixed If predicate is null: the first element in the specified sequence. If predicate is not null: The first element in the sequence that passes the test in the specified predicate function.
      * @package YaLinqo\Pagination
      */
-    public function first ($predicate = null)
+    public function first($predicate = null)
     {
         $predicate = Utils::createLambda($predicate, 'v,k', Functions::$true);
 
@@ -95,7 +95,7 @@ 
      * @return mixed If predicate is null: default value if source is empty; otherwise, the first element in source. If predicate is not null: default value if source is empty or if no element passes the test specified by predicate; otherwise, the first element in source that passes the test specified by predicate.
      * @package YaLinqo\Pagination
      */
-    public function firstOrDefault ($default = null, $predicate = null)
+    public function firstOrDefault($default = null, $predicate = null)
     {
         $predicate = Utils::createLambda($predicate, 'v,k', Functions::$true);
 
@@ -118,7 +118,7 @@ 
      * @return mixed If predicate is null: the result of calling a fallback function if source is empty; otherwise, the first element in source. If predicate is not null: the result of calling a fallback function if source is empty or if no element passes the test specified by predicate; otherwise, the first element in source that passes the test specified by predicate.
      * @package YaLinqo\Pagination
      */
-    public function firstOrFallback ($fallback, $predicate = null)
+    public function firstOrFallback($fallback, $predicate = null)
     {
         $predicate = Utils::createLambda($predicate, 'v,k', Functions::$true);
 
@@ -142,7 +142,7 @@ 
      * @return mixed If predicate is null: the last element in the specified sequence. If predicate is not null: The last element in the sequence that passes the test in the specified predicate function.
      * @package YaLinqo\Pagination
      */
-    public function last ($predicate = null)
+    public function last($predicate = null)
     {
         $predicate = Utils::createLambda($predicate, 'v,k', Functions::$true);
 
@@ -171,7 +171,7 @@ 
      * @return mixed If predicate is null: default value if source is empty; otherwise, the last element in source. If predicate is not null: default value if source is empty or if no element passes the test specified by predicate; otherwise, the last element in source that passes the test specified by predicate.
      * @package YaLinqo\Pagination
      */
-    public function lastOrDefault ($default = null, $predicate = null)
+    public function lastOrDefault($default = null, $predicate = null)
     {
         $predicate = Utils::createLambda($predicate, 'v,k', Functions::$true);
 
@@ -198,7 +198,7 @@ 
      * @return mixed If predicate is null: the result of calling a fallback function if source is empty; otherwise, the last element in source. If predicate is not null: the result of calling a fallback function if source is empty or if no element passes the test specified by predicate; otherwise, the last element in source that passes the test specified by predicate.
      * @package YaLinqo\Pagination
      */
-    public function lastOrFallback ($fallback, $predicate = null)
+    public function lastOrFallback($fallback, $predicate = null)
     {
         $predicate = Utils::createLambda($predicate, 'v,k', Functions::$true);
 
@@ -226,7 +226,7 @@ 
      * @return mixed If predicate is null: the single element of the input sequence. If predicate is not null: The single element of the sequence that passes the test in the specified predicate function.
      * @package YaLinqo\Pagination
      */
-    public function single ($predicate = null)
+    public function single($predicate = null)
     {
         $predicate = Utils::createLambda($predicate, 'v,k', Functions::$true);
 
@@ -258,7 +258,7 @@ 
      * @return mixed If predicate is null: default value if source is empty; otherwise, the single element of the source. If predicate is not null: default value if source is empty or if no element passes the test specified by predicate; otherwise, the single element of the source that passes the test specified by predicate.
      * @package YaLinqo\Pagination
      */
-    public function singleOrDefault ($default = null, $predicate = null)
+    public function singleOrDefault($default = null, $predicate = null)
     {
         $predicate = Utils::createLambda($predicate, 'v,k', Functions::$true);
 
@@ -288,7 +288,7 @@ 
      * @return mixed If predicate is null: the result of calling a fallback function if source is empty; otherwise, the single element of the source. If predicate is not null: the result of calling a fallback function if source is empty or if no element passes the test specified by predicate; otherwise, the single element of the source that passes the test specified by predicate.
      * @package YaLinqo\Pagination
      */
-    public function singleOrFallback ($fallback, $predicate = null)
+    public function singleOrFallback($fallback, $predicate = null)
     {
         $predicate = Utils::createLambda($predicate, 'v,k', Functions::$true);
 
@@ -313,7 +313,7 @@ 
      * @return mixed The key of the first occurrence of value, if found; otherwise, null.
      * @package YaLinqo\Pagination
      */
-    public function indexOf ($value)
+    public function indexOf($value)
     {
         foreach ($this as $k => $v) {
             if ($v === $value)
@@ -330,7 +330,7 @@ 
      * @return mixed The key of the last occurrence of value, if found; otherwise, null.
      * @package YaLinqo\Pagination
      */
-    public function lastIndexOf ($value)
+    public function lastIndexOf($value)
     {
         $key = null;
         foreach ($this as $k => $v) {
@@ -348,7 +348,7 @@ 
      * @return mixed The key of the first occurrence of an element that matches the conditions defined by predicate, if found; otherwise, null.
      * @package YaLinqo\Pagination
      */
-    public function findIndex ($predicate)
+    public function findIndex($predicate)
     {
         $predicate = Utils::createLambda($predicate, 'v,k');
 
@@ -367,7 +367,7 @@ 
      * @return mixed The key of the last occurrence of an element that matches the conditions defined by predicate, if found; otherwise, null.
      * @package YaLinqo\Pagination
      */
-    public function findLastIndex ($predicate)
+    public function findLastIndex($predicate)
     {
         $predicate = Utils::createLambda($predicate, 'v,k');
 
@@ -388,9 +388,9 @@ 
      * @return Enumerable A sequence that contains the elements that occur after the specified index in the input sequence.
      * @package YaLinqo\Pagination
      */
-    public function skip ($count)
+    public function skip($count)
     {
-        return new self(function () use ($count) {
+        return new self(function() use ($count) {
             $it = $this->getIterator();
             $it->rewind();
             for ($i = 0; $i < $count && $it->valid(); ++$i)
@@ -411,11 +411,11 @@ 
      * @return Enumerable A sequence that contains the elements from the input sequence starting at the first element in the linear series that does not pass the test specified by predicate.
      * @package YaLinqo\Pagination
      */
-    public function skipWhile ($predicate)
+    public function skipWhile($predicate)
     {
         $predicate = Utils::createLambda($predicate, 'v,k');
 
-        return new self(function () use ($predicate) {
+        return new self(function() use ($predicate) {
             $yielding = false;
             foreach ($this as $k => $v) {
                 if (!$yielding && !$predicate($v, $k))
@@ -435,12 +435,12 @@ 
      * @return Enumerable A sequence that contains the specified number of elements from the start of the input sequence.
      * @package YaLinqo\Pagination
      */
-    public function take ($count)
+    public function take($count)
     {
         if ($count <= 0)
             return new self(new \EmptyIterator, false);
 
-        return new self(function () use ($count) {
+        return new self(function() use ($count) {
             foreach ($this as $k => $v) {
                 yield $k => $v;
                 if (--$count == 0)
@@ -458,11 +458,11 @@ 
      * @return Enumerable A sequence that contains the elements from the input sequence that occur before the element at which the test no longer passes.
      * @package YaLinqo\Pagination
      */
-    public function takeWhile ($predicate)
+    public function takeWhile($predicate)
     {
         $predicate = Utils::createLambda($predicate, 'v,k');
 
-        return new self(function () use ($predicate) {
+        return new self(function() use ($predicate) {
             foreach ($this as $k => $v) {
                 if (!$predicate($v, $k))
                     break;
@@ -474,5 +474,5 @@ 
     /**
      * @return \Iterator
      */
-    public abstract function getIterator ();
+    public abstract function getIterator();
 }
\ No newline at end of file

Braces +66 added lines, -44 removed lines

@@ -23,14 +23,16 @@ 
         $it = $this->getIterator();
 
         if ($it instanceof \ArrayAccess) {
-            if (!$it->offsetExists($key))
-                throw new \UnexpectedValueException(Errors::NO_KEY);
+            if (!$it->offsetExists($key)) {
+                            throw new \UnexpectedValueException(Errors::NO_KEY);
+            }
             return $it->offsetGet($key);
         }
 
         foreach ($it as $k => $v) {
-            if ($k === $key)
-                return $v;
+            if ($k === $key) {
+                            return $v;
+            }
         }
         throw new \UnexpectedValueException(Errors::NO_KEY);
     }
@@ -49,12 +51,14 @@ 
         /** @var $it \Iterator|\ArrayAccess */
         $it = $this->getIterator();
 
-        if ($it instanceof \ArrayAccess)
-            return $it->offsetExists($key) ? $it->offsetGet($key) : $default;
+        if ($it instanceof \ArrayAccess) {
+                    return $it->offsetExists($key) ? $it->offsetGet($key) : $default;
+        }
 
         foreach ($it as $k => $v) {
-            if ($k === $key)
-                return $v;
+            if ($k === $key) {
+                            return $v;
+            }
         }
         return $default;
     }
@@ -77,8 +81,9 @@ 
         $predicate = Utils::createLambda($predicate, 'v,k', Functions::$true);
 
         foreach ($this as $k => $v) {
-            if ($predicate($v, $k))
-                return $v;
+            if ($predicate($v, $k)) {
+                            return $v;
+            }
         }
         throw new \UnexpectedValueException(Errors::NO_MATCHES);
     }
@@ -100,8 +105,9 @@ 
         $predicate = Utils::createLambda($predicate, 'v,k', Functions::$true);
 
         foreach ($this as $k => $v) {
-            if ($predicate($v, $k))
-                return $v;
+            if ($predicate($v, $k)) {
+                            return $v;
+            }
         }
         return $default;
     }
@@ -123,8 +129,9 @@ 
         $predicate = Utils::createLambda($predicate, 'v,k', Functions::$true);
 
         foreach ($this as $k => $v) {
-            if ($predicate($v, $k))
-                return $v;
+            if ($predicate($v, $k)) {
+                            return $v;
+            }
         }
         return $fallback();
     }
@@ -154,8 +161,9 @@ 
                 $value = $v;
             }
         }
-        if (!$found)
-            throw new \UnexpectedValueException(Errors::NO_MATCHES);
+        if (!$found) {
+                    throw new \UnexpectedValueException(Errors::NO_MATCHES);
+        }
         return $value;
     }
 
@@ -234,14 +242,16 @@ 
         $value = null;
         foreach ($this as $k => $v) {
             if ($predicate($v, $k)) {
-                if ($found)
-                    throw new \UnexpectedValueException(Errors::MANY_MATCHES);
+                if ($found) {
+                                    throw new \UnexpectedValueException(Errors::MANY_MATCHES);
+                }
                 $found = true;
                 $value = $v;
             }
         }
-        if (!$found)
-            throw new \UnexpectedValueException(Errors::NO_MATCHES);
+        if (!$found) {
+                    throw new \UnexpectedValueException(Errors::NO_MATCHES);
+        }
         return $value;
     }
 
@@ -266,8 +276,9 @@ 
         $value = null;
         foreach ($this as $k => $v) {
             if ($predicate($v, $k)) {
-                if ($found)
-                    throw new \UnexpectedValueException(Errors::MANY_MATCHES);
+                if ($found) {
+                                    throw new \UnexpectedValueException(Errors::MANY_MATCHES);
+                }
                 $found = true;
                 $value = $v;
             }
@@ -296,8 +307,9 @@ 
         $value = null;
         foreach ($this as $k => $v) {
             if ($predicate($v, $k)) {
-                if ($found)
-                    throw new \UnexpectedValueException(Errors::MANY_MATCHES);
+                if ($found) {
+                                    throw new \UnexpectedValueException(Errors::MANY_MATCHES);
+                }
                 $found = true;
                 $value = $v;
             }
@@ -316,8 +328,9 @@ 
     public function indexOf ($value)
     {
         foreach ($this as $k => $v) {
-            if ($v === $value)
-                return $k;
+            if ($v === $value) {
+                            return $k;
+            }
         }
         return null; // not -1
     }
@@ -334,8 +347,9 @@ 
     {
         $key = null;
         foreach ($this as $k => $v) {
-            if ($v === $value)
-                $key = $k;
+            if ($v === $value) {
+                            $key = $k;
+            }
         }
         return $key; // not -1
     }
@@ -353,8 +367,9 @@ 
         $predicate = Utils::createLambda($predicate, 'v,k');
 
         foreach ($this as $k => $v) {
-            if ($predicate($v, $k))
-                return $k;
+            if ($predicate($v, $k)) {
+                            return $k;
+            }
         }
         return null; // not -1
     }
@@ -373,8 +388,9 @@ 
 
         $key = null;
         foreach ($this as $k => $v) {
-            if ($predicate($v, $k))
-                $key = $k;
+            if ($predicate($v, $k)) {
+                            $key = $k;
+            }
         }
         return $key; // not -1
     }
@@ -393,8 +409,9 @@ 
         return new self(function () use ($count) {
             $it = $this->getIterator();
             $it->rewind();
-            for ($i = 0; $i < $count && $it->valid(); ++$i)
-                $it->next();
+            for ($i = 0; $i < $count && $it->valid(); ++$i) {
+                            $it->next();
+            }
             while ($it->valid()) {
                 yield $it->key() => $it->current();
                 $it->next();
@@ -418,10 +435,12 @@ 
         return new self(function () use ($predicate) {
             $yielding = false;
             foreach ($this as $k => $v) {
-                if (!$yielding && !$predicate($v, $k))
-                    $yielding = true;
-                if ($yielding)
-                    yield $k => $v;
+                if (!$yielding && !$predicate($v, $k)) {
+                                    $yielding = true;
+                }
+                if ($yielding) {
+                                    yield $k => $v;
+                }
             }
         });
     }
@@ -437,14 +456,16 @@ 
      */
     public function take ($count)
     {
-        if ($count <= 0)
-            return new self(new \EmptyIterator, false);
+        if ($count <= 0) {
+                    return new self(new \EmptyIterator, false);
+        }
 
         return new self(function () use ($count) {
             foreach ($this as $k => $v) {
                 yield $k => $v;
-                if (--$count == 0)
-                    break;
+                if (--$count == 0) {
+                                    break;
+                }
             }
         });
     }
@@ -464,8 +485,9 @@ 
 
         return new self(function () use ($predicate) {
             foreach ($this as $k => $v) {
-                if (!$predicate($v, $k))
-                    break;
+                if (!$predicate($v, $k)) {
+                                    break;
+                }
                 yield $k => $v;
             }
         });

YaLinqo/Utils.php

Spacing +8 added lines, -8 removed lines

@@ -38,11 +38,11 @@ 
      * @codeCoverageIgnore
      * @internal
      */
-    public static function init ()
+    public static function init()
     {
         self::$lambdaCache = [
-            '$v' => [ 'v,k' => Functions::$value ],
-            '$k' => [ 'v,k' => Functions::$key ],
+            '$v' => ['v,k' => Functions::$value],
+            '$k' => ['v,k' => Functions::$key],
         ];
     }
 
@@ -55,7 +55,7 @@ 
      * @throws \InvalidArgumentException Incorrect lambda syntax.
      * @return callable|null
      */
-    public static function createLambda ($closure, $closureArgs, $default = null)
+    public static function createLambda($closure, $closureArgs, $default = null)
     {
         if ($closure === null) {
             if ($default === null)
@@ -80,7 +80,7 @@ 
      * @throws \InvalidArgumentException Incorrect lambda syntax.
      * @throws \InvalidArgumentException Incorrect SORT_ flags.
      */
-    public static function createComparer ($closure, $sortOrder, &$isReversed)
+    public static function createComparer($closure, $sortOrder, &$isReversed)
     {
         if ($closure === null) {
             $isReversed = false;
@@ -116,7 +116,7 @@ 
      * @param int|bool $sortOrder
      * @return callable|string|int|null
      */
-    public static function lambdaToSortFlagsAndOrder ($closure, &$sortOrder)
+    public static function lambdaToSortFlagsAndOrder($closure, &$sortOrder)
     {
         if ($sortOrder !== SORT_ASC && $sortOrder !== SORT_DESC)
             $sortOrder = $sortOrder ? SORT_DESC : SORT_ASC;
@@ -135,7 +135,7 @@ 
      * @throws \InvalidArgumentException Incorrect lambda syntax.
      * @return string|null
      */
-    private static function createLambdaFromString ($closure, $closureArgs)
+    private static function createLambdaFromString($closure, $closureArgs)
     {
         $posDollar = strpos($closure, '$');
         if ($posDollar !== false) {
@@ -147,7 +147,7 @@ 
                 $code = substr($closure, $posArrow + 3);
             }
             else {
-                $args = '$' . str_replace(',', '=null,$', $closureArgs) . '=null';
+                $args = '$'.str_replace(',', '=null,$', $closureArgs).'=null';
                 $code = $closure;
             }
             $code = trim($code, " \r\n\t");

Braces +33 added lines, -26 removed lines

@@ -58,16 +58,20 @@ 
     public static function createLambda ($closure, $closureArgs, $default = null)
     {
         if ($closure === null) {
-            if ($default === null)
-                throw new \InvalidArgumentException(self::ERROR_CLOSURE_NULL);
+            if ($default === null) {
+                            throw new \InvalidArgumentException(self::ERROR_CLOSURE_NULL);
+            }
             return $default;
         }
-        if ($closure instanceof \Closure)
-            return $closure;
-        if (is_string($closure) && ($function = self::createLambdaFromString($closure, $closureArgs)))
-            return $function;
-        if (is_callable($closure))
-            return $closure;
+        if ($closure instanceof \Closure) {
+                    return $closure;
+        }
+        if (is_string($closure) && ($function = self::createLambdaFromString($closure, $closureArgs))) {
+                    return $function;
+        }
+        if (is_callable($closure)) {
+                    return $closure;
+        }
         throw new \InvalidArgumentException(self::ERROR_CLOSURE_NOT_CALLABLE);
     }
 
@@ -85,8 +89,7 @@ 
         if ($closure === null) {
             $isReversed = false;
             return $sortOrder === SORT_DESC ? Functions::$compareStrictReversed : Functions::$compareStrict;
-        }
-        elseif (is_int($closure)) {
+        } elseif (is_int($closure)) {
             switch ($closure) {
                 case SORT_REGULAR:
                     return Functions::$compareStrict;
@@ -118,14 +121,16 @@ 
      */
     public static function lambdaToSortFlagsAndOrder ($closure, &$sortOrder)
     {
-        if ($sortOrder !== SORT_ASC && $sortOrder !== SORT_DESC)
-            $sortOrder = $sortOrder ? SORT_DESC : SORT_ASC;
-        if (is_int($closure))
-            return $closure;
-        elseif (($closure === null || is_string($closure)) && isset(self::$compareFunctionToSortFlags[$closure]))
-            return self::$compareFunctionToSortFlags[$closure];
-        else
-            return null;
+        if ($sortOrder !== SORT_ASC && $sortOrder !== SORT_DESC) {
+                    $sortOrder = $sortOrder ? SORT_DESC : SORT_ASC;
+        }
+        if (is_int($closure)) {
+                    return $closure;
+        } elseif (($closure === null || is_string($closure)) && isset(self::$compareFunctionToSortFlags[$closure])) {
+                    return self::$compareFunctionToSortFlags[$closure];
+        } else {
+                    return null;
+        }
     }
 
     /**
@@ -139,24 +144,26 @@ 
     {
         $posDollar = strpos($closure, '$');
         if ($posDollar !== false) {
-            if (isset(self::$lambdaCache[$closure][$closureArgs]))
-                return self::$lambdaCache[$closure][$closureArgs];
+            if (isset(self::$lambdaCache[$closure][$closureArgs])) {
+                            return self::$lambdaCache[$closure][$closureArgs];
+            }
             $posArrow = strpos($closure, '==>', $posDollar);
             if ($posArrow !== false) {
                 $args = trim(substr($closure, 0, $posArrow), "() \r\n\t");
                 $code = substr($closure, $posArrow + 3);
-            }
-            else {
+            } else {
                 $args = '$' . str_replace(',', '=null,$', $closureArgs) . '=null';
                 $code = $closure;
             }
             $code = trim($code, " \r\n\t");
-            if (strlen($code) > 0 && $code[0] != '{')
-                $code = "return {$code};";
+            if (strlen($code) > 0 && $code[0] != '{') {
+                            $code = "return {$code};";
+            }
             $fun = @create_function($args, $code);
             // @codeCoverageIgnoreStart
-            if (!$fun)
-                throw new \InvalidArgumentException(self::ERROR_CANNOT_PARSE_LAMBDA);
+            if (!$fun) {
+                            throw new \InvalidArgumentException(self::ERROR_CANNOT_PARSE_LAMBDA);
+            }
             // @codeCoverageIgnoreEnd
             self::$lambdaCache[$closure][$closureArgs] = $fun;
             return $fun;