jclaveau / php-chainable-array

src/Arrays.php

Spacing +15 added lines, -15 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) {
-                $out[ $entry ] = $values->toArray();
+                $out[$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 \InvalidArgumentEXception(
                 "\$array must be an array or a \Traversable instead of: \n"
                 .var_export($array)
@@ -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;

src/ChainableArray_Utils_Trait.php

Spacing +58 added lines, -58 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;
                 }
             }
         }
@@ -102,9 +102,9 @@ 
     public static function mergeRecursiveCustom(
         array $existing_row,
         array $conflict_row,
-        callable $merge_resolver=null,
-        $max_depth=null
-    ){
+        callable $merge_resolver = null,
+        $max_depth = null
+    ) {
         return Arrays::mergePreservingDistincts(
             $existing_row,
             $conflict_row,
@@ -126,7 +126,7 @@ 
     /**
      * @deprecated Arrays::mergePreservingDistincts()
      */
-    public static function keepUniqueColumnValues(array $row, array $excluded_columns=[])
+    public static function keepUniqueColumnValues(array $row, array $excluded_columns = [])
     {
         return Arrays::keepUniqueColumnValues($row, $excluded_columns);
     }
@@ -147,7 +147,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
@@ -160,7 +160,7 @@ 
         $out = [];
         foreach ($this->data as $key => $row) {
 
-            if (!$row)
+            if ( ! $row)
                 continue;
 
             $newIndex       = call_user_func($indexGenerator, $key, $row);
@@ -169,7 +169,7 @@ 
                             ? call_user_func($rowTransformer, $row)
                             : $row;
 
-            if (!isset($out[$newIndex])) {
+            if ( ! isset($out[$newIndex])) {
                 $out[$newIndex] = $transformedRow;
             }
             else {
@@ -194,12 +194,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)
@@ -209,7 +209,7 @@ 
         $out = $this->data;
         foreach ($otherTable->getArray() as $key => $row) {
 
-            if (!isset($out[$key])) {
+            if ( ! isset($out[$key])) {
                 $out[$key] = $row;
             }
             else {
@@ -237,7 +237,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;
@@ -263,7 +263,7 @@ 
      */
     public function each(callable $rowTransformer)
     {
-        $out  = [];
+        $out = [];
         foreach ($this->data as $key => $row) {
             $out[$key] = call_user_func_array(
                 $rowTransformer,
@@ -293,7 +293,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) {
@@ -302,7 +302,7 @@ 
                 }
             }
             catch (\Exception $e) {
-                self::throwUsageException( $e->getMessage() );
+                self::throwUsageException($e->getMessage());
             }
 
             $out[$key] = $row;
@@ -354,20 +354,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;
             };
         }
@@ -399,7 +399,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);
@@ -436,12 +436,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
@@ -465,7 +465,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;
@@ -496,7 +496,7 @@ 
             }
             else {
 
-                if (!isset($rows)) {
+                if ( ! isset($rows)) {
                     echo json_encode([
                         '$rowIdParts' => $rowIdParts,
                         '$row' => $row,
@@ -555,12 +555,12 @@ 
 
             if (is_string($value) && array_key_exists($value, $row)) {
                 $part_name  .= $value;
-                $group_value = $row[ $value ];
+                $group_value = $row[$value];
             }
             elseif (is_callable($value)) {
 
                 if (is_string($value)) {
-                    $part_name  .= $value;
+                    $part_name .= $value;
                 }
                 // elseif (is_function($value)) {
                 elseif (is_object($value) && ($value instanceof Closure)) {
@@ -576,19 +576,19 @@ 
                 ]);
             }
             elseif (is_int($value)) {
-                $part_name  .= $value ? : '0';
-                $group_value = $row[ $value ];
+                $part_name  .= $value ?: '0';
+                $group_value = $row[$value];
             }
             else {
                 self::throwUsageException(
                     'Bad value provided for groupBy id generation: '
                     .var_export($value, true)
-                    ."\n" . var_export($row, true)
+                    ."\n".var_export($row, true)
                 );
             }
 
-            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)
@@ -606,9 +606,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
@@ -628,9 +628,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
@@ -648,9 +648,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
@@ -669,16 +669,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);
@@ -690,7 +690,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) {
@@ -757,13 +757,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,
         ]);
 
@@ -780,7 +780,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];
@@ -788,7 +788,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
                 );
             }
         }
@@ -804,7 +804,7 @@ 
      *
      * @return static $this or a new static.
      */
-    public function extract($callback=null)
+    public function extract($callback = null)
     {
         if ($callback) {
 
@@ -812,7 +812,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 "
@@ -824,7 +824,7 @@ 
             foreach ($this->data as $key => $value) {
                 if ($callback($value, $key)) {
                     $out[$key] = $value;
-                    unset( $this->data[$key] );
+                    unset($this->data[$key]);
                 }
             }
         }