jclaveau / php-chainable-array

src/Arrays/Arrays_Merge_Trait.php

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

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

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) );
             }