jclaveau / php-chainable-array

src/Arrays/Arrays.php

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