jclaveau / php-chainable-array

src/Arrays.php

Spacing +20 added lines, -20 removed lines

@@ -134,13 +134,13 @@ 
     public static function mergeRecursiveCustom(
         array $existing_row,
         array $conflict_row,
-        callable $merge_resolver=null,
-        $max_depth=null
-    ){
+        callable $merge_resolver = null,
+        $max_depth = null
+    ) {
         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;
             }
@@ -173,7 +173,7 @@ 
             }
             else {
                 // same resolution as array_merge_recursive
-                if (!is_array($existing_value)) {
+                if ( ! is_array($existing_value)) {
                     $existing_row[$column] = [$existing_value];
                 }
 
@@ -196,11 +196,11 @@ 
     public static function mergePreservingDistincts(
         array $existing_row,
         array $conflict_row
-    ){
+    ) {
         $merge = static::mergeRecursiveCustom(
             $existing_row,
             $conflict_row,
-            function ($existing_value, $conflict_value, $column) {
+            function($existing_value, $conflict_value, $column) {
 
                 if ( ! $existing_value instanceof MergeBucket) {
                     $existing_value = MergeBucket::from()->push($existing_value);
@@ -230,7 +230,7 @@ 
     {
         foreach ($merged_row as $entry => $values) {
             if ($values instanceof MergeBucket) {
-                $merged_row[ $entry ] = $values->toArray();
+                $merged_row[$entry] = $values->toArray();
             }
         }
 
@@ -242,10 +242,10 @@ 
      *
      * @see mergePreservingDistincts()
      */
-    public static function keepUniqueColumnValues(array $row, array $excluded_columns=[])
+    public static function keepUniqueColumnValues(array $row, array $excluded_columns = [])
     {
         foreach ($row as $column => &$values) {
-            if (!is_array($values))
+            if ( ! is_array($values))
                 continue;
 
             if (in_array($column, $excluded_columns))
@@ -269,7 +269,7 @@ 
      */
     public static function unique($array)
     {
-        if (! is_array($array) && ! $array instanceof \Traversable) {
+        if ( ! is_array($array) && ! $array instanceof \Traversable) {
             throw new \InvalidArgumentException(
                 "\$array must be an array or a \Traversable instead of: \n"
                 .var_export($array, true)
@@ -285,13 +285,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;
@@ -308,7 +308,7 @@ 
      */
     public static function sum($array)
     {
-        if (! is_array($array) && ! $array instanceof \Traversable) {
+        if ( ! is_array($array) && ! $array instanceof \Traversable) {
             throw new \InvalidArgumentException(
                 "\$array must be an array or a \Traversable instead of: \n"
                 .var_export($array, true)
@@ -384,16 +384,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;

Braces +38 added lines, -40 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)
                     {
@@ -170,8 +166,7 @@ 
                         $column,
                     ]
                 );
-            }
-            else {
+            } else {
                 // same resolution as array_merge_recursive
                 if (!is_array($existing_value)) {
                     $existing_row[$column] = [$existing_value];
@@ -245,15 +240,18 @@ 
     public static function keepUniqueColumnValues(array $row, array $excluded_columns=[])
     {
         foreach ($row as $column => &$values) {
-            if (!is_array($values))
-                continue;
+            if (!is_array($values)) {
+                            continue;
+            }
 
-            if (in_array($column, $excluded_columns))
-                continue;
+            if (in_array($column, $excluded_columns)) {
+                            continue;
+            }
 
             $values = array_unique($values);
-            if (count($values) == 1)
-                $values = $values[0];
+            if (count($values) == 1) {
+                            $values = $values[0];
+            }
         }
 
         return $row;
@@ -280,8 +278,7 @@ 
         foreach ($array as $key => $value) {
             if (is_scalar($value)) {
                 $id = $value;
-            }
-            else {
+            } else {
                 $id = serialize($value);
             }
 
@@ -319,28 +316,23 @@ 
         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 (version_compare(phpversion(), '7.0.0', '>=')) {
                     try {
                         $sum += $value->toNumber();
-                    }
-                    catch (\Exception $e) {
+                    } catch (\Exception $e) {
                         throw new \InvalidArgumentEXception(
                              "Trying to sum a ".get_class($value)." object which cannot be casted as a number. "
                             ."Please add a toNumber() method."
                         );
                     }
-                }
-                else {
+                } else {
                     if ( ! method_exists($value, 'toNumber')) {
                         throw new \InvalidArgumentEXception(
                              "Trying to sum a ".get_class($value)." object which cannot be casted as a number. "
@@ -368,17 +360,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(
@@ -389,12 +385,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) {