jclaveau / php-chainable-array

src/Arrays/Arrays_Merge_Trait.php

Indentation +2 added lines, -2 removed lines

@@ -108,7 +108,7 @@ 
         $excluded_columns = isset($options['excluded_columns'])
                           ? $options['excluded_columns']
                           : []
-                          ;
+                            ;
 
         foreach ($row as $column => &$values) {
             if (in_array($column, $excluded_columns)) {
@@ -136,7 +136,7 @@ 
         $excluded_columns = isset($options['excluded_columns'])
                           ? $options['excluded_columns']
                           : []
-                          ;
+                            ;
 
         foreach ($row as $column => &$values) {
             if ( ! $values instanceof MergeBucket)

Spacing +24 added lines, -24 removed lines

@@ -22,8 +22,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);
@@ -31,16 +31,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
                     ]);
                 }
@@ -48,26 +48,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;
                 }
             }
         }
@@ -101,7 +101,7 @@ 
      * @see mergePreservingDistincts()
      * @see cleanMergeDuplicates()
      */
-    public static function cleanMergeBuckets($row, array $options=[])
+    public static function cleanMergeBuckets($row, array $options = [])
     {
         static::mustBeCountable($row);
 
@@ -129,7 +129,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);
 
@@ -168,16 +168,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;
             }
@@ -210,7 +210,7 @@ 
             }
             else {
                 // same resolution as array_merge_recursive
-                if (!is_array($existing_value)) {
+                if ( ! is_array($existing_value)) {
                     $existing_row[$column] = [$existing_value];
                 }
 
@@ -325,24 +325,24 @@ 
     {
         $result = [];
         foreach ($array as $key => $value) {
-            if (! $value instanceof MergeBucket) {
-                $result[ $key ] = $value;
+            if ( ! $value instanceof MergeBucket) {
+                $result[$key] = $value;
             }
             else {
                 foreach ($value as $sub_key => $sub_value) {
                     if (is_int($sub_key)) {
                         $result[] = $sub_value;
                     }
-                    elseif (isset($result[ $sub_key ])) {
+                    elseif (isset($result[$sub_key])) {
                         throw new \LogicException(
                             "Conflict during flatten merge for key $sub_key between: \n"
-                            ."Existing: " . var_export($result[ $sub_key ], true)
+                            ."Existing: ".var_export($result[$sub_key], true)
                             ."\n and \n"
-                            ."Conflict: " . var_export($sub_value, true)
+                            ."Conflict: ".var_export($sub_value, true)
                         );
                     }
                     else {
-                        $result[ $sub_key ] = $sub_value;
+                        $result[$sub_key] = $sub_value;
                     }
                 }
             }

Braces +22 added lines, -32 removed lines

@@ -32,14 +32,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
                     ]);
@@ -56,17 +54,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;
                 }
             }
@@ -139,15 +134,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;
@@ -207,8 +205,7 @@ 
                         $column,
                     ]
                 );
-            }
-            else {
+            } else {
                 // same resolution as array_merge_recursive
                 if (!is_array($existing_value)) {
                     $existing_row[$column] = [$existing_value];
@@ -256,14 +253,12 @@ 
                 )
                 {
                     $array1[$key] = self::merge($array1[$key], $value);
-                }
-                else
+                } else
                 {
                     $array1[$key] = $value;
                 }
             }
-        }
-        else
+        } else
         {
             foreach ($array2 as $value)
             {
@@ -288,14 +283,12 @@ 
                         )
                         {
                             $array1[$key] = self::merge($array1[$key], $value);
-                        }
-                        else
+                        } else
                         {
                             $array1[$key] = $value;
                         }
                     }
-                }
-                else
+                } else
                 {
                     foreach ($array2 as $value)
                     {
@@ -327,21 +320,18 @@ 
         foreach ($array as $key => $value) {
             if (! $value instanceof MergeBucket) {
                 $result[ $key ] = $value;
-            }
-            else {
+            } else {
                 foreach ($value as $sub_key => $sub_value) {
                     if (is_int($sub_key)) {
                         $result[] = $sub_value;
-                    }
-                    elseif (isset($result[ $sub_key ])) {
+                    } elseif (isset($result[ $sub_key ])) {
                         throw new \LogicException(
                             "Conflict during flatten merge for key $sub_key between: \n"
                             ."Existing: " . var_export($result[ $sub_key ], true)
                             ."\n and \n"
                             ."Conflict: " . var_export($sub_value, true)
                         );
-                    }
-                    else {
+                    } else {
                         $result[ $sub_key ] = $sub_value;
                     }
                 }

src/Arrays/ChainableArray_Utils_Trait.php

Spacing +53 added lines, -53 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]);
                 }
             }
         }
@@ -728,23 +728,23 @@ 
         $result = [];
         foreach ($this->data as $key => $value) {
             if ( ! Arrays::isTraversable($value)) {
-                $result[ $key ] = $value;
+                $result[$key] = $value;
             }
             else {
                 foreach ($value as $sub_key => $sub_value) {
                     if (is_int($sub_key)) {
                         $result[] = $sub_value;
                     }
-                    elseif (isset($result[ $sub_key ])) {
+                    elseif (isset($result[$sub_key])) {
                         throw new \LogicException(
                             "Conflict during flatten merge for key $sub_key between: \n"
-                            ."Existing: " . var_export($result[ $sub_key ], true)
+                            ."Existing: ".var_export($result[$sub_key], true)
                             ."\n and \n"
-                            ."Conflict: " . var_export($sub_value, true)
+                            ."Conflict: ".var_export($sub_value, true)
                         );
                     }
                     else {
-                        $result[ $sub_key ] = $sub_value;
+                        $result[$sub_key] = $sub_value;
                     }
                 }
             }

Braces +70 added lines, -70 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;
     }
@@ -729,21 +732,18 @@ 
         foreach ($this->data as $key => $value) {
             if ( ! Arrays::isTraversable($value)) {
                 $result[ $key ] = $value;
-            }
-            else {
+            } else {
                 foreach ($value as $sub_key => $sub_value) {
                     if (is_int($sub_key)) {
                         $result[] = $sub_value;
-                    }
-                    elseif (isset($result[ $sub_key ])) {
+                    } elseif (isset($result[ $sub_key ])) {
                         throw new \LogicException(
                             "Conflict during flatten merge for key $sub_key between: \n"
                             ."Existing: " . var_export($result[ $sub_key ], true)
                             ."\n and \n"
                             ."Conflict: " . var_export($sub_value, true)
                         );
-                    }
-                    else {
+                    } else {
                         $result[ $sub_key ] = $sub_value;
                     }
                 }

src/Arrays/Arrays.php

Indentation +5 added lines, -5 removed lines

@@ -117,7 +117,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."
                     );
                 }
@@ -301,12 +301,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) {
@@ -382,8 +382,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 +28 added lines, -28 removed lines

@@ -55,13 +55,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;
@@ -81,7 +81,7 @@ 
         }
         else {
             throw new \InvalidArgumentException(
-                "keyExists() method missing on :\n". var_export($array, true)
+                "keyExists() method missing on :\n".var_export($array, true)
             );
         }
 
@@ -157,16 +157,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;
@@ -215,8 +215,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'])) {
@@ -253,8 +253,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'])) {
@@ -294,7 +294,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);
 
@@ -303,7 +303,7 @@ 
                              : ':'
                              ;
 
-        $groups_separator    = ! empty($options['groups_separator'])
+        $groups_separator = ! empty($options['groups_separator'])
                              ? $options['groups_separator']
                              : '-'
                              ;
@@ -317,32 +317,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)) {
 
@@ -366,12 +366,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)
@@ -383,13 +383,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 +38 added lines, -40 removed lines

@@ -50,8 +50,7 @@ 
         foreach ($array as $key => $value) {
             if (is_scalar($value)) {
                 $id = $value;
-            }
-            else {
+            } else {
                 $id = serialize($value);
             }
 
@@ -75,11 +74,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)
             );
@@ -105,16 +102,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. "
@@ -141,17 +135,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(
@@ -162,12 +160,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) {
@@ -206,8 +206,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"
@@ -244,8 +245,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"
@@ -329,8 +331,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))
                 ) {
@@ -343,8 +344,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;
@@ -353,16 +353,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)
@@ -370,8 +368,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)
@@ -384,8 +383,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) );
             }