jclaveau / php-chainable-array

src/polyfills.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!function_exists('spl_object_id')) {
+if ( ! function_exists('spl_object_id')) {
     /**
      * @see https://secure.php.net/manual/en/function.spl-object-id.php
      * This method doesn't exist before PHP 7.2.0
@@ -12,7 +12,7 @@ 
     }
 }
 
-if (!function_exists('is_iterable')) {
+if ( ! function_exists('is_iterable')) {
     /**
      * @see https://github.com/symfony/polyfill-php71/commit/36004d119352f4506398032259a08e4ca9607285
      * This method doesn't exist before PHP 7.1.0

src/Arrays/ChainableArray.php

Spacing +7 added lines, -7 removed lines

@@ -27,7 +27,7 @@ 
 
     /**
      */
-    public static function from($data=[], $isConstant=false)
+    public static function from($data = [], $isConstant = false)
     {
         Arrays::mustBeCountable($data);
 
@@ -39,7 +39,7 @@ 
 
     /**
      */
-    public function __construct(array $data=[], $isConstant=false)
+    public function __construct(array $data = [], $isConstant = false)
     {
         $this->data       = $data;
         $this->isConstant = $isConstant;
@@ -83,7 +83,7 @@ 
      *
      * @return ChainableArray $this
      */
-    public function setConstant($state=true)
+    public function setConstant($state = true)
     {
         $this->isConstant = $state;
         return $this;
@@ -162,7 +162,7 @@ 
     /**
      * Checks if an argument is an array or a ChainableArray
      */
-    private function argumentIsArrayOrArrayObject( $argument )
+    private function argumentIsArrayOrArrayObject($argument)
     {
         return is_array($argument)
             || $argument instanceof ChainableArray;
@@ -177,15 +177,15 @@ 
         $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 20);
         $i      = 1;
         $caller = $backtrace[$i];
-        while (     isset($backtrace[$i]['class'])
-                &&  $backtrace[$i]['class'] == __CLASS__ ) {
+        while (isset($backtrace[$i]['class'])
+                &&  $backtrace[$i]['class'] == __CLASS__) {
             $caller = $backtrace[$i];
             $i++;
         }
 
         $exception = new \ErrorException($message);
 
-        $reflectionClass = new \ReflectionClass( get_class($exception) );
+        $reflectionClass = new \ReflectionClass(get_class($exception));
 
         //file
         $reflectionProperty = $reflectionClass->getProperty('file');

Braces +4 added lines, -4 removed lines

@@ -31,8 +31,9 @@ 
     {
         Arrays::mustBeCountable($data);
 
-        if ($data instanceof self)
-            return $data;
+        if ($data instanceof self) {
+                    return $data;
+        }
 
         return new static($data, $isConstant);
     }
@@ -101,8 +102,7 @@ 
     {
         if ($this->isConstant) {
             return new static($out);
-        }
-        else {
+        } else {
             $this->data = $out;
             return $this;
         }

src/Arrays/ChainableArray_NativeFunctions_Trait.php

Indentation +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
                 foreach ($column_names as $column_name) {
                     if (!array_key_exists($column_name, $row)) {
                         self::throwUsageException(
-                             "Trying to extract a column from a row which"
+                                "Trying to extract a column from a row which"
                             ." doesn't contain it : '$column_name' \n"
                             .var_export($row, true)
                         );

Spacing +42 added lines, -42 removed lines

@@ -21,7 +21,7 @@ 
      *                              The current key we be kept if null.
      * @return $this
      */
-    public function columns($column_names, $index_key=null)
+    public function columns($column_names, $index_key = null)
     {
         $out = [];
         foreach ($this->data as $key => &$row) {
@@ -32,7 +32,7 @@ 
             if (is_array($column_names)) {
                 $out[$key] = [];
                 foreach ($column_names as $column_name) {
-                    if (!array_key_exists($column_name, $row)) {
+                    if ( ! array_key_exists($column_name, $row)) {
                         self::throwUsageException(
                              "Trying to extract a column from a row which"
                             ." doesn't contain it : '$column_name' \n"
@@ -60,7 +60,7 @@ 
                     $keys = [];
                 }
 
-                if (!in_array($column_names, $keys)) {
+                if ( ! in_array($column_names, $keys)) {
                     self::throwUsageException('A row have no index to '
                         .'fill the column: '.$column_names."\n"
                         .$key.' => '.var_export($row, true));
@@ -78,7 +78,7 @@ 
      *
      * @deprecated Use columns() instead
      */
-    public function column($column_names, $index_key=null)
+    public function column($column_names, $index_key = null)
     {
         return $this->columns($column_names, $index_key);
     }
@@ -99,7 +99,7 @@ 
      * @param  $default_value To use if the array is empty
      * @return array The min.
      */
-    public function min($default_value=null)
+    public function min($default_value = null)
     {
         if ($this->isEmpty() && $default_value !== null)
             return $default_value;
@@ -122,7 +122,7 @@ 
      * @param  $default_value To use if the array is empty
      * @return array The max.
      */
-    public function max($default_value=null)
+    public function max($default_value = null)
     {
         if ($this->isEmpty() && $default_value !== null)
             return $default_value;
@@ -179,7 +179,7 @@ 
      *
      * @return static $this or a new static.
      */
-    public function filter($callback=null)
+    public function filter($callback = null)
     {
         if ($callback) {
 
@@ -187,7 +187,7 @@ 
                 $callback = new \JClaveau\LogicalFilter\LogicalFilter($callback);
             }
 
-            if (!is_callable($callback)) {
+            if ( ! is_callable($callback)) {
                 $this->throwUsageException(
                     "\$callback must be a logical filter description array or a callable"
                     ." instead of "
@@ -204,8 +204,8 @@ 
             else {
                 $out = $this->data;
                 foreach ($out as $key => $value) {
-                    if (!$callback($value, $key))
-                        unset( $out[$key] );
+                    if ( ! $callback($value, $key))
+                        unset($out[$key]);
                 }
             }
         }
@@ -224,10 +224,10 @@ 
      *
      * @return static $this or a new static.
      */
-    public function filterKey(callable $callback=null)
+    public function filterKey(callable $callback = null)
     {
         throw new \ErrorException('This method is replaced by '
-            . __TRAIT__ . '::filtr()');
+            . __TRAIT__.'::filtr()');
     }
 
     /**
@@ -258,7 +258,7 @@ 
      */
     public function intersectKey($intersect_with)
     {
-        if (!$this->argumentIsArrayOrArrayObject($intersect_with))
+        if ( ! $this->argumentIsArrayOrArrayObject($intersect_with))
             self::throwUsageException("First argument must be an array or a ".static::class.".");
 
         if ($intersect_with instanceof static)
@@ -298,7 +298,7 @@ 
     public function unshift()
     {
         $data = $this->data;
-        $arguments = Arrays::merge( [&$data], func_get_args() );
+        $arguments = Arrays::merge([&$data], func_get_args());
 
         call_user_func_array('array_unshift', $arguments);
         return $this->returnConstant($data);
@@ -312,7 +312,7 @@ 
     public function push()
     {
         $data = $this->data;
-        $arguments = Arrays::merge( [&$data], func_get_args() );
+        $arguments = Arrays::merge([&$data], func_get_args());
 
         call_user_func_array('array_push', $arguments);
         return $this->returnConstant($data);
@@ -323,7 +323,7 @@ 
      *
      * @return static $this or a new static.
      */
-    public function unique($flags=SORT_STRING)
+    public function unique($flags = SORT_STRING)
     {
         $out = array_unique($this->data, $flags);
         return $this->returnConstant($out);
@@ -349,9 +349,9 @@ 
      *
      * @return static $this or a new static.
      */
-    public function diff($compare_with, $check_keys=false, $strict_comparison=false)
+    public function diff($compare_with, $check_keys = false, $strict_comparison = false)
     {
-        if (!$this->argumentIsArrayOrArrayObject($compare_with))
+        if ( ! $this->argumentIsArrayOrArrayObject($compare_with))
             self::throwUsageException("First argument must be an iterable");
 
         $kept_values = $this->data;
@@ -364,14 +364,14 @@ 
                 if ($check_keys) {
 
                     if ($strict_comparison) {
-                        if (    $kept_key   === $compared_key
-                            &&  $kept_value === $compared_value ) {
+                        if ($kept_key === $compared_key
+                            &&  $kept_value === $compared_value) {
                             $is_equal = true;
                         }
                     }
                     else {
-                        if (    $kept_key   == $compared_key
-                            &&  $kept_value == $compared_value ) {
+                        if ($kept_key == $compared_key
+                            &&  $kept_value == $compared_value) {
                             $is_equal = true;
                         }
                     }
@@ -391,7 +391,7 @@ 
 
                 if ($is_equal) {
                     // Debug::dumpJson($kept_key, !true);
-                    unset($kept_values[ $kept_key ]);
+                    unset($kept_values[$kept_key]);
                     break;
                 }
             }
@@ -421,7 +421,7 @@ 
      */
     public function fillKeys($keys, $value)
     {
-        if (!$this->argumentIsArrayOrArrayObject($keys))
+        if ( ! $this->argumentIsArrayOrArrayObject($keys))
             self::throwUsageException("First argument must be an array or a ".static::class.".");
 
         if ($keys instanceof static)
@@ -438,7 +438,7 @@ 
      *
      * @return static The filled array.
      */
-    public function fill($start, $number, $value, $interval=1)
+    public function fill($start, $number, $value, $interval = 1)
     {
         $out = [];
         while ($number >= 0) {
@@ -468,8 +468,8 @@ 
         $zero_key,
         $end_key,
         callable $step_generator,
-        $max_interations_count=1000
-    ){
+        $max_interations_count = 1000
+    ) {
         if ($max_interations_count < 0)
             throw new \InvalidArgumentException("$maximum_interations_count must be positive");
 
@@ -479,17 +479,17 @@ 
         $iterations_count    = 0;
 
         while ($iterations_count <= $max_interations_count) {
-            $current_step_value = call_user_func_array( $step_generator, [
-                &$current_step_key,   // param by reference
+            $current_step_value = call_user_func_array($step_generator, [
+                &$current_step_key, // param by reference
                 $previous_step_value,
-                $current_step_key,   // not passed by ref
+                $current_step_key, // not passed by ref
                 $out
             ]);
 
             if ($current_step_key === null) {
                 $out[] = $current_step_value;
             }
-            elseif (!is_int($current_step_key)) {
+            elseif ( ! is_int($current_step_key)) {
                 // Set the local as en_US tu have floats formatted with
                 // "." as separator
                 // TODO : could it be useful for dates to?
@@ -527,7 +527,7 @@ 
      *
      * @return array The keys.
      */
-    public function keys($search_value=null, $strict=false)
+    public function keys($search_value = null, $strict = false)
     {
         if ($search_value)
             return array_keys($this->data, $search_value, $strict);
@@ -559,7 +559,7 @@ 
      *
      * @return string The array written in PHP code.
      */
-    public function export($return=true)
+    public function export($return = true)
     {
         return var_export($this->data, $return);
     }
@@ -572,9 +572,9 @@ 
      * @param  bool $return Should we print it or return it?
      * @return string The printed array
      */
-    public function print_($return=false)
+    public function print_($return = false)
     {
-        if (!$return) {
+        if ( ! $return) {
 
             echo '<pre>';
             print_r($this->data);
@@ -634,7 +634,7 @@ 
      *
      * @see http://php.net/manual/fr/function.prev.php
      */
-    public function usort(callable $callback=null)
+    public function usort(callable $callback = null)
     {
         $data = $this->data;
 
@@ -647,9 +647,9 @@ 
             };
         }
 
-        $arguments = Arrays::merge( [&$data], [$callback] );
+        $arguments = Arrays::merge([&$data], [$callback]);
 
-        if ( ! call_user_func_array('uasort', $arguments) )
+        if ( ! call_user_func_array('uasort', $arguments))
             throw new \ErrorException('Unable to apply usort');
 
         return $this->returnConstant($data);
@@ -660,7 +660,7 @@ 
      *
      * @see http://php.net/manual/fr/function.uksort.php
      */
-    public function uksort(callable $callback=null)
+    public function uksort(callable $callback = null)
     {
         $data = $this->data;
 
@@ -670,9 +670,9 @@ 
             };
         }
 
-        $arguments = Arrays::merge( [&$data], [$callback] );
+        $arguments = Arrays::merge([&$data], [$callback]);
 
-        if ( ! call_user_func_array('uksort', $arguments) )
+        if ( ! call_user_func_array('uksort', $arguments))
             throw new \ErrorException('Unable to apply uksort');
 
         return $this->returnConstant($data);
@@ -686,7 +686,7 @@ 
      */
     public function intersect($intersect_with)
     {
-        if (!$this->argumentIsArrayOrArrayObject($intersect_with)) {
+        if ( ! $this->argumentIsArrayOrArrayObject($intersect_with)) {
             $this->throwUsageException("First argument must be an array or a ".static::class.".");
         }
 

Braces +67 added lines, -64 removed lines

@@ -26,8 +26,9 @@ 
         $out = [];
         foreach ($this->data as $key => &$row) {
 
-            if ($index_key)
-                $key = $row[$index_key];
+            if ($index_key) {
+                            $key = $row[$index_key];
+            }
 
             if (is_array($column_names)) {
                 $out[$key] = [];
@@ -42,20 +43,16 @@ 
 
                     $out[$key][$column_name] = $row[$column_name];
                 }
-            }
-            else {
+            } else {
                 // This avoids issues with isset, array_key_exists and
                 // null entries on objects and arrays.
                 if ($row instanceof static) {
                     $keys = $row->copy()->keys();
-                }
-                elseif (is_array($row)) {
+                } elseif (is_array($row)) {
                     $keys = array_keys($row);
-                }
-                elseif (is_scalar($row)) {
+                } elseif (is_scalar($row)) {
                     $keys = [];
-                }
-                else {
+                } else {
                     // todo : handle other classes supporting ArrayAccess?
                     $keys = [];
                 }
@@ -101,16 +98,17 @@ 
      */
     public function min($default_value=null)
     {
-        if ($this->isEmpty() && $default_value !== null)
-            return $default_value;
+        if ($this->isEmpty() && $default_value !== null) {
+                    return $default_value;
+        }
 
         try {
             return min($this->data);
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             $message = $e->getMessage();
-            if ($e->getMessage() == 'min(): Array must contain at least one element')
-                $message .= ' or you can set a default value as parameter';
+            if ($e->getMessage() == 'min(): Array must contain at least one element') {
+                            $message .= ' or you can set a default value as parameter';
+            }
 
             $this->throwUsageException($message);
         }
@@ -124,16 +122,17 @@ 
      */
     public function max($default_value=null)
     {
-        if ($this->isEmpty() && $default_value !== null)
-            return $default_value;
+        if ($this->isEmpty() && $default_value !== null) {
+                    return $default_value;
+        }
 
         try {
             return max($this->data);
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             $message = $e->getMessage();
-            if ($e->getMessage() == 'max(): Array must contain at least one element')
-                $message .= ' or you can set a default value as parameter';
+            if ($e->getMessage() == 'max(): Array must contain at least one element') {
+                            $message .= ' or you can set a default value as parameter';
+            }
 
             $this->throwUsageException($message);
         }
@@ -200,16 +199,15 @@ 
             if (PHP_VERSION_ID >= 50600) {
                 $out = array_filter($this->data, $callback,
                     ARRAY_FILTER_USE_BOTH);
-            }
-            else {
+            } else {
                 $out = $this->data;
                 foreach ($out as $key => $value) {
-                    if (!$callback($value, $key))
-                        unset( $out[$key] );
+                    if (!$callback($value, $key)) {
+                                            unset( $out[$key] );
+                    }
                 }
             }
-        }
-        else {
+        } else {
             $out = array_filter($this->data);
         }
 
@@ -242,8 +240,9 @@ 
         $out = [];
         foreach ($this->data as $i => $data_item) {
 
-            if ($data_item == $item_to_remove)
-                continue;
+            if ($data_item == $item_to_remove) {
+                            continue;
+            }
 
             $out[$i] = $data_item;
         }
@@ -258,11 +257,13 @@ 
      */
     public function intersectKey($intersect_with)
     {
-        if (!$this->argumentIsArrayOrArrayObject($intersect_with))
-            self::throwUsageException("First argument must be an array or a ".static::class.".");
+        if (!$this->argumentIsArrayOrArrayObject($intersect_with)) {
+                    self::throwUsageException("First argument must be an array or a ".static::class.".");
+        }
 
-        if ($intersect_with instanceof static)
-            $intersect_with = $intersect_with->getArray();
+        if ($intersect_with instanceof static) {
+                    $intersect_with = $intersect_with->getArray();
+        }
 
         $out = array_intersect_key($this->data, $intersect_with);
 
@@ -351,8 +352,9 @@ 
      */
     public function diff($compare_with, $check_keys=false, $strict_comparison=false)
     {
-        if (!$this->argumentIsArrayOrArrayObject($compare_with))
-            self::throwUsageException("First argument must be an iterable");
+        if (!$this->argumentIsArrayOrArrayObject($compare_with)) {
+                    self::throwUsageException("First argument must be an iterable");
+        }
 
         $kept_values = $this->data;
 
@@ -368,21 +370,18 @@ 
                             &&  $kept_value === $compared_value ) {
                             $is_equal = true;
                         }
-                    }
-                    else {
+                    } else {
                         if (    $kept_key   == $compared_key
                             &&  $kept_value == $compared_value ) {
                             $is_equal = true;
                         }
                     }
-                }
-                else {
+                } else {
                     if ($strict_comparison) {
                         if ($kept_value === $compared_value) {
                             $is_equal = true;
                         }
-                    }
-                    else {
+                    } else {
                         if ($kept_value == $compared_value) {
                             $is_equal = true;
                         }
@@ -421,11 +420,13 @@ 
      */
     public function fillKeys($keys, $value)
     {
-        if (!$this->argumentIsArrayOrArrayObject($keys))
-            self::throwUsageException("First argument must be an array or a ".static::class.".");
+        if (!$this->argumentIsArrayOrArrayObject($keys)) {
+                    self::throwUsageException("First argument must be an array or a ".static::class.".");
+        }
 
-        if ($keys instanceof static)
-            $keys = $keys->getArray();
+        if ($keys instanceof static) {
+                    $keys = $keys->getArray();
+        }
 
         $out = array_fill_keys($keys, $value);
         return $this->returnConstant($out);
@@ -470,8 +471,9 @@ 
         callable $step_generator,
         $max_interations_count=1000
     ){
-        if ($max_interations_count < 0)
-            throw new \InvalidArgumentException("$maximum_interations_count must be positive");
+        if ($max_interations_count < 0) {
+                    throw new \InvalidArgumentException("$maximum_interations_count must be positive");
+        }
 
         $out                 = [];
         $previous_step_value = null;
@@ -488,16 +490,14 @@ 
 
             if ($current_step_key === null) {
                 $out[] = $current_step_value;
-            }
-            elseif (!is_int($current_step_key)) {
+            } elseif (!is_int($current_step_key)) {
                 // Set the local as en_US tu have floats formatted with
                 // "." as separator
                 // TODO : could it be useful for dates to?
                 $current_locale = setlocale(LC_NUMERIC, 'en_US');
                 $out[(string) $current_step_key] = $current_step_value;
                 setlocale(LC_NUMERIC, $current_locale);
-            }
-            else {
+            } else {
                 $out[$current_step_key] = $current_step_value;
             }
 
@@ -508,8 +508,7 @@ 
                 if ((string) $current_step_key == (string) $end_key) {
                     break;
                 }
-            }
-            elseif ($current_step_key == $end_key) {
+            } elseif ($current_step_key == $end_key) {
                 break;
             }
 
@@ -529,10 +528,11 @@ 
      */
     public function keys($search_value=null, $strict=false)
     {
-        if ($search_value)
-            return array_keys($this->data, $search_value, $strict);
-        else
-            return array_keys($this->data);
+        if ($search_value) {
+                    return array_keys($this->data, $search_value, $strict);
+        } else {
+                    return array_keys($this->data);
+        }
     }
 
     /**
@@ -640,8 +640,9 @@ 
 
         if ($callback === null) {
             $callback = function($a, $b) {
-                if ($a == $b)
-                    return 0;
+                if ($a == $b) {
+                                    return 0;
+                }
 
                 return $a > $b ? -1 : 1;
             };
@@ -649,8 +650,9 @@ 
 
         $arguments = Arrays::merge( [&$data], [$callback] );
 
-        if ( ! call_user_func_array('uasort', $arguments) )
-            throw new \ErrorException('Unable to apply usort');
+        if ( ! call_user_func_array('uasort', $arguments) ) {
+                    throw new \ErrorException('Unable to apply usort');
+        }
 
         return $this->returnConstant($data);
     }
@@ -672,8 +674,9 @@ 
 
         $arguments = Arrays::merge( [&$data], [$callback] );
 
-        if ( ! call_user_func_array('uksort', $arguments) )
-            throw new \ErrorException('Unable to apply uksort');
+        if ( ! call_user_func_array('uksort', $arguments) ) {
+                    throw new \ErrorException('Unable to apply uksort');
+        }
 
         return $this->returnConstant($data);
     }

src/Arrays/ChainableArray_ArrayAccess_Trait.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
             // The true location of the throw is still available through
             // $e->getTrace()
             $trace_location  = $e->getTrace()[1];
-            $reflectionClass = new \ReflectionClass( get_class($e) );
+            $reflectionClass = new \ReflectionClass(get_class($e));
 
             //file
             if (isset($trace_location['file'])) {

Braces +8 added lines, -10 removed lines

@@ -18,8 +18,7 @@ 
     {
         if (is_null($offset)) {
             $this->data[] = $value;
-        }
-        else {
+        } else {
             $this->data[$offset] = $value;
         }
     }
@@ -31,8 +30,7 @@ 
     {
         try {
             return isset($this->data[$offset]);
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             if (property_exists($this, 'defaultRowGenerator')) {
                 return true;
             }
@@ -77,8 +75,7 @@ 
             // support but wouldn't throw exception if it doesn't exist
             $returnValue = &$this->data[$offset];
             return $returnValue;
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             // here we simply move the Exception location at the one
             // of the caller as the isset() method is called at its
             // location.
@@ -158,10 +155,11 @@ 
      */
     protected function generateDefaultRow($offset)
     {
-        if (property_exists($this, 'defaultRow'))
-            return $this->defaultRow;
-        elseif (property_exists($this, 'defaultRowGenerator'))
-            return call_user_func($this->defaultRowGenerator, $offset);
+        if (property_exists($this, 'defaultRow')) {
+                    return $this->defaultRow;
+        } elseif (property_exists($this, 'defaultRowGenerator')) {
+                    return call_user_func($this->defaultRowGenerator, $offset);
+        }
     }
 
     /**/

src/Arrays/ChainableArray_Wip_Trait.php

Indentation +4 added lines, -4 removed lines

@@ -60,7 +60,7 @@ 
             },
             formatted_values: [ ]
         }
-        *
+     *
         =>
      *  action_calculate_paid_impressions: {
             values: [ ],
@@ -69,9 +69,9 @@ 
             },
             formatted_values: [ ]
         }
-        *
-        *
-        *data: [
+     *
+     *
+     *data: [
             {
             paidImpressions: {
                 value: 246367,

Spacing +40 added lines, -40 removed lines

@@ -91,7 +91,7 @@ 
     {
         $column_name = $key_column_names->shift();
 
-        if (!$column_name)
+        if ( ! $column_name)
             return $rows;
 
         // $out = new static;
@@ -212,85 +212,85 @@ 
             '3rd'
         ]);
 
-        $expected = array (
-            0 => array (
+        $expected = array(
+            0 => array(
                 'a3' => 1,
                 'b3' => 1,
                 '3rd' => 'a2',
                 '2nd' => 'a1',
                 '1st' => 'a',
             ),
-            1 => array (
+            1 => array(
                 'a3' => 1,
                 'b3' => 1,
                 '3rd' => 'b2',
                 '2nd' => 'a1',
                 '1st' => 'a',
             ),
-            2 => array (
+            2 => array(
                 'a3' => 1,
                 'b3' => 1,
                 '3rd' => 'c2',
                 '2nd' => 'a1',
                 '1st' => 'a',
             ),
-            3 => array (
+            3 => array(
                 'a3' => 1,
                 'b3' => 1,
                 '3rd' => 'a2',
                 '2nd' => 'b1',
                 '1st' => 'a',
             ),
-            4 => array (
+            4 => array(
                 'a3' => 1,
                 'b3' => 1,
                 '3rd' => 'b2',
                 '2nd' => 'b1',
                 '1st' => 'a',
             ),
-            5 => array (
+            5 => array(
                 'a3' => 1,
                 'b3' => 1,
                 '3rd' => 'c2',
                 '2nd' => 'b1',
                 '1st' => 'a',
             ),
-            6 => array (
+            6 => array(
                 'a3' => 1,
                 'b3' => 1,
                 '3rd' => 'a2',
                 '2nd' => 'a1',
                 '1st' => 'b',
             ),
-            7 => array (
+            7 => array(
                 'a3' => 1,
                 'b3' => 1,
                 '3rd' => 'b2',
                 '2nd' => 'a1',
                 '1st' => 'b',
             ),
-            8 => array (
+            8 => array(
                 'a3' => 1,
                 'b3' => 1,
                 '3rd' => 'c2',
                 '2nd' => 'a1',
                 '1st' => 'b',
             ),
-            9 => array (
+            9 => array(
                 'a3' => 1,
                 'b3' => 1,
                 '3rd' => 'a2',
                 '2nd' => 'b1',
                 '1st' => 'b',
             ),
-            10 => array (
+            10 => array(
                 'a3' => 1,
                 'b3' => 1,
                 '3rd' => 'b2',
                 '2nd' => 'b1',
                 '1st' => 'b',
             ),
-            11 => array (
+            11 => array(
                 'a3' => 1,
                 'b3' => 1,
                 '3rd' => 'c2',
@@ -327,19 +327,19 @@ 
      */
     private function piramidize_aux($key_column_names, $rows)
     {
-        if (!is_array($rows))
+        if ( ! is_array($rows))
             return $rows;
 
         $column_name = $key_column_names->shift();
 
-        if (!$column_name)
+        if ( ! $column_name)
             return $rows;
 
         // $out = new static;
         $out = [];
         foreach ($rows as $key => $row) {
 
-            if (!isset($row[$column_name])) {
+            if ( ! isset($row[$column_name])) {
                 throw new \ErrorException("No value found for column"
                     ." name '$column_name' in the row: ".var_export($row, true));
             }
@@ -348,7 +348,7 @@ 
             unset($row[$column_name]);
 
             if ($key_column_names->count()) {
-                if (!isset($out[$key]))
+                if ( ! isset($out[$key]))
                     $out[$key] = [];
 
                 $out[$key][] = $row;
@@ -456,68 +456,68 @@ 
             '1st',
         ]);
 
-        $expected = array (
-            'a2' => array (
-                'a1' => array (
-                    'a' => array (
+        $expected = array(
+            'a2' => array(
+                'a1' => array(
+                    'a' => array(
                         'a3' => 1,
                         'b3' => 1,
                     ),
-                    'b' => array (
+                    'b' => array(
                         'a3' => 1,
                         'b3' => 1,
                     ),
                 ),
-                'b1' => array (
-                    'a' => array (
+                'b1' => array(
+                    'a' => array(
                         'a3' => 1,
                         'b3' => 1,
                     ),
-                    'b' => array (
+                    'b' => array(
                         'a3' => 1,
                         'b3' => 1,
                     ),
                 ),
             ),
-            'b2' => array (
-                'a1' => array (
-                    'a' => array (
+            'b2' => array(
+                'a1' => array(
+                    'a' => array(
                         'a3' => 2,
                         'b3' => 2,
                     ),
-                    'b' => array (
+                    'b' => array(
                         'a3' => 2,
                         'b3' => 2,
                     ),
                 ),
-                'b1' => array (
-                    'a' => array (
+                'b1' => array(
+                    'a' => array(
                         'a3' => 2,
                         'b3' => 2,
                     ),
-                    'b' => array (
+                    'b' => array(
                         'a3' => 2,
                         'b3' => 2,
                     ),
                 ),
             ),
-            'c2' => array (
-                'a1' => array (
-                    'a' => array (
+            'c2' => array(
+                'a1' => array(
+                    'a' => array(
                         'a3' => 3,
                         'b3' => 3,
                     ),
-                    'b' => array (
+                    'b' => array(
                         'a3' => 3,
                         'b3' => 3,
                     ),
                 ),
-                'b1' => array (
-                    'a' => array (
+                'b1' => array(
+                    'a' => array(
                         'a3' => 3,
                         'b3' => 3,
                     ),
-                    'b' => array (
+                    'b' => array(
                         'a3' => 3,
                         'b3' => 3,
                     ),

Braces +28 added lines, -24 removed lines

@@ -91,8 +91,9 @@ 
     {
         $column_name = $key_column_names->shift();
 
-        if (!$column_name)
-            return $rows;
+        if (!$column_name) {
+                    return $rows;
+        }
 
         // $out = new static;
         $out = [];
@@ -107,10 +108,10 @@ 
 
                 foreach ($sub_rows as $row) {
                     try {
-                        if (is_array($row))
-                            $row[$column_name] = $key;
-                    }
-                    catch (\Exception $e) {
+                        if (is_array($row)) {
+                                                    $row[$column_name] = $key;
+                        }
+                    } catch (\Exception $e) {
                         echo json_encode($column_name);
                         echo json_encode($key);
                         echo json_encode($e);
@@ -118,13 +119,12 @@ 
                     }
                     $out[] = $row;
                 }
-            }
-            else {
+            } else {
                 try {
-                    if (is_array($sub_rows))
-                        $sub_rows[$column_name] = $key;
-                }
-                catch (\Exception $e) {
+                    if (is_array($sub_rows)) {
+                                            $sub_rows[$column_name] = $key;
+                    }
+                } catch (\Exception $e) {
                     echo json_encode($sub_rows);
                     echo json_encode($column_name);
                     echo json_encode($key);
@@ -299,8 +299,9 @@ 
             ),
         );
 
-        if ($expected != $tableized->getArray())
-            throw new \Exception("test failed");
+        if ($expected != $tableized->getArray()) {
+                    throw new \Exception("test failed");
+        }
 
         echo 'Helper_Tabe->tableize tested successfully';
     }
@@ -327,13 +328,15 @@ 
      */
     private function piramidize_aux($key_column_names, $rows)
     {
-        if (!is_array($rows))
-            return $rows;
+        if (!is_array($rows)) {
+                    return $rows;
+        }
 
         $column_name = $key_column_names->shift();
 
-        if (!$column_name)
-            return $rows;
+        if (!$column_name) {
+                    return $rows;
+        }
 
         // $out = new static;
         $out = [];
@@ -348,12 +351,12 @@ 
             unset($row[$column_name]);
 
             if ($key_column_names->count()) {
-                if (!isset($out[$key]))
-                    $out[$key] = [];
+                if (!isset($out[$key])) {
+                                    $out[$key] = [];
+                }
 
                 $out[$key][] = $row;
-            }
-            else {
+            } else {
                 $out[$key] = $row;
             }
         }
@@ -529,8 +532,9 @@ 
         // echo var_export($values->getArray());
         // $values->dumpJson(true);
 
-        if ($expected != $values->getArray())
-            throw new \Exception("test failed");
+        if ($expected != $values->getArray()) {
+                    throw new \Exception("test failed");
+        }
 
         echo 'Helper_Tabe->piramidize tested successfully';
     }

src/Arrays/ChainableArray_Utils_Trait.php

Indentation +1 added lines, -1 removed lines

@@ -553,7 +553,7 @@
             foreach ($rowIdParts as $name => $value) {
                 if (isset($data[$name]) && $data[$name] !== $value) {
                     self::throwUsageException(
-                         "Trying to populate a column '$name' that "
+                            "Trying to populate a column '$name' that "
                         ."already exists with a different value "
                         .var_export($data[$name], true). " => '$value'"
                     );

Spacing +48 added lines, -48 removed lines

@@ -18,7 +18,7 @@ 
      *
      * @return array The array containing the grouped rows.
      */
-    public function groupBy( callable $indexGenerator, callable $conflictResolver=null )
+    public function groupBy(callable $indexGenerator, callable $conflictResolver = null)
     {
         // todo : this doesn't work
         // return $this->groupByTransformed($indexGenerator, null, $conflictResolver);
@@ -26,15 +26,15 @@ 
         $out = [];
         foreach ($this->data as $key => $row) {
 
-            if (!$row)
+            if ( ! $row)
                 continue;
 
             $newIndexes     = call_user_func($indexGenerator, $key, $row);
-            if (!is_array($newIndexes))
+            if ( ! is_array($newIndexes))
                 $newIndexes = [$newIndexes];
 
             foreach ($newIndexes as $newIndex) {
-                if (!isset($out[$newIndex])) {
+                if ( ! isset($out[$newIndex])) {
                     $out[$newIndex] = $row;
                 }
                 else {
@@ -69,26 +69,26 @@ 
      *
      * @return array The array containing the grouped rows.
      */
-    public function groupInArrays( callable $indexGenerator )
+    public function groupInArrays(callable $indexGenerator)
     {
         $out = [];
         foreach ($this->data as $key => $row) {
 
-            if (!$row)
+            if ( ! $row)
                 continue;
 
             $new_keys = call_user_func($indexGenerator, $row, $key);
-            if (!is_array($new_keys))
+            if ( ! is_array($new_keys))
                 $new_keys = [$new_keys];
 
             foreach ($new_keys as $new_key) {
-                if (!isset($out[ $new_key ])) {
-                    $out[ $new_key ] = [
+                if ( ! isset($out[$new_key])) {
+                    $out[$new_key] = [
                         $key => $row
                     ];
                 }
                 else {
-                    $out[ $new_key ][ $key ] = $row;
+                    $out[$new_key][$key] = $row;
                 }
             }
         }
@@ -112,7 +112,7 @@ 
      */
     public function groupByTransformed(
         callable $indexGenerator,
-        callable $rowTransformer,      // todo check this behavior
+        callable $rowTransformer, // todo check this behavior
         callable $conflictResolver )
     {
         // The goal here is to remove the second parameter has it makes the
@@ -125,7 +125,7 @@ 
         $out = [];
         foreach ($this->data as $key => $row) {
 
-            if (!$row)
+            if ( ! $row)
                 continue;
 
             $newIndex       = call_user_func($indexGenerator, $key, $row);
@@ -134,7 +134,7 @@ 
                             ? call_user_func($rowTransformer, $row)
                             : $row;
 
-            if (!isset($out[$newIndex])) {
+            if ( ! isset($out[$newIndex])) {
                 $out[$newIndex] = $transformedRow;
             }
             else {
@@ -159,12 +159,12 @@ 
      *                                       rows have the same index.
      * @return static
      */
-    public function mergeWith( $otherTable, callable $conflictResolver=null )
+    public function mergeWith($otherTable, callable $conflictResolver = null)
     {
         if (is_array($otherTable))
             $otherTable = new static($otherTable);
 
-        if (!$otherTable instanceof static) {
+        if ( ! $otherTable instanceof static) {
             self::throwUsageException(
                 '$otherTable must be an array or an instance of '.static::class.' instead of: '
                 .var_export($otherTable, true)
@@ -174,14 +174,14 @@ 
         $out = $this->data;
         foreach ($otherTable->getArray() as $key => $row) {
 
-            if (!isset($out[$key])) {
+            if ( ! isset($out[$key])) {
                 $out[$key] = $row;
             }
             else {
                 if ($conflictResolver === null) {
                     self::throwUsageException(
                         "No conflict resolver for a merge provoking one: $key \n\n"
-                        .var_export($row, true) . "\n\n"
+                        .var_export($row, true)."\n\n"
                         .var_export($out[$key], true)
                     );
                 }
@@ -207,7 +207,7 @@ 
      * (same as self::mergeWith with the other table as $this)
      * @return static
      */
-    public function mergeIn( $otherTable, callable $conflictResolver=null )
+    public function mergeIn($otherTable, callable $conflictResolver = null)
     {
         $otherTable->mergeWith($this, $conflictResolver);
         return $this;
@@ -233,7 +233,7 @@ 
      */
     public function each(callable $rowTransformer)
     {
-        $out  = [];
+        $out = [];
         foreach ($this->data as $key => $row) {
             $out[$key] = call_user_func_array(
                 $rowTransformer,
@@ -263,7 +263,7 @@ 
      */
     public function renameColumns(array $old_to_new_names)
     {
-        $out  = [];
+        $out = [];
         foreach ($this->data as $key => $row) {
             try {
                 foreach ($old_to_new_names as $old_name => $new_name) {
@@ -272,7 +272,7 @@ 
                 }
             }
             catch (\Exception $e) {
-                self::throwUsageException( $e->getMessage() );
+                self::throwUsageException($e->getMessage());
             }
 
             $out[$key] = $row;
@@ -324,20 +324,20 @@ 
      *                            nor a static.
      * @return static       $this
      */
-    public function append($new_rows, callable $conflict_resolver=null)
+    public function append($new_rows, callable $conflict_resolver = null)
     {
         if ($new_rows instanceof static)
             $new_rows = $new_rows->getArray();
 
-        if (!is_array($new_rows)) {
+        if ( ! is_array($new_rows)) {
             $this->throwUsageException(
-                "\$new_rows parameter must be an array or an instance of " . __CLASS__
+                "\$new_rows parameter must be an array or an instance of ".__CLASS__
             );
         }
 
-        if (!$conflict_resolver) {
+        if ( ! $conflict_resolver) {
             // default conflict resolver: append with numeric key
-            $conflict_resolver = function (&$data, $existing_row, $confliuct_row, $key) {
+            $conflict_resolver = function(&$data, $existing_row, $confliuct_row, $key) {
                 $data[] = $confliuct_row;
             };
         }
@@ -369,7 +369,7 @@ 
      *
      * @return static
      */
-    public function dimensionsAsColumns(array $columnNames, array $options=null)
+    public function dimensionsAsColumns(array $columnNames, array $options = null)
     {
         $out = $this->dimensionsAsColumns_recurser($this->data, $columnNames);
         return $this->returnConstant($out);
@@ -406,12 +406,12 @@ 
      *      ],
      * ]
      */
-    protected function dimensionsAsColumns_recurser(array $data, $columnNames, $rowIdParts=[])
+    protected function dimensionsAsColumns_recurser(array $data, $columnNames, $rowIdParts = [])
     {
         $out = [];
         // if (!$columnNames)
             // return $data;
-        $no_more_column = !(bool) $columnNames;
+        $no_more_column = ! (bool) $columnNames;
 
         // If all the names have been given to the dimensions
         // we compile the index key of the row at the current level
@@ -435,7 +435,7 @@ 
                     self::throwUsageException(
                          "Trying to populate a column '$name' that "
                         ."already exists with a different value "
-                        .var_export($data[$name], true). " => '$value'"
+                        .var_export($data[$name], true)." => '$value'"
                     );
                 }
                 $data[$name] = $value;
@@ -466,7 +466,7 @@ 
             }
             else {
 
-                if (!isset($rows)) {
+                if ( ! isset($rows)) {
                     echo json_encode([
                         '$rowIdParts' => $rowIdParts,
                         '$row' => $row,
@@ -494,9 +494,9 @@ 
     /**
      * Returns the first element of the array
      */
-    public function first($strict=false)
+    public function first($strict = false)
     {
-        if (!$this->count()) {
+        if ( ! $this->count()) {
             if ($strict)
                 throw new \ErrorException("No first element found in this array");
             else
@@ -516,9 +516,9 @@ 
      *
      * @todo Preserve the offset
      */
-    public function last($strict=false)
+    public function last($strict = false)
     {
-        if (!$this->count()) {
+        if ( ! $this->count()) {
             if ($strict)
                 throw new \ErrorException("No last element found in this array");
             else
@@ -536,9 +536,9 @@ 
     /**
      *
      */
-    public function firstKey($strict=false)
+    public function firstKey($strict = false)
     {
-        if (!$this->count()) {
+        if ( ! $this->count()) {
             if ($strict)
                 throw new \ErrorException("No last element found in this array");
             else
@@ -557,16 +557,16 @@ 
     /**
      *
      */
-    public function lastKey($strict=false)
+    public function lastKey($strict = false)
     {
-        if (!$this->count()) {
+        if ( ! $this->count()) {
             if ($strict)
                 throw new \ErrorException("No last element found in this array");
             else
                 $lastKey = null;
         }
         else {
-            $key  = key($this->data);
+            $key = key($this->data);
             end($this->data);
             $lastKey = key($this->data);
             $this->move($key);
@@ -578,7 +578,7 @@ 
     /**
      * Move the internal pointer of the array to the key given as parameter
      */
-    public function move($key, $strict=true)
+    public function move($key, $strict = true)
     {
         if (array_key_exists($key, $this->data)) {
             foreach ($this->data as $i => &$value) {
@@ -645,13 +645,13 @@ 
      * @see http://php.net/manual/fr/function.var-dump.php
      * @todo Handle xdebug dump formatting
      */
-    public function dump($exit=false)
+    public function dump($exit = false)
     {
         $bt = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
         $caller = $bt[0];
 
         var_export([
-            'location' => $caller['file'] . ':' . $caller['line'],
+            'location' => $caller['file'].':'.$caller['line'],
             'data'     => $this->data,
         ]);
 
@@ -668,7 +668,7 @@ 
      * @todo move it to an Arrays class storing static methods
      */
     public static function replaceEntries(
-        array $array, callable $replacer, $max_depth=null
+        array $array, callable $replacer, $max_depth = null
     ) {
         foreach ($array as $key => &$row) {
             $arguments = [&$row, $key];
@@ -676,7 +676,7 @@ 
 
             if (is_array($row) && $max_depth !== 0) { // allowing null to have no depth limit
                 $row = self::replaceEntries(
-                    $row, $replacer, $max_depth ? $max_depth-1 : $max_depth
+                    $row, $replacer, $max_depth ? $max_depth - 1 : $max_depth
                 );
             }
         }
@@ -692,7 +692,7 @@ 
      *
      * @return static $this or a new static.
      */
-    public function extract($callback=null)
+    public function extract($callback = null)
     {
         if ($callback) {
 
@@ -700,7 +700,7 @@ 
                 $callback = new \JClaveau\LogicalFilter\LogicalFilter($callback);
             }
 
-            if (!is_callable($callback)) {
+            if ( ! is_callable($callback)) {
                 $this->throwUsageException(
                     "\$callback must be a logical filter description array or a callable"
                     ." instead of "
@@ -712,7 +712,7 @@ 
             foreach ($this->data as $key => $value) {
                 if ($callback($value, $key)) {
                     $out[$key] = $value;
-                    unset( $this->data[$key] );
+                    unset($this->data[$key]);
                 }
             }
         }

Braces +67 added lines, -64 removed lines

@@ -26,18 +26,19 @@ 
         $out = [];
         foreach ($this->data as $key => $row) {
 
-            if (!$row)
-                continue;
+            if (!$row) {
+                            continue;
+            }
 
             $newIndexes     = call_user_func($indexGenerator, $key, $row);
-            if (!is_array($newIndexes))
-                $newIndexes = [$newIndexes];
+            if (!is_array($newIndexes)) {
+                            $newIndexes = [$newIndexes];
+            }
 
             foreach ($newIndexes as $newIndex) {
                 if (!isset($out[$newIndex])) {
                     $out[$newIndex] = $row;
-                }
-                else {
+                } else {
                     if ($conflictResolver === null) {
                         self::throwUsageException(
                             "A 'group by' provoking a conflict"
@@ -74,20 +75,21 @@ 
         $out = [];
         foreach ($this->data as $key => $row) {
 
-            if (!$row)
-                continue;
+            if (!$row) {
+                            continue;
+            }
 
             $new_keys = call_user_func($indexGenerator, $row, $key);
-            if (!is_array($new_keys))
-                $new_keys = [$new_keys];
+            if (!is_array($new_keys)) {
+                            $new_keys = [$new_keys];
+            }
 
             foreach ($new_keys as $new_key) {
                 if (!isset($out[ $new_key ])) {
                     $out[ $new_key ] = [
                         $key => $row
                     ];
-                }
-                else {
+                } else {
                     $out[ $new_key ][ $key ] = $row;
                 }
             }
@@ -125,8 +127,9 @@ 
         $out = [];
         foreach ($this->data as $key => $row) {
 
-            if (!$row)
-                continue;
+            if (!$row) {
+                            continue;
+            }
 
             $newIndex       = call_user_func($indexGenerator, $key, $row);
 
@@ -136,8 +139,7 @@ 
 
             if (!isset($out[$newIndex])) {
                 $out[$newIndex] = $transformedRow;
-            }
-            else {
+            } else {
                 $out[$newIndex] = call_user_func(
                     $conflictResolver,
                     $newIndex,
@@ -161,8 +163,9 @@ 
      */
     public function mergeWith( $otherTable, callable $conflictResolver=null )
     {
-        if (is_array($otherTable))
-            $otherTable = new static($otherTable);
+        if (is_array($otherTable)) {
+                    $otherTable = new static($otherTable);
+        }
 
         if (!$otherTable instanceof static) {
             self::throwUsageException(
@@ -176,8 +179,7 @@ 
 
             if (!isset($out[$key])) {
                 $out[$key] = $row;
-            }
-            else {
+            } else {
                 if ($conflictResolver === null) {
                     self::throwUsageException(
                         "No conflict resolver for a merge provoking one: $key \n\n"
@@ -270,8 +272,7 @@ 
                     $row[$new_name] = $row[$old_name];
                     unset($row[$old_name]);
                 }
-            }
-            catch (\Exception $e) {
+            } catch (\Exception $e) {
                 self::throwUsageException( $e->getMessage() );
             }
 
@@ -292,17 +293,19 @@ 
     public function limit()
     {
         $arguments = func_get_args();
-        if (count($arguments) == 1 && is_numeric($arguments[0]))
-            $max = $arguments[0];
-        else
-            self::throwUsageException("Bad arguments type and count for limit()");
+        if (count($arguments) == 1 && is_numeric($arguments[0])) {
+                    $max = $arguments[0];
+        } else {
+                    self::throwUsageException("Bad arguments type and count for limit()");
+        }
 
         $out   = [];
         $count = 0;
         foreach ($this->data as $key => $row) {
 
-            if ($max <= $count)
-                break;
+            if ($max <= $count) {
+                            break;
+            }
 
             $out[$key] = $row;
 
@@ -326,8 +329,9 @@ 
      */
     public function append($new_rows, callable $conflict_resolver=null)
     {
-        if ($new_rows instanceof static)
-            $new_rows = $new_rows->getArray();
+        if ($new_rows instanceof static) {
+                    $new_rows = $new_rows->getArray();
+        }
 
         if (!is_array($new_rows)) {
             $this->throwUsageException(
@@ -352,8 +356,7 @@ 
                 ];
 
                 call_user_func_array($conflict_resolver, $arguments);
-            }
-            else {
+            } else {
                 $this->data[$key] = $new_row;
             }
         }
@@ -463,8 +466,7 @@ 
                 foreach ($rows as $row_id => $joined_row) {
                     $out[$row_id] = $joined_row;
                 }
-            }
-            else {
+            } else {
 
                 if (!isset($rows)) {
                     echo json_encode([
@@ -474,8 +476,9 @@ 
                     exit;
                 }
 
-                foreach ($rowIdParts as $rowIdPartName => $rowIdPartValue)
-                    $row[$rowIdPartName] = $rowIdPartValue;
+                foreach ($rowIdParts as $rowIdPartName => $rowIdPartValue) {
+                                    $row[$rowIdPartName] = $rowIdPartValue;
+                }
 
                 $indexParts = [];
                 foreach ($rowIdParts as $name => $value) {
@@ -497,12 +500,12 @@ 
     public function first($strict=false)
     {
         if (!$this->count()) {
-            if ($strict)
-                throw new \ErrorException("No first element found in this array");
-            else
-                $first = null;
-        }
-        else {
+            if ($strict) {
+                            throw new \ErrorException("No first element found in this array");
+            } else {
+                            $first = null;
+            }
+        } else {
             $key   = key($this->data);
             $first = reset($this->data);
             $this->move($key);
@@ -519,12 +522,12 @@ 
     public function last($strict=false)
     {
         if (!$this->count()) {
-            if ($strict)
-                throw new \ErrorException("No last element found in this array");
-            else
-                $last = null;
-        }
-        else {
+            if ($strict) {
+                            throw new \ErrorException("No last element found in this array");
+            } else {
+                            $last = null;
+            }
+        } else {
             $key  = key($this->data);
             $last = end($this->data);
             $this->move($key);
@@ -539,12 +542,12 @@ 
     public function firstKey($strict=false)
     {
         if (!$this->count()) {
-            if ($strict)
-                throw new \ErrorException("No last element found in this array");
-            else
-                $firstKey = null;
-        }
-        else {
+            if ($strict) {
+                            throw new \ErrorException("No last element found in this array");
+            } else {
+                            $firstKey = null;
+            }
+        } else {
             $key      = key($this->data);
             reset($this->data);
             $firstKey = key($this->data);
@@ -560,12 +563,12 @@ 
     public function lastKey($strict=false)
     {
         if (!$this->count()) {
-            if ($strict)
-                throw new \ErrorException("No last element found in this array");
-            else
-                $lastKey = null;
-        }
-        else {
+            if ($strict) {
+                            throw new \ErrorException("No last element found in this array");
+            } else {
+                            $lastKey = null;
+            }
+        } else {
             $key  = key($this->data);
             end($this->data);
             $lastKey = key($this->data);
@@ -587,8 +590,7 @@ 
                     break;
                 }
             }
-        }
-        elseif ($strict) {
+        } elseif ($strict) {
             throw new \ErrorException("Unable to move the internal pointer to a key that doesn't exist.");
         }
 
@@ -655,8 +657,9 @@ 
             'data'     => $this->data,
         ]);
 
-        if ($exit)
-            exit;
+        if ($exit) {
+                    exit;
+        }
 
         return $this;
     }

src/Exceptions/UsageException.php

Braces +6 added lines, -4 removed lines

@@ -54,11 +54,13 @@
         // var_export($caller);
 
         // TODO How to handle perfectly the missing fields of the backtrace?
-        if (isset($caller['file']))
-            $this->file = $caller['file'];
+        if (isset($caller['file'])) {
+                    $this->file = $caller['file'];
+        }
 
-        if (isset($caller['line']))
-            $this->line = $caller['line'];
+        if (isset($caller['line'])) {
+                    $this->line = $caller['line'];
+        }
 
         // var_export($this->stack);
     }

Spacing +9 added lines, -9 removed lines

@@ -18,35 +18,35 @@
     {
         parent::__construct(...func_get_args());
 
-        $this->rewindStackWhile( function($backtrace, $level) {
+        $this->rewindStackWhile(function($backtrace, $level) {
             // Finds the closest caller
             // TODO get the class of the caller instead of comparing
             // with UsageException
-            return  isset($backtrace[ $level ]['class'])
-                &&  $backtrace[ $level ]['class'] == __CLASS__;
-        }, 0 );
+            return  isset($backtrace[$level]['class'])
+                &&  $backtrace[$level]['class'] == __CLASS__;
+        }, 0);
     }
 
     /**
      */
     public function setStackLocationHere()
     {
-        $this->rewindStackWhile( function($backtrace, $level) {
+        $this->rewindStackWhile(function($backtrace, $level) {
             // Finds the closest caller
             return $level < 2;
-        }, 4 );
+        }, 4);
 
         return $this;
     }
 
     /**
      */
-    protected function rewindStackWhile(callable $scope_checker, $stack_max_depth=20)
+    protected function rewindStackWhile(callable $scope_checker, $stack_max_depth = 20)
     {
-        $backtrace = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS, $stack_max_depth);
+        $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, $stack_max_depth);
         $i         = 1;
         $caller    = $backtrace[$i];
-        while ( $scope_checker( $backtrace, $i ) ) {
+        while ($scope_checker($backtrace, $i)) {
             $i++;
             $caller = $backtrace[$i];
             // TODO remove the previous levels of the stack?

src/Arrays/MergeBucket.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
     public function reduceIfUnique()
     {
         if ($this->unique()->count() == 1)
-            return reset( $this->data );
+            return reset($this->data);
     }
     /**/
 }

Braces +3 added lines, -2 removed lines

@@ -11,8 +11,9 @@
      */
     public function reduceIfUnique()
     {
-        if ($this->unique()->count() == 1)
-            return reset( $this->data );
+        if ($this->unique()->count() == 1) {
+                    return reset( $this->data );
+        }
     }
     /**/
 }

src/Arrays/Arrays.php

Indentation +7 added lines, -7 removed lines

@@ -280,7 +280,7 @@ 
         $excluded_columns = isset($options['excluded_columns'])
                           ? $options['excluded_columns']
                           : []
-                          ;
+                            ;
 
         foreach ($row as $column => &$values) {
             if ( ! $values instanceof MergeBucket)
@@ -313,7 +313,7 @@ 
         $excluded_columns = isset($options['excluded_columns'])
                           ? $options['excluded_columns']
                           : []
-                          ;
+                            ;
 
         foreach ($row as $column => &$values) {
             if (in_array($column, $excluded_columns)) {
@@ -411,7 +411,7 @@ 
             elseif (is_object($value)) {
                 if ( ! method_exists($value, 'toNumber')) {
                     throw new \InvalidArgumentEXception(
-                         "Trying to sum a ".get_class($value)." object which cannot be casted as a number. "
+                            "Trying to sum a ".get_class($value)." object which cannot be casted as a number. "
                         ."Please add a toNumber() method."
                     );
                 }
@@ -595,12 +595,12 @@ 
         $key_value_separator = ! empty($options['key_value_separator'])
                              ? $options['key_value_separator']
                              : ':'
-                             ;
+                                ;
 
         $groups_separator    = ! empty($options['groups_separator'])
                              ? $options['groups_separator']
                              : '-'
-                             ;
+                                ;
 
         $group_parts = [];
         foreach ($groups_definitions as $group_definition_key => $group_definition_value) {
@@ -676,8 +676,8 @@ 
         foreach ($group_parts as $group_name => $group_value) {
             if (is_object($group_value)) {
                 $group_value = get_class($group_value)
-                             . '_'
-                             . hash( 'crc32b', var_export($group_value, true) );
+                                . '_'
+                                . hash( 'crc32b', var_export($group_value, true) );
             }
             elseif (is_array($group_value)) {
                 $group_value = 'array_' . hash( 'crc32b', var_export($group_value, true) );

Spacing +47 added lines, -47 removed lines

@@ -135,16 +135,16 @@ 
     public static function mergeRecursiveCustom(
         $existing_row,
         $conflict_row,
-        callable $merge_resolver=null,
-        $max_depth=null
-    ){
+        callable $merge_resolver = null,
+        $max_depth = null
+    ) {
         static::mustBeCountable($existing_row);
         static::mustBeCountable($conflict_row);
 
         foreach ($conflict_row as $column => $conflict_value) {
 
             // not existing in first array
-            if (!isset($existing_row[$column])) {
+            if ( ! isset($existing_row[$column])) {
                 $existing_row[$column] = $conflict_value;
                 continue;
             }
@@ -177,7 +177,7 @@ 
             }
             else {
                 // same resolution as array_merge_recursive
-                if (!is_array($existing_value)) {
+                if ( ! is_array($existing_value)) {
                     $existing_row[$column] = [$existing_value];
                 }
 
@@ -202,7 +202,7 @@ 
     public static function mergePreservingDistincts(
         $existing_row,
         $conflict_row
-    ){
+    ) {
         return self::mergeInColumnBuckets($existing_row, $conflict_row);
     }
 
@@ -219,8 +219,8 @@ 
     public static function mergeInColumnBuckets(
         $existing_row,
         $conflict_row,
-        $existing_key=null,
-        $conflict_key=null
+        $existing_key = null,
+        $conflict_key = null
     ) {
         static::mustBeCountable($existing_row);
         static::mustBeCountable($conflict_row);
@@ -228,16 +228,16 @@ 
         $merged_row = [];
         foreach ($existing_row as $existing_column => $existing_value) {
             if ($existing_value instanceof MergeBucket) {
-                $merged_row[ $existing_column ] = $existing_value;
+                $merged_row[$existing_column] = $existing_value;
             }
             else {
                 if (isset($existing_key)) {
-                    $merged_row[ $existing_column ] = MergeBucket::from([
+                    $merged_row[$existing_column] = MergeBucket::from([
                         $existing_key => $existing_value
                     ]);
                 }
                 else {
-                    $merged_row[ $existing_column ] = MergeBucket::from([
+                    $merged_row[$existing_column] = MergeBucket::from([
                         $existing_value
                     ]);
                 }
@@ -245,26 +245,26 @@ 
         }
         
         foreach ($conflict_row as $conflict_column => $conflict_value) {
-            if (! isset($merged_row[ $conflict_column ])) {
-                $merged_row[ $conflict_column ] = new MergeBucket;
+            if ( ! isset($merged_row[$conflict_column])) {
+                $merged_row[$conflict_column] = new MergeBucket;
             }
             
             if ($conflict_value instanceof MergeBucket) {
                 foreach ($conflict_value as $conflict_bucket_value) {
                     if (isset($conflict_key)) {
-                        $merged_row[ $conflict_column ][$conflict_key] = $conflict_bucket_value;
+                        $merged_row[$conflict_column][$conflict_key] = $conflict_bucket_value;
                     }
                     else {
-                        $merged_row[ $conflict_column ][] = $conflict_bucket_value;
+                        $merged_row[$conflict_column][] = $conflict_bucket_value;
                     }
                 }
             }
             else {
                 if (isset($conflict_key)) {
-                    $merged_row[ $conflict_column ][$conflict_key] = $conflict_value;
+                    $merged_row[$conflict_column][$conflict_key] = $conflict_value;
                 }
                 else {
-                    $merged_row[ $conflict_column ][] = $conflict_value;
+                    $merged_row[$conflict_column][] = $conflict_value;
                 }
             }
         }
@@ -278,7 +278,7 @@ 
      * @param  array|Countable   $row
      * @param  array             $options : 'excluded_columns'
      */
-    public static function cleanMergeDuplicates($row, array $options=[])
+    public static function cleanMergeDuplicates($row, array $options = [])
     {
         static::mustBeCountable($row);
 
@@ -311,7 +311,7 @@ 
      * @see mergePreservingDistincts()
      * @see cleanMergeDuplicates()
      */
-    public static function cleanMergeBuckets($row, array $options=[])
+    public static function cleanMergeBuckets($row, array $options = [])
     {
         static::mustBeCountable($row);
 
@@ -354,13 +354,13 @@ 
                 $id = serialize($value);
             }
 
-            if (isset($ids[ $id ])) {
-                unset($array[ $key ]);
-                $ids[ $id ][] = $key;
+            if (isset($ids[$id])) {
+                unset($array[$key]);
+                $ids[$id][] = $key;
                 continue;
             }
 
-            $ids[ $id ] = [$key];
+            $ids[$id] = [$key];
         }
 
         return $array;
@@ -380,7 +380,7 @@ 
         }
         else {
             throw new \InvalidArgumentException(
-                "keyExists() method missing on :\n". var_export($array, true)
+                "keyExists() method missing on :\n".var_export($array, true)
             );
         }
 
@@ -456,16 +456,16 @@ 
             throw new \InvalidArgumentException(
                 "Different number of "
                 ." values and weights for weight mean calculation: \n"
-                .var_export($values,  true)."\n\n"
+                .var_export($values, true)."\n\n"
                 .var_export($weights, true)
             );
         }
 
-        if (!$values)
+        if ( ! $values)
             return null;
 
-        $weights_sum  = array_sum($weights);
-        if (!$weights_sum)
+        $weights_sum = array_sum($weights);
+        if ( ! $weights_sum)
             return 0;
 
         $weighted_sum = 0;
@@ -514,8 +514,8 @@ 
         );
 
         // The true location of the throw is still available through the backtrace
-        $trace_location  = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS, 1)[0];
-        $reflectionClass = new \ReflectionClass( get_class($exception) );
+        $trace_location  = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1)[0];
+        $reflectionClass = new \ReflectionClass(get_class($exception));
 
         // file
         if (isset($trace_location['file'])) {
@@ -552,8 +552,8 @@ 
         );
 
         // The true location of the throw is still available through the backtrace
-        $trace_location  = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS, 1)[0];
-        $reflectionClass = new \ReflectionClass( get_class($exception) );
+        $trace_location  = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1)[0];
+        $reflectionClass = new \ReflectionClass(get_class($exception));
 
         // file
         if (isset($trace_location['file'])) {
@@ -593,7 +593,7 @@ 
      *
      * @return string       The unique identifier of the group
      */
-    public static function generateGroupId($row, array $groups_definitions, array $options=[])
+    public static function generateGroupId($row, array $groups_definitions, array $options = [])
     {
         Arrays::mustBeCountable($row);
 
@@ -602,7 +602,7 @@ 
                              : ':'
                              ;
 
-        $groups_separator    = ! empty($options['groups_separator'])
+        $groups_separator = ! empty($options['groups_separator'])
                              ? $options['groups_separator']
                              : '-'
                              ;
@@ -616,32 +616,32 @@ 
             }
 
             if (is_string($group_definition_value)) {
-                if (    (is_array($row)              && ! array_key_exists($group_definition_value, $row))
+                if ((is_array($row) && ! array_key_exists($group_definition_value, $row))
                     ||  ($row instanceof \ArrayAcces && ! $row->offsetExists($group_definition_value))
                 ) {
                     throw new UsageException(
                         'Unset column for group id generation: '
                         .var_export($group_definition_value, true)
-                        ."\n" . var_export($row, true)
+                        ."\n".var_export($row, true)
                     );
                 }
 
                 $part_name         .= $group_definition_value;
-                $group_result_value = $row[ $group_definition_value ];
+                $group_result_value = $row[$group_definition_value];
             }
             elseif (is_int($group_definition_value)) {
-                if (    (is_array($row)              && ! array_key_exists($group_definition_value, $row))
+                if ((is_array($row) && ! array_key_exists($group_definition_value, $row))
                     ||  ($row instanceof \ArrayAcces && ! $row->offsetExists($group_definition_value))
                 ) {
                     throw new UsageException(
                         'Unset column for group id generation: '
                         .var_export($group_definition_value, true)
-                        ."\n" . var_export($row, true)
+                        ."\n".var_export($row, true)
                     );
                 }
 
-                $part_name         .= $group_definition_value ? : '0';
-                $group_result_value = $row[ $group_definition_value ];
+                $part_name         .= $group_definition_value ?: '0';
+                $group_result_value = $row[$group_definition_value];
             }
             elseif (is_callable($group_definition_value)) {
 
@@ -665,12 +665,12 @@ 
                 throw new UsageException(
                     'Bad value provided for group id generation: '
                     .var_export($group_definition_value, true)
-                    ."\n" . var_export($row, true)
+                    ."\n".var_export($row, true)
                 );
             }
 
-            if (!is_null($part_name))
-                $group_parts[ $part_name ] = $group_result_value;
+            if ( ! is_null($part_name))
+                $group_parts[$part_name] = $group_result_value;
         }
 
         // sort the groups by names (without it the same group could have multiple ids)
@@ -682,13 +682,13 @@ 
             if (is_object($group_value)) {
                 $group_value = get_class($group_value)
                              . '_'
-                             . hash( 'crc32b', var_export($group_value, true) );
+                             . hash('crc32b', var_export($group_value, true));
             }
             elseif (is_array($group_value)) {
-                $group_value = 'array_' . hash( 'crc32b', var_export($group_value, true) );
+                $group_value = 'array_'.hash('crc32b', var_export($group_value, true));
             }
 
-            $out[] = $group_name . $key_value_separator . $group_value;
+            $out[] = $group_name.$key_value_separator.$group_value;
         }
 
         return implode($groups_separator, $out);

Braces +57 added lines, -66 removed lines

@@ -65,14 +65,12 @@ 
                 )
                 {
                     $array1[$key] = self::merge($array1[$key], $value);
-                }
-                else
+                } else
                 {
                     $array1[$key] = $value;
                 }
             }
-        }
-        else
+        } else
         {
             foreach ($array2 as $value)
             {
@@ -97,14 +95,12 @@ 
                         )
                         {
                             $array1[$key] = self::merge($array1[$key], $value);
-                        }
-                        else
+                        } else
                         {
                             $array1[$key] = $value;
                         }
                     }
-                }
-                else
+                } else
                 {
                     foreach ($array2 as $value)
                     {
@@ -174,8 +170,7 @@ 
                         $column,
                     ]
                 );
-            }
-            else {
+            } else {
                 // same resolution as array_merge_recursive
                 if (!is_array($existing_value)) {
                     $existing_row[$column] = [$existing_value];
@@ -229,14 +224,12 @@ 
         foreach ($existing_row as $existing_column => $existing_value) {
             if ($existing_value instanceof MergeBucket) {
                 $merged_row[ $existing_column ] = $existing_value;
-            }
-            else {
+            } else {
                 if (isset($existing_key)) {
                     $merged_row[ $existing_column ] = MergeBucket::from([
                         $existing_key => $existing_value
                     ]);
-                }
-                else {
+                } else {
                     $merged_row[ $existing_column ] = MergeBucket::from([
                         $existing_value
                     ]);
@@ -253,17 +246,14 @@ 
                 foreach ($conflict_value as $conflict_bucket_value) {
                     if (isset($conflict_key)) {
                         $merged_row[ $conflict_column ][$conflict_key] = $conflict_bucket_value;
-                    }
-                    else {
+                    } else {
                         $merged_row[ $conflict_column ][] = $conflict_bucket_value;
                     }
                 }
-            }
-            else {
+            } else {
                 if (isset($conflict_key)) {
                     $merged_row[ $conflict_column ][$conflict_key] = $conflict_value;
-                }
-                else {
+                } else {
                     $merged_row[ $conflict_column ][] = $conflict_value;
                 }
             }
@@ -288,15 +278,18 @@ 
                           ;
 
         foreach ($row as $column => &$values) {
-            if ( ! $values instanceof MergeBucket)
-                continue;
+            if ( ! $values instanceof MergeBucket) {
+                            continue;
+            }
 
-            if (in_array($column, $excluded_columns))
-                continue;
+            if (in_array($column, $excluded_columns)) {
+                            continue;
+            }
 
             $values = Arrays::unique($values);
-            if (count($values) == 1)
-                $values = $values[0];
+            if (count($values) == 1) {
+                            $values = $values[0];
+            }
         }
 
         return $row;
@@ -349,8 +342,7 @@ 
         foreach ($array as $key => $value) {
             if (is_scalar($value)) {
                 $id = $value;
-            }
-            else {
+            } else {
                 $id = serialize($value);
             }
 
@@ -374,11 +366,9 @@ 
 
         if (is_array($array)) {
             return array_key_exists($key, $array);
-        }
-        elseif ($array instanceof ChainableArray || method_exists($array, 'keyExists')) {
+        } elseif ($array instanceof ChainableArray || method_exists($array, 'keyExists')) {
             return $array->keyExists($key);
-        }
-        else {
+        } else {
             throw new \InvalidArgumentException(
                 "keyExists() method missing on :\n". var_export($array, true)
             );
@@ -404,16 +394,13 @@ 
         foreach ($array as $key => &$value) { // &for optimization
             if (is_scalar($value)) {
                 $sum += $value;
-            }
-            elseif (is_null($value)) {
+            } elseif (is_null($value)) {
                 continue;
-            }
-            elseif (is_array($value)) {
+            } elseif (is_array($value)) {
                 throw new \InvalidArgumentException(
                     "Trying to sum an array with '$sum': ".var_export($value, true)
                 );
-            }
-            elseif (is_object($value)) {
+            } elseif (is_object($value)) {
                 if ( ! method_exists($value, 'toNumber')) {
                     throw new \InvalidArgumentEXception(
                          "Trying to sum a ".get_class($value)." object which cannot be casted as a number. "
@@ -440,17 +427,21 @@ 
      */
     public static function weightedMean($values, $weights)
     {
-        if ($values instanceof ChainableArray)
-            $values = $values->toArray();
+        if ($values instanceof ChainableArray) {
+                    $values = $values->toArray();
+        }
 
-        if ($weights instanceof ChainableArray)
-            $weights = $weights->toArray();
+        if ($weights instanceof ChainableArray) {
+                    $weights = $weights->toArray();
+        }
 
-        if ( ! is_array($values))
-            $values = [$values];
+        if ( ! is_array($values)) {
+                    $values = [$values];
+        }
 
-        if ( ! is_array($weights))
-            $weights = [$weights];
+        if ( ! is_array($weights)) {
+                    $weights = [$weights];
+        }
 
         if (count($values) != count($weights)) {
             throw new \InvalidArgumentException(
@@ -461,12 +452,14 @@ 
             );
         }
 
-        if (!$values)
-            return null;
+        if (!$values) {
+                    return null;
+        }
 
         $weights_sum  = array_sum($weights);
-        if (!$weights_sum)
-            return 0;
+        if (!$weights_sum) {
+                    return 0;
+        }
 
         $weighted_sum = 0;
         foreach ($values as $i => $value) {
@@ -505,8 +498,9 @@ 
      */
     public static function mustBeCountable($value)
     {
-        if (static::isCountable($value))
-            return true;
+        if (static::isCountable($value)) {
+                    return true;
+        }
 
         $exception = new \InvalidArgumentException(
             "A value must be Countable instead of: \n"
@@ -543,8 +537,9 @@ 
      */
     public static function mustBeTraversable($value)
     {
-        if (static::isTraversable($value))
-            return true;
+        if (static::isTraversable($value)) {
+                    return true;
+        }
 
         $exception = new \InvalidArgumentException(
             "A value must be Traversable instead of: \n"
@@ -628,8 +623,7 @@ 
 
                 $part_name         .= $group_definition_value;
                 $group_result_value = $row[ $group_definition_value ];
-            }
-            elseif (is_int($group_definition_value)) {
+            } elseif (is_int($group_definition_value)) {
                 if (    (is_array($row)              && ! array_key_exists($group_definition_value, $row))
                     ||  ($row instanceof \ArrayAcces && ! $row->offsetExists($group_definition_value))
                 ) {
@@ -642,8 +636,7 @@ 
 
                 $part_name         .= $group_definition_value ? : '0';
                 $group_result_value = $row[ $group_definition_value ];
-            }
-            elseif (is_callable($group_definition_value)) {
+            } elseif (is_callable($group_definition_value)) {
 
                 if (is_string($group_definition_value)) {
                     $part_name .= $group_definition_value;
@@ -652,16 +645,14 @@ 
                 elseif (is_object($group_definition_value) && ($group_definition_value instanceof \Closure)) {
                     $part_name .= 'unnamed-closure-'
                                 . hash('crc32b', var_export($group_definition_value, true));
-                }
-                elseif (is_array($group_definition_value)) {
+                } elseif (is_array($group_definition_value)) {
                     $part_name .= implode('::', $group_definition_value);
                 }
 
                 $group_result_value = call_user_func_array($group_definition_value, [
                     $row, &$part_name
                 ]);
-            }
-            else {
+            } else {
                 throw new UsageException(
                     'Bad value provided for group id generation: '
                     .var_export($group_definition_value, true)
@@ -669,8 +660,9 @@ 
                 );
             }
 
-            if (!is_null($part_name))
-                $group_parts[ $part_name ] = $group_result_value;
+            if (!is_null($part_name)) {
+                            $group_parts[ $part_name ] = $group_result_value;
+            }
         }
 
         // sort the groups by names (without it the same group could have multiple ids)
@@ -683,8 +675,7 @@ 
                 $group_value = get_class($group_value)
                              . '_'
                              . hash( 'crc32b', var_export($group_value, true) );
-            }
-            elseif (is_array($group_value)) {
+            } elseif (is_array($group_value)) {
                 $group_value = 'array_' . hash( 'crc32b', var_export($group_value, true) );
             }