jclaveau / php-chainable-array

src/ChainableArray_Utils_Trait.php

Braces +77 added lines, -76 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,10 +179,10 @@ 
 
             if (!isset($out[$key])) {
                 $out[$key] = $row;
-            }
-            else {
-                if ($conflictResolver === null)
-                    self::throwUsageException('No conflict resolver for a merge provoking one');
+            } else {
+                if ($conflictResolver === null) {
+                                    self::throwUsageException('No conflict resolver for a merge provoking one');
+                }
 
                 $arguments = [
                     &$key,
@@ -265,8 +268,7 @@ 
                     $row[$new_name] = $row[$old_name];
                     unset($row[$old_name]);
                 }
-            }
-            catch (\Exception $e) {
+            } catch (\Exception $e) {
                 self::throwUsageException( $e->getMessage() );
             }
 
@@ -287,17 +289,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;
 
@@ -321,8 +325,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(
@@ -347,8 +352,7 @@ 
                 ];
 
                 call_user_func_array($conflict_resolver, $arguments);
-            }
-            else {
+            } else {
                 $this->data[$key] = $new_row;
             }
         }
@@ -458,8 +462,7 @@ 
                 foreach ($rows as $row_id => $joined_row) {
                     $out[$row_id] = $joined_row;
                 }
-            }
-            else {
+            } else {
 
                 if (!isset($rows)) {
                     echo json_encode([
@@ -469,8 +472,9 @@ 
                     exit;
                 }
 
-                foreach ($rowIdParts as $rowIdPartName => $rowIdPartValue)
-                    $row[$rowIdPartName] = $rowIdPartValue;
+                foreach ($rowIdParts as $rowIdPartName => $rowIdPartValue) {
+                                    $row[$rowIdPartName] = $rowIdPartValue;
+                }
 
                 $indexParts = [];
                 foreach ($rowIdParts as $name => $value) {
@@ -523,8 +527,7 @@ 
             if (is_string($value) && array_key_exists($value, $row)) {
                 $part_name  .= $value;
                 $group_value = $row[ $value ];
-            }
-            elseif (is_callable($value)) {
+            } elseif (is_callable($value)) {
 
                 if (is_string($value)) {
                     $part_name  .= $value;
@@ -533,20 +536,17 @@ 
                 elseif (is_object($value) && ($value instanceof \Closure)) {
                     $part_name .= 'unnamed-closure-'
                                 . hash('crc32b', var_export($value, true));
-                }
-                elseif (is_array($value)) {
+                } elseif (is_array($value)) {
                     $part_name .= implode('::', $value);
                 }
 
                 $group_value = call_user_func_array($value, [
                     $row, &$part_name
                 ]);
-            }
-            elseif (is_int($value)) {
+            } elseif (is_int($value)) {
                 $part_name  .= $value ? : '0';
                 $group_value = $row[ $value ];
-            }
-            else {
+            } else {
                 self::throwUsageException(
                     'Bad value provided for groupBy id generation: '
                     .var_export($value, true)
@@ -554,8 +554,9 @@ 
                 );
             }
 
-            if (!is_null($part_name))
-                $group_parts[ $part_name ] = $group_value;
+            if (!is_null($part_name)) {
+                            $group_parts[ $part_name ] = $group_value;
+            }
         }
 
         // sort the groups by names (without it the same group could have multiple ids)
@@ -576,12 +577,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);
@@ -598,12 +599,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);
@@ -618,12 +619,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);
@@ -639,12 +640,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);
@@ -666,8 +667,7 @@ 
                     break;
                 }
             }
-        }
-        elseif ($strict) {
+        } elseif ($strict) {
             throw new \ErrorException("Unable to move the internal pointer to a key that doesn't exist.");
         }
 
@@ -734,8 +734,9 @@ 
             'data'     => $this->data,
         ]);
 
-        if ($exit)
-            exit;
+        if ($exit) {
+                    exit;
+        }
 
         return $this;
     }

src/Arrays.php

Braces +44 added lines, -44 removed lines

@@ -64,14 +64,12 @@ 
                 )
                 {
                     $array1[$key] = self::merge($array1[$key], $value);
-                }
-                else
+                } else
                 {
                     $array1[$key] = $value;
                 }
             }
-        }
-        else
+        } else
         {
             foreach ($array2 as $value)
             {
@@ -96,14 +94,12 @@ 
                         )
                         {
                             $array1[$key] = self::merge($array1[$key], $value);
-                        }
-                        else
+                        } else
                         {
                             $array1[$key] = $value;
                         }
                     }
-                }
-                else
+                } else
                 {
                     foreach ($array2 as $value)
                     {
@@ -173,8 +169,7 @@ 
                         $column,
                     ]
                 );
-            }
-            else {
+            } else {
                 // same resolution as array_merge_recursive
                 if (!is_array($existing_value)) {
                     $existing_row[$column] = [$existing_value];
@@ -245,15 +240,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;
@@ -278,11 +276,13 @@ 
                           ;
 
         foreach ($row as $column => &$values) {
-            if (in_array($column, $excluded_columns))
-                continue;
+            if (in_array($column, $excluded_columns)) {
+                            continue;
+            }
 
-            if ($values instanceof MergeBucket)
-                $values = $values->toArray();
+            if ($values instanceof MergeBucket) {
+                            $values = $values->toArray();
+            }
         }
 
         return $row;
@@ -304,8 +304,7 @@ 
         foreach ($array as $key => $value) {
             if (is_scalar($value)) {
                 $id = $value;
-            }
-            else {
+            } else {
                 $id = serialize($value);
             }
 
@@ -329,11 +328,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)
             );
@@ -359,16 +356,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. "
@@ -395,17 +389,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(
@@ -416,12 +414,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) {