jclaveau / php-chainable-array

src/Arrays/ChainableArray.php

Braces +4 added lines, -4 removed lines

@@ -31,8 +31,9 @@ 
     {
         Arrays::mustBeCountable($data);
 
-        if ($data instanceof self)
-            return $data;
+        if ($data instanceof self) {
+                    return $data;
+        }
 
         return new static($data, $isConstant);
     }
@@ -101,8 +102,7 @@ 
     {
         if ($this->isConstant) {
             return new static($out);
-        }
-        else {
+        } else {
             $this->data = $out;
             return $this;
         }

src/Arrays/Arrays.php

Braces +55 added lines, -54 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) {
@@ -460,8 +460,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"
@@ -498,8 +499,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"
@@ -573,8 +575,7 @@ 
             if (is_string($group_definition_value) && array_key_exists($group_definition_value, $row)) {
                 $part_name         .= $group_definition_value;
                 $group_result_value = $row[ $group_definition_value ];
-            }
-            elseif (is_int($group_definition_value)) {
+            } elseif (is_int($group_definition_value)) {
                 $part_name         .= $group_definition_value ? : '0';
                 $group_result_value = $row[ $group_definition_value ];
             }
@@ -606,8 +607,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)
@@ -620,8 +622,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) );
             }
 

src/Arrays/ChainableArray_NativeFunctions_Trait.php

Braces +67 added lines, -64 removed lines

@@ -26,8 +26,9 @@ 
         $out = [];
         foreach ($this->data as $key => &$row) {
 
-            if ($index_key)
-                $key = $row[$index_key];
+            if ($index_key) {
+                            $key = $row[$index_key];
+            }
 
             if (is_array($column_names)) {
                 $out[$key] = [];
@@ -42,20 +43,16 @@ 
 
                     $out[$key][$column_name] = $row[$column_name];
                 }
-            }
-            else {
+            } else {
                 // This avoids issues with isset, array_key_exists and
                 // null entries on objects and arrays.
                 if ($row instanceof static) {
                     $keys = $row->copy()->keys();
-                }
-                elseif (is_array($row)) {
+                } elseif (is_array($row)) {
                     $keys = array_keys($row);
-                }
-                elseif (is_scalar($row)) {
+                } elseif (is_scalar($row)) {
                     $keys = [];
-                }
-                else {
+                } else {
                     // todo : handle other classes supporting ArrayAccess?
                     $keys = [];
                 }
@@ -101,16 +98,17 @@ 
      */
     public function min($default_value=null)
     {
-        if ($this->isEmpty() && $default_value !== null)
-            return $default_value;
+        if ($this->isEmpty() && $default_value !== null) {
+                    return $default_value;
+        }
 
         try {
             return min($this->data);
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             $message = $e->getMessage();
-            if ($e->getMessage() == 'min(): Array must contain at least one element')
-                $message .= ' or you can set a default value as parameter';
+            if ($e->getMessage() == 'min(): Array must contain at least one element') {
+                            $message .= ' or you can set a default value as parameter';
+            }
 
             $this->throwUsageException($message);
         }
@@ -124,16 +122,17 @@ 
      */
     public function max($default_value=null)
     {
-        if ($this->isEmpty() && $default_value !== null)
-            return $default_value;
+        if ($this->isEmpty() && $default_value !== null) {
+                    return $default_value;
+        }
 
         try {
             return max($this->data);
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             $message = $e->getMessage();
-            if ($e->getMessage() == 'max(): Array must contain at least one element')
-                $message .= ' or you can set a default value as parameter';
+            if ($e->getMessage() == 'max(): Array must contain at least one element') {
+                            $message .= ' or you can set a default value as parameter';
+            }
 
             $this->throwUsageException($message);
         }
@@ -200,16 +199,15 @@ 
             if (PHP_VERSION_ID >= 50600) {
                 $out = array_filter($this->data, $callback,
                     ARRAY_FILTER_USE_BOTH);
-            }
-            else {
+            } else {
                 $out = $this->data;
                 foreach ($out as $key => $value) {
-                    if (!$callback($value, $key))
-                        unset( $out[$key] );
+                    if (!$callback($value, $key)) {
+                                            unset( $out[$key] );
+                    }
                 }
             }
-        }
-        else {
+        } else {
             $out = array_filter($this->data);
         }
 
@@ -242,8 +240,9 @@ 
         $out = [];
         foreach ($this->data as $i => $data_item) {
 
-            if ($data_item == $item_to_remove)
-                continue;
+            if ($data_item == $item_to_remove) {
+                            continue;
+            }
 
             $out[$i] = $data_item;
         }
@@ -258,11 +257,13 @@ 
      */
     public function intersectKey($intersect_with)
     {
-        if (!$this->argumentIsArrayOrArrayObject($intersect_with))
-            self::throwUsageException("First argument must be an array or a ".static::class.".");
+        if (!$this->argumentIsArrayOrArrayObject($intersect_with)) {
+                    self::throwUsageException("First argument must be an array or a ".static::class.".");
+        }
 
-        if ($intersect_with instanceof static)
-            $intersect_with = $intersect_with->getArray();
+        if ($intersect_with instanceof static) {
+                    $intersect_with = $intersect_with->getArray();
+        }
 
         $out = array_intersect_key($this->data, $intersect_with);
 
@@ -351,8 +352,9 @@ 
      */
     public function diff($compare_with, $check_keys=false, $strict_comparison=false)
     {
-        if (!$this->argumentIsArrayOrArrayObject($compare_with))
-            self::throwUsageException("First argument must be an iterable");
+        if (!$this->argumentIsArrayOrArrayObject($compare_with)) {
+                    self::throwUsageException("First argument must be an iterable");
+        }
 
         $kept_values = $this->data;
 
@@ -368,21 +370,18 @@ 
                             &&  $kept_value === $compared_value ) {
                             $is_equal = true;
                         }
-                    }
-                    else {
+                    } else {
                         if (    $kept_key   == $compared_key
                             &&  $kept_value == $compared_value ) {
                             $is_equal = true;
                         }
                     }
-                }
-                else {
+                } else {
                     if ($strict_comparison) {
                         if ($kept_value === $compared_value) {
                             $is_equal = true;
                         }
-                    }
-                    else {
+                    } else {
                         if ($kept_value == $compared_value) {
                             $is_equal = true;
                         }
@@ -421,11 +420,13 @@ 
      */
     public function fillKeys($keys, $value)
     {
-        if (!$this->argumentIsArrayOrArrayObject($keys))
-            self::throwUsageException("First argument must be an array or a ".static::class.".");
+        if (!$this->argumentIsArrayOrArrayObject($keys)) {
+                    self::throwUsageException("First argument must be an array or a ".static::class.".");
+        }
 
-        if ($keys instanceof static)
-            $keys = $keys->getArray();
+        if ($keys instanceof static) {
+                    $keys = $keys->getArray();
+        }
 
         $out = array_fill_keys($keys, $value);
         return $this->returnConstant($out);
@@ -470,8 +471,9 @@ 
         callable $step_generator,
         $max_interations_count=1000
     ){
-        if ($max_interations_count < 0)
-            throw new \InvalidArgumentException("$maximum_interations_count must be positive");
+        if ($max_interations_count < 0) {
+                    throw new \InvalidArgumentException("$maximum_interations_count must be positive");
+        }
 
         $out                 = [];
         $previous_step_value = null;
@@ -488,16 +490,14 @@ 
 
             if ($current_step_key === null) {
                 $out[] = $current_step_value;
-            }
-            elseif (!is_int($current_step_key)) {
+            } elseif (!is_int($current_step_key)) {
                 // Set the local as en_US tu have floats formatted with
                 // "." as separator
                 // TODO : could it be useful for dates to?
                 $current_locale = setlocale(LC_NUMERIC, 'en_US');
                 $out[(string) $current_step_key] = $current_step_value;
                 setlocale(LC_NUMERIC, $current_locale);
-            }
-            else {
+            } else {
                 $out[$current_step_key] = $current_step_value;
             }
 
@@ -508,8 +508,7 @@ 
                 if ((string) $current_step_key == (string) $end_key) {
                     break;
                 }
-            }
-            elseif ($current_step_key == $end_key) {
+            } elseif ($current_step_key == $end_key) {
                 break;
             }
 
@@ -529,10 +528,11 @@ 
      */
     public function keys($search_value=null, $strict=false)
     {
-        if ($search_value)
-            return array_keys($this->data, $search_value, $strict);
-        else
-            return array_keys($this->data);
+        if ($search_value) {
+                    return array_keys($this->data, $search_value, $strict);
+        } else {
+                    return array_keys($this->data);
+        }
     }
 
     /**
@@ -640,8 +640,9 @@ 
 
         if ($callback === null) {
             $callback = function($a, $b) {
-                if ($a == $b)
-                    return 0;
+                if ($a == $b) {
+                                    return 0;
+                }
 
                 return $a > $b ? -1 : 1;
             };
@@ -649,8 +650,9 @@ 
 
         $arguments = Arrays::merge( [&$data], [$callback] );
 
-        if ( ! call_user_func_array('uasort', $arguments) )
-            throw new \ErrorException('Unable to apply usort');
+        if ( ! call_user_func_array('uasort', $arguments) ) {
+                    throw new \ErrorException('Unable to apply usort');
+        }
 
         return $this->returnConstant($data);
     }
@@ -672,8 +674,9 @@ 
 
         $arguments = Arrays::merge( [&$data], [$callback] );
 
-        if ( ! call_user_func_array('uksort', $arguments) )
-            throw new \ErrorException('Unable to apply uksort');
+        if ( ! call_user_func_array('uksort', $arguments) ) {
+                    throw new \ErrorException('Unable to apply uksort');
+        }
 
         return $this->returnConstant($data);
     }

src/Arrays/ChainableArray_ArrayAccess_Trait.php

Braces +8 added lines, -10 removed lines

@@ -18,8 +18,7 @@ 
     {
         if (is_null($offset)) {
             $this->data[] = $value;
-        }
-        else {
+        } else {
             $this->data[$offset] = $value;
         }
     }
@@ -31,8 +30,7 @@ 
     {
         try {
             return isset($this->data[$offset]);
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             if (property_exists($this, 'defaultRowGenerator')) {
                 return true;
             }
@@ -77,8 +75,7 @@ 
             // support but wouldn't throw exception if it doesn't exist
             $returnValue = &$this->data[$offset];
             return $returnValue;
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             // here we simply move the Exception location at the one
             // of the caller as the isset() method is called at its
             // location.
@@ -158,10 +155,11 @@ 
      */
     protected function generateDefaultRow($offset)
     {
-        if (property_exists($this, 'defaultRow'))
-            return $this->defaultRow;
-        elseif (property_exists($this, 'defaultRowGenerator'))
-            return call_user_func($this->defaultRowGenerator, $offset);
+        if (property_exists($this, 'defaultRow')) {
+                    return $this->defaultRow;
+        } elseif (property_exists($this, 'defaultRowGenerator')) {
+                    return call_user_func($this->defaultRowGenerator, $offset);
+        }
     }
 
     /**/

src/Arrays/ChainableArray_Wip_Trait.php

Braces +28 added lines, -24 removed lines

@@ -91,8 +91,9 @@ 
     {
         $column_name = $key_column_names->shift();
 
-        if (!$column_name)
-            return $rows;
+        if (!$column_name) {
+                    return $rows;
+        }
 
         // $out = new static;
         $out = [];
@@ -107,10 +108,10 @@ 
 
                 foreach ($sub_rows as $row) {
                     try {
-                        if (is_array($row))
-                            $row[$column_name] = $key;
-                    }
-                    catch (\Exception $e) {
+                        if (is_array($row)) {
+                                                    $row[$column_name] = $key;
+                        }
+                    } catch (\Exception $e) {
                         echo json_encode($column_name);
                         echo json_encode($key);
                         echo json_encode($e);
@@ -118,13 +119,12 @@ 
                     }
                     $out[] = $row;
                 }
-            }
-            else {
+            } else {
                 try {
-                    if (is_array($sub_rows))
-                        $sub_rows[$column_name] = $key;
-                }
-                catch (\Exception $e) {
+                    if (is_array($sub_rows)) {
+                                            $sub_rows[$column_name] = $key;
+                    }
+                } catch (\Exception $e) {
                     echo json_encode($sub_rows);
                     echo json_encode($column_name);
                     echo json_encode($key);
@@ -299,8 +299,9 @@ 
             ),
         );
 
-        if ($expected != $tableized->getArray())
-            throw new \Exception("test failed");
+        if ($expected != $tableized->getArray()) {
+                    throw new \Exception("test failed");
+        }
 
         echo 'Helper_Tabe->tableize tested successfully';
     }
@@ -327,13 +328,15 @@ 
      */
     private function piramidize_aux($key_column_names, $rows)
     {
-        if (!is_array($rows))
-            return $rows;
+        if (!is_array($rows)) {
+                    return $rows;
+        }
 
         $column_name = $key_column_names->shift();
 
-        if (!$column_name)
-            return $rows;
+        if (!$column_name) {
+                    return $rows;
+        }
 
         // $out = new static;
         $out = [];
@@ -348,12 +351,12 @@ 
             unset($row[$column_name]);
 
             if ($key_column_names->count()) {
-                if (!isset($out[$key]))
-                    $out[$key] = [];
+                if (!isset($out[$key])) {
+                                    $out[$key] = [];
+                }
 
                 $out[$key][] = $row;
-            }
-            else {
+            } else {
                 $out[$key] = $row;
             }
         }
@@ -529,8 +532,9 @@ 
         // echo var_export($values->getArray());
         // $values->dumpJson(true);
 
-        if ($expected != $values->getArray())
-            throw new \Exception("test failed");
+        if ($expected != $values->getArray()) {
+                    throw new \Exception("test failed");
+        }
 
         echo 'Helper_Tabe->piramidize tested successfully';
     }

src/Arrays/ChainableArray_Utils_Trait.php

Braces +70 added lines, -66 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) {
@@ -492,12 +496,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);
@@ -514,12 +518,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);
@@ -534,12 +538,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);
@@ -555,12 +559,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);
@@ -582,8 +586,7 @@ 
                     break;
                 }
             }
-        }
-        elseif ($strict) {
+        } elseif ($strict) {
             throw new \ErrorException("Unable to move the internal pointer to a key that doesn't exist.");
         }
 
@@ -650,8 +653,9 @@ 
             'data'     => $this->data,
         ]);
 
-        if ($exit)
-            exit;
+        if ($exit) {
+                    exit;
+        }
 
         return $this;
     }