@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | */ |
| 57 | 57 | public function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) { |
| 58 | 58 | |
| 59 | - $entry_default_fields['custom'] = array( |
|
| 59 | + $entry_default_fields[ 'custom' ] = array( |
|
| 60 | 60 | 'label' => $this->label, |
| 61 | 61 | 'type' => $this->name, |
| 62 | 62 | 'desc' => $this->description, |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | |
| 70 | 70 | public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) { |
| 71 | 71 | |
| 72 | - unset ( $field_options['search_filter'], $field_options['show_as_link'], $field_options['new_window'] ); |
|
| 72 | + unset ( $field_options[ 'search_filter' ], $field_options[ 'show_as_link' ], $field_options[ 'new_window' ] ); |
|
| 73 | 73 | |
| 74 | 74 | $new_fields = array( |
| 75 | 75 | 'content' => array( |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | ); |
| 113 | 113 | |
| 114 | 114 | if ( 'edit' === $context ) { |
| 115 | - unset( $field_options['custom_label'], $field_options['show_label'], $field_options['allow_edit_cap'], $new_fields['wpautop'], $new_fields['oembed'] ); |
|
| 115 | + unset( $field_options[ 'custom_label' ], $field_options[ 'show_label' ], $field_options[ 'allow_edit_cap' ], $new_fields[ 'wpautop' ], $new_fields[ 'oembed' ] ); |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | return $new_fields + $field_options; |
@@ -146,9 +146,9 @@ discard block |
||
| 146 | 146 | |
| 147 | 147 | // Loop through the configured Edit Entry fields and add Custom Content fields if there are any |
| 148 | 148 | // TODO: Make this available to other custom GV field types |
| 149 | - foreach ( (array) $edit_fields as $edit_field ) { |
|
| 149 | + foreach ( (array)$edit_fields as $edit_field ) { |
|
| 150 | 150 | |
| 151 | - if( 'custom' === \GV\Utils::get( $edit_field, 'id') ) { |
|
| 151 | + if ( 'custom' === \GV\Utils::get( $edit_field, 'id' ) ) { |
|
| 152 | 152 | |
| 153 | 153 | $field_data = array( |
| 154 | 154 | 'label' => \GV\Utils::get( $edit_field, 'custom_label' ), |
@@ -162,13 +162,13 @@ discard block |
||
| 162 | 162 | $field_data[ $key ] = GravityView_Merge_Tags::replace_variables( $field_datum, $form, $entry_data, false, false ); |
| 163 | 163 | } |
| 164 | 164 | |
| 165 | - $field_data['cssClass'] = \GV\Utils::get( $edit_field, 'custom_class' ); |
|
| 165 | + $field_data[ 'cssClass' ] = \GV\Utils::get( $edit_field, 'custom_class' ); |
|
| 166 | 166 | |
| 167 | - $new_fields[] = new GF_Field_HTML( $field_data ); |
|
| 167 | + $new_fields[ ] = new GF_Field_HTML( $field_data ); |
|
| 168 | 168 | |
| 169 | 169 | } else { |
| 170 | - if( isset( $fields[ $i ] ) ) { |
|
| 171 | - $new_fields[] = $fields[ $i ]; |
|
| 170 | + if ( isset( $fields[ $i ] ) ) { |
|
| 171 | + $new_fields[ ] = $fields[ $i ]; |
|
| 172 | 172 | } |
| 173 | 173 | $i++; |
| 174 | 174 | } |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | $signature_fields = GFAPI::get_fields_by_type( $form, 'signature' ); |
| 54 | 54 | |
| 55 | 55 | foreach ( $signature_fields as $field ) { |
| 56 | - unset( $_POST["input_{$field->id}"] ); |
|
| 56 | + unset( $_POST[ "input_{$field->id}" ] ); |
|
| 57 | 57 | } |
| 58 | 58 | } |
| 59 | 59 | |
@@ -72,19 +72,19 @@ discard block |
||
| 72 | 72 | */ |
| 73 | 73 | function edit_entry_field_input( $field_content = '', $field = null, $value = '', $lead_id = 0, $form_id = 0 ) { |
| 74 | 74 | |
| 75 | - $context = function_exists('gravityview_get_context') ? gravityview_get_context() : ''; |
|
| 75 | + $context = function_exists( 'gravityview_get_context' ) ? gravityview_get_context() : ''; |
|
| 76 | 76 | |
| 77 | - if( 'signature' !== $field->type || 'edit' !== $context ) { |
|
| 77 | + if ( 'signature' !== $field->type || 'edit' !== $context ) { |
|
| 78 | 78 | return $field_content; |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | // We need to fetch a fresh version of the entry, since the saved entry hasn't refreshed in GV yet. |
| 82 | 82 | $entry = GravityView_View::getInstance()->getCurrentEntry(); |
| 83 | - $entry = GFAPI::get_entry( $entry['id'] ); |
|
| 83 | + $entry = GFAPI::get_entry( $entry[ 'id' ] ); |
|
| 84 | 84 | $entry_value = \GV\Utils::get( $entry, $field->id ); |
| 85 | 85 | |
| 86 | - $_POST["input_{$field->id}"] = $entry_value; // Used when Edit Entry form *is* submitted |
|
| 87 | - $_POST["input_{$form_id}_{$field->id}_signature_filename"] = $entry_value; // Used when Edit Entry form *is not* submitted |
|
| 86 | + $_POST[ "input_{$field->id}" ] = $entry_value; // Used when Edit Entry form *is* submitted |
|
| 87 | + $_POST[ "input_{$form_id}_{$field->id}_signature_filename" ] = $entry_value; // Used when Edit Entry form *is not* submitted |
|
| 88 | 88 | |
| 89 | 89 | return ''; // Return empty string to force using $_POST values instead |
| 90 | 90 | } |
@@ -12,7 +12,7 @@ discard block |
||
| 12 | 12 | * |
| 13 | 13 | * @var array |
| 14 | 14 | */ |
| 15 | - protected static $macros = []; |
|
| 15 | + protected static $macros = [ ]; |
|
| 16 | 16 | |
| 17 | 17 | /** |
| 18 | 18 | * Register a custom macro. |
@@ -21,9 +21,9 @@ discard block |
||
| 21 | 21 | * @param callable $macro |
| 22 | 22 | * @return void |
| 23 | 23 | */ |
| 24 | - public static function macro($name, callable $macro) |
|
| 24 | + public static function macro( $name, callable $macro ) |
|
| 25 | 25 | { |
| 26 | - static::$macros[$name] = $macro; |
|
| 26 | + static::$macros[ $name ] = $macro; |
|
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | /** |
@@ -32,9 +32,9 @@ discard block |
||
| 32 | 32 | * @param string $name |
| 33 | 33 | * @return bool |
| 34 | 34 | */ |
| 35 | - public static function hasMacro($name) |
|
| 35 | + public static function hasMacro( $name ) |
|
| 36 | 36 | { |
| 37 | - return isset(static::$macros[$name]); |
|
| 37 | + return isset( static::$macros[ $name ] ); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | /** |
@@ -46,17 +46,17 @@ discard block |
||
| 46 | 46 | * |
| 47 | 47 | * @throws \BadMethodCallException |
| 48 | 48 | */ |
| 49 | - public static function __callStatic($method, $parameters) |
|
| 49 | + public static function __callStatic( $method, $parameters ) |
|
| 50 | 50 | { |
| 51 | - if (! static::hasMacro($method)) { |
|
| 52 | - throw new BadMethodCallException("Method {$method} does not exist."); |
|
| 51 | + if ( ! static::hasMacro( $method ) ) { |
|
| 52 | + throw new BadMethodCallException( "Method {$method} does not exist." ); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - if (static::$macros[$method] instanceof Closure) { |
|
| 56 | - return call_user_func_array(Closure::bind(static::$macros[$method], null, static::class), $parameters); |
|
| 55 | + if ( static::$macros[ $method ] instanceof Closure ) { |
|
| 56 | + return call_user_func_array( Closure::bind( static::$macros[ $method ], null, static::class ), $parameters ); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | - return call_user_func_array(static::$macros[$method], $parameters); |
|
| 59 | + return call_user_func_array( static::$macros[ $method ], $parameters ); |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | /** |
@@ -68,16 +68,16 @@ discard block |
||
| 68 | 68 | * |
| 69 | 69 | * @throws \BadMethodCallException |
| 70 | 70 | */ |
| 71 | - public function __call($method, $parameters) |
|
| 71 | + public function __call( $method, $parameters ) |
|
| 72 | 72 | { |
| 73 | - if (! static::hasMacro($method)) { |
|
| 74 | - throw new BadMethodCallException("Method {$method} does not exist."); |
|
| 73 | + if ( ! static::hasMacro( $method ) ) { |
|
| 74 | + throw new BadMethodCallException( "Method {$method} does not exist." ); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - if (static::$macros[$method] instanceof Closure) { |
|
| 78 | - return call_user_func_array(static::$macros[$method]->bindTo($this, static::class), $parameters); |
|
| 77 | + if ( static::$macros[ $method ] instanceof Closure ) { |
|
| 78 | + return call_user_func_array( static::$macros[ $method ]->bindTo( $this, static::class ), $parameters ); |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - return call_user_func_array(static::$macros[$method], $parameters); |
|
| 81 | + return call_user_func_array( static::$macros[ $method ], $parameters ); |
|
| 82 | 82 | } |
| 83 | 83 | } |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | * @param string $method |
| 29 | 29 | * @return void |
| 30 | 30 | */ |
| 31 | - public function __construct(Collection $collection, $method) |
|
| 31 | + public function __construct( Collection $collection, $method ) |
|
| 32 | 32 | { |
| 33 | 33 | $this->method = $method; |
| 34 | 34 | $this->collection = $collection; |
@@ -40,10 +40,10 @@ discard block |
||
| 40 | 40 | * @param string $key |
| 41 | 41 | * @return mixed |
| 42 | 42 | */ |
| 43 | - public function __get($key) |
|
| 43 | + public function __get( $key ) |
|
| 44 | 44 | { |
| 45 | - return $this->collection->{$this->method}(function ($value) use ($key) { |
|
| 46 | - return is_array($value) ? $value[$key] : $value->{$key}; |
|
| 45 | + return $this->collection->{$this->method}( function( $value ) use ( $key ) { |
|
| 46 | + return is_array( $value ) ? $value[ $key ] : $value->{$key}; |
|
| 47 | 47 | }); |
| 48 | 48 | } |
| 49 | 49 | |
@@ -54,10 +54,10 @@ discard block |
||
| 54 | 54 | * @param array $parameters |
| 55 | 55 | * @return mixed |
| 56 | 56 | */ |
| 57 | - public function __call($method, $parameters) |
|
| 57 | + public function __call( $method, $parameters ) |
|
| 58 | 58 | { |
| 59 | - return $this->collection->{$this->method}(function ($value) use ($method, $parameters) { |
|
| 60 | - return $value->{$method}(...$parameters); |
|
| 59 | + return $this->collection->{$this->method}( function( $value ) use ( $method, $parameters ) { |
|
| 60 | + return $value->{$method}( ...$parameters ); |
|
| 61 | 61 | }); |
| 62 | 62 | } |
| 63 | 63 | } |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | * |
| 24 | 24 | * @var array |
| 25 | 25 | */ |
| 26 | - protected $items = []; |
|
| 26 | + protected $items = [ ]; |
|
| 27 | 27 | |
| 28 | 28 | /** |
| 29 | 29 | * The methods that can be proxied. |
@@ -41,9 +41,9 @@ discard block |
||
| 41 | 41 | * @param mixed $items |
| 42 | 42 | * @return void |
| 43 | 43 | */ |
| 44 | - public function __construct($items = []) |
|
| 44 | + public function __construct( $items = [ ] ) |
|
| 45 | 45 | { |
| 46 | - $this->items = $this->getArrayableItems($items); |
|
| 46 | + $this->items = $this->getArrayableItems( $items ); |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | /** |
@@ -52,9 +52,9 @@ discard block |
||
| 52 | 52 | * @param mixed $items |
| 53 | 53 | * @return static |
| 54 | 54 | */ |
| 55 | - public static function make($items = []) |
|
| 55 | + public static function make( $items = [ ] ) |
|
| 56 | 56 | { |
| 57 | - return new static($items); |
|
| 57 | + return new static( $items ); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | /** |
@@ -64,17 +64,17 @@ discard block |
||
| 64 | 64 | * @param callable $callback |
| 65 | 65 | * @return static |
| 66 | 66 | */ |
| 67 | - public static function times($number, callable $callback = null) |
|
| 67 | + public static function times( $number, callable $callback = null ) |
|
| 68 | 68 | { |
| 69 | - if ($number < 1) { |
|
| 69 | + if ( $number < 1 ) { |
|
| 70 | 70 | return new static; |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | - if (is_null($callback)) { |
|
| 74 | - return new static(range(1, $number)); |
|
| 73 | + if ( is_null( $callback ) ) { |
|
| 74 | + return new static( range( 1, $number ) ); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - return (new static(range(1, $number)))->map($callback); |
|
| 77 | + return ( new static( range( 1, $number ) ) )->map( $callback ); |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | /** |
@@ -93,10 +93,10 @@ discard block |
||
| 93 | 93 | * @param callable|string|null $callback |
| 94 | 94 | * @return mixed |
| 95 | 95 | */ |
| 96 | - public function avg($callback = null) |
|
| 96 | + public function avg( $callback = null ) |
|
| 97 | 97 | { |
| 98 | - if ($count = $this->count()) { |
|
| 99 | - return $this->sum($callback) / $count; |
|
| 98 | + if ( $count = $this->count() ) { |
|
| 99 | + return $this->sum( $callback ) / $count; |
|
| 100 | 100 | } |
| 101 | 101 | } |
| 102 | 102 | |
@@ -106,9 +106,9 @@ discard block |
||
| 106 | 106 | * @param callable|string|null $callback |
| 107 | 107 | * @return mixed |
| 108 | 108 | */ |
| 109 | - public function average($callback = null) |
|
| 109 | + public function average( $callback = null ) |
|
| 110 | 110 | { |
| 111 | - return $this->avg($callback); |
|
| 111 | + return $this->avg( $callback ); |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | /** |
@@ -117,26 +117,26 @@ discard block |
||
| 117 | 117 | * @param null $key |
| 118 | 118 | * @return mixed |
| 119 | 119 | */ |
| 120 | - public function median($key = null) |
|
| 120 | + public function median( $key = null ) |
|
| 121 | 121 | { |
| 122 | 122 | $count = $this->count(); |
| 123 | 123 | |
| 124 | - if ($count == 0) { |
|
| 124 | + if ( $count == 0 ) { |
|
| 125 | 125 | return; |
| 126 | 126 | } |
| 127 | 127 | |
| 128 | - $values = with(isset($key) ? $this->pluck($key) : $this) |
|
| 128 | + $values = with( isset( $key ) ? $this->pluck( $key ) : $this ) |
|
| 129 | 129 | ->sort()->values(); |
| 130 | 130 | |
| 131 | - $middle = (int) ($count / 2); |
|
| 131 | + $middle = (int)( $count / 2 ); |
|
| 132 | 132 | |
| 133 | - if ($count % 2) { |
|
| 134 | - return $values->get($middle); |
|
| 133 | + if ( $count % 2 ) { |
|
| 134 | + return $values->get( $middle ); |
|
| 135 | 135 | } |
| 136 | 136 | |
| 137 | - return (new static([ |
|
| 138 | - $values->get($middle - 1), $values->get($middle), |
|
| 139 | - ]))->average(); |
|
| 137 | + return ( new static( [ |
|
| 138 | + $values->get( $middle - 1 ), $values->get( $middle ), |
|
| 139 | + ] ) )->average(); |
|
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | /** |
@@ -145,27 +145,27 @@ discard block |
||
| 145 | 145 | * @param mixed $key |
| 146 | 146 | * @return array|null |
| 147 | 147 | */ |
| 148 | - public function mode($key = null) |
|
| 148 | + public function mode( $key = null ) |
|
| 149 | 149 | { |
| 150 | 150 | $count = $this->count(); |
| 151 | 151 | |
| 152 | - if ($count == 0) { |
|
| 152 | + if ( $count == 0 ) { |
|
| 153 | 153 | return; |
| 154 | 154 | } |
| 155 | 155 | |
| 156 | - $collection = isset($key) ? $this->pluck($key) : $this; |
|
| 156 | + $collection = isset( $key ) ? $this->pluck( $key ) : $this; |
|
| 157 | 157 | |
| 158 | 158 | $counts = new self; |
| 159 | 159 | |
| 160 | - $collection->each(function ($value) use ($counts) { |
|
| 161 | - $counts[$value] = isset($counts[$value]) ? $counts[$value] + 1 : 1; |
|
| 160 | + $collection->each( function( $value ) use ( $counts ) { |
|
| 161 | + $counts[ $value ] = isset( $counts[ $value ] ) ? $counts[ $value ] + 1 : 1; |
|
| 162 | 162 | }); |
| 163 | 163 | |
| 164 | 164 | $sorted = $counts->sort(); |
| 165 | 165 | |
| 166 | 166 | $highestValue = $sorted->last(); |
| 167 | 167 | |
| 168 | - return $sorted->filter(function ($value) use ($highestValue) { |
|
| 168 | + return $sorted->filter( function( $value ) use ( $highestValue ) { |
|
| 169 | 169 | return $value == $highestValue; |
| 170 | 170 | })->sort()->keys()->all(); |
| 171 | 171 | } |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | */ |
| 178 | 178 | public function collapse() |
| 179 | 179 | { |
| 180 | - return new static(Arr::collapse($this->items)); |
|
| 180 | + return new static( Arr::collapse( $this->items ) ); |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | /** |
@@ -188,23 +188,23 @@ discard block |
||
| 188 | 188 | * @param mixed $value |
| 189 | 189 | * @return bool |
| 190 | 190 | */ |
| 191 | - public function contains($key, $operator = null, $value = null) |
|
| 191 | + public function contains( $key, $operator = null, $value = null ) |
|
| 192 | 192 | { |
| 193 | - if (func_num_args() == 1) { |
|
| 194 | - if ($this->useAsCallable($key)) { |
|
| 195 | - return ! is_null($this->first($key)); |
|
| 193 | + if ( func_num_args() == 1 ) { |
|
| 194 | + if ( $this->useAsCallable( $key ) ) { |
|
| 195 | + return ! is_null( $this->first( $key ) ); |
|
| 196 | 196 | } |
| 197 | 197 | |
| 198 | - return in_array($key, $this->items); |
|
| 198 | + return in_array( $key, $this->items ); |
|
| 199 | 199 | } |
| 200 | 200 | |
| 201 | - if (func_num_args() == 2) { |
|
| 201 | + if ( func_num_args() == 2 ) { |
|
| 202 | 202 | $value = $operator; |
| 203 | 203 | |
| 204 | 204 | $operator = '='; |
| 205 | 205 | } |
| 206 | 206 | |
| 207 | - return $this->contains($this->operatorForWhere($key, $operator, $value)); |
|
| 207 | + return $this->contains( $this->operatorForWhere( $key, $operator, $value ) ); |
|
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | /** |
@@ -214,19 +214,19 @@ discard block |
||
| 214 | 214 | * @param mixed $value |
| 215 | 215 | * @return bool |
| 216 | 216 | */ |
| 217 | - public function containsStrict($key, $value = null) |
|
| 217 | + public function containsStrict( $key, $value = null ) |
|
| 218 | 218 | { |
| 219 | - if (func_num_args() == 2) { |
|
| 220 | - return $this->contains(function ($item) use ($key, $value) { |
|
| 221 | - return data_get($item, $key) === $value; |
|
| 219 | + if ( func_num_args() == 2 ) { |
|
| 220 | + return $this->contains( function( $item ) use ( $key, $value ) { |
|
| 221 | + return data_get( $item, $key ) === $value; |
|
| 222 | 222 | }); |
| 223 | 223 | } |
| 224 | 224 | |
| 225 | - if ($this->useAsCallable($key)) { |
|
| 226 | - return ! is_null($this->first($key)); |
|
| 225 | + if ( $this->useAsCallable( $key ) ) { |
|
| 226 | + return ! is_null( $this->first( $key ) ); |
|
| 227 | 227 | } |
| 228 | 228 | |
| 229 | - return in_array($key, $this->items, true); |
|
| 229 | + return in_array( $key, $this->items, true ); |
|
| 230 | 230 | } |
| 231 | 231 | |
| 232 | 232 | /** |
@@ -235,11 +235,11 @@ discard block |
||
| 235 | 235 | * @param mixed ...$lists |
| 236 | 236 | * @return static |
| 237 | 237 | */ |
| 238 | - public function crossJoin(...$lists) |
|
| 238 | + public function crossJoin( ...$lists ) |
|
| 239 | 239 | { |
| 240 | - return new static(Arr::crossJoin( |
|
| 241 | - $this->items, ...array_map([$this, 'getArrayableItems'], $lists) |
|
| 242 | - )); |
|
| 240 | + return new static( Arr::crossJoin( |
|
| 241 | + $this->items, ...array_map( [ $this, 'getArrayableItems' ], $lists ) |
|
| 242 | + ) ); |
|
| 243 | 243 | } |
| 244 | 244 | |
| 245 | 245 | /** |
@@ -248,9 +248,9 @@ discard block |
||
| 248 | 248 | * @param mixed $items |
| 249 | 249 | * @return static |
| 250 | 250 | */ |
| 251 | - public function diff($items) |
|
| 251 | + public function diff( $items ) |
|
| 252 | 252 | { |
| 253 | - return new static(array_diff($this->items, $this->getArrayableItems($items))); |
|
| 253 | + return new static( array_diff( $this->items, $this->getArrayableItems( $items ) ) ); |
|
| 254 | 254 | } |
| 255 | 255 | |
| 256 | 256 | /** |
@@ -259,9 +259,9 @@ discard block |
||
| 259 | 259 | * @param mixed $items |
| 260 | 260 | * @return static |
| 261 | 261 | */ |
| 262 | - public function diffAssoc($items) |
|
| 262 | + public function diffAssoc( $items ) |
|
| 263 | 263 | { |
| 264 | - return new static(array_diff_assoc($this->items, $this->getArrayableItems($items))); |
|
| 264 | + return new static( array_diff_assoc( $this->items, $this->getArrayableItems( $items ) ) ); |
|
| 265 | 265 | } |
| 266 | 266 | |
| 267 | 267 | /** |
@@ -270,9 +270,9 @@ discard block |
||
| 270 | 270 | * @param mixed $items |
| 271 | 271 | * @return static |
| 272 | 272 | */ |
| 273 | - public function diffKeys($items) |
|
| 273 | + public function diffKeys( $items ) |
|
| 274 | 274 | { |
| 275 | - return new static(array_diff_key($this->items, $this->getArrayableItems($items))); |
|
| 275 | + return new static( array_diff_key( $this->items, $this->getArrayableItems( $items ) ) ); |
|
| 276 | 276 | } |
| 277 | 277 | |
| 278 | 278 | /** |
@@ -281,10 +281,10 @@ discard block |
||
| 281 | 281 | * @param callable $callback |
| 282 | 282 | * @return $this |
| 283 | 283 | */ |
| 284 | - public function each(callable $callback) |
|
| 284 | + public function each( callable $callback ) |
|
| 285 | 285 | { |
| 286 | - foreach ($this->items as $key => $item) { |
|
| 287 | - if ($callback($item, $key) === false) { |
|
| 286 | + foreach ( $this->items as $key => $item ) { |
|
| 287 | + if ( $callback( $item, $key ) === false ) { |
|
| 288 | 288 | break; |
| 289 | 289 | } |
| 290 | 290 | } |
@@ -298,10 +298,10 @@ discard block |
||
| 298 | 298 | * @param callable $callback |
| 299 | 299 | * @return static |
| 300 | 300 | */ |
| 301 | - public function eachSpread(callable $callback) |
|
| 301 | + public function eachSpread( callable $callback ) |
|
| 302 | 302 | { |
| 303 | - return $this->each(function ($chunk) use ($callback) { |
|
| 304 | - return $callback(...$chunk); |
|
| 303 | + return $this->each( function( $chunk ) use ( $callback ) { |
|
| 304 | + return $callback( ...$chunk ); |
|
| 305 | 305 | }); |
| 306 | 306 | } |
| 307 | 307 | |
@@ -313,13 +313,13 @@ discard block |
||
| 313 | 313 | * @param mixed $value |
| 314 | 314 | * @return bool |
| 315 | 315 | */ |
| 316 | - public function every($key, $operator = null, $value = null) |
|
| 316 | + public function every( $key, $operator = null, $value = null ) |
|
| 317 | 317 | { |
| 318 | - if (func_num_args() == 1) { |
|
| 319 | - $callback = $this->valueRetriever($key); |
|
| 318 | + if ( func_num_args() == 1 ) { |
|
| 319 | + $callback = $this->valueRetriever( $key ); |
|
| 320 | 320 | |
| 321 | - foreach ($this->items as $k => $v) { |
|
| 322 | - if (! $callback($v, $k)) { |
|
| 321 | + foreach ( $this->items as $k => $v ) { |
|
| 322 | + if ( ! $callback( $v, $k ) ) { |
|
| 323 | 323 | return false; |
| 324 | 324 | } |
| 325 | 325 | } |
@@ -327,13 +327,13 @@ discard block |
||
| 327 | 327 | return true; |
| 328 | 328 | } |
| 329 | 329 | |
| 330 | - if (func_num_args() == 2) { |
|
| 330 | + if ( func_num_args() == 2 ) { |
|
| 331 | 331 | $value = $operator; |
| 332 | 332 | |
| 333 | 333 | $operator = '='; |
| 334 | 334 | } |
| 335 | 335 | |
| 336 | - return $this->every($this->operatorForWhere($key, $operator, $value)); |
|
| 336 | + return $this->every( $this->operatorForWhere( $key, $operator, $value ) ); |
|
| 337 | 337 | } |
| 338 | 338 | |
| 339 | 339 | /** |
@@ -342,11 +342,11 @@ discard block |
||
| 342 | 342 | * @param mixed $keys |
| 343 | 343 | * @return static |
| 344 | 344 | */ |
| 345 | - public function except($keys) |
|
| 345 | + public function except( $keys ) |
|
| 346 | 346 | { |
| 347 | - $keys = is_array($keys) ? $keys : func_get_args(); |
|
| 347 | + $keys = is_array( $keys ) ? $keys : func_get_args(); |
|
| 348 | 348 | |
| 349 | - return new static(Arr::except($this->items, $keys)); |
|
| 349 | + return new static( Arr::except( $this->items, $keys ) ); |
|
| 350 | 350 | } |
| 351 | 351 | |
| 352 | 352 | /** |
@@ -355,13 +355,13 @@ discard block |
||
| 355 | 355 | * @param callable|null $callback |
| 356 | 356 | * @return static |
| 357 | 357 | */ |
| 358 | - public function filter(callable $callback = null) |
|
| 358 | + public function filter( callable $callback = null ) |
|
| 359 | 359 | { |
| 360 | - if ($callback) { |
|
| 361 | - return new static(Arr::where($this->items, $callback)); |
|
| 360 | + if ( $callback ) { |
|
| 361 | + return new static( Arr::where( $this->items, $callback ) ); |
|
| 362 | 362 | } |
| 363 | 363 | |
| 364 | - return new static(array_filter($this->items)); |
|
| 364 | + return new static( array_filter( $this->items ) ); |
|
| 365 | 365 | } |
| 366 | 366 | |
| 367 | 367 | /** |
@@ -372,12 +372,12 @@ discard block |
||
| 372 | 372 | * @param callable $default |
| 373 | 373 | * @return mixed |
| 374 | 374 | */ |
| 375 | - public function when($value, callable $callback, callable $default = null) |
|
| 375 | + public function when( $value, callable $callback, callable $default = null ) |
|
| 376 | 376 | { |
| 377 | - if ($value) { |
|
| 378 | - return $callback($this); |
|
| 379 | - } elseif ($default) { |
|
| 380 | - return $default($this); |
|
| 377 | + if ( $value ) { |
|
| 378 | + return $callback( $this ); |
|
| 379 | + } elseif ( $default ) { |
|
| 380 | + return $default( $this ); |
|
| 381 | 381 | } |
| 382 | 382 | |
| 383 | 383 | return $this; |
@@ -391,9 +391,9 @@ discard block |
||
| 391 | 391 | * @param callable $default |
| 392 | 392 | * @return mixed |
| 393 | 393 | */ |
| 394 | - public function unless($value, callable $callback, callable $default = null) |
|
| 394 | + public function unless( $value, callable $callback, callable $default = null ) |
|
| 395 | 395 | { |
| 396 | - return $this->when(! $value, $callback, $default); |
|
| 396 | + return $this->when( ! $value, $callback, $default ); |
|
| 397 | 397 | } |
| 398 | 398 | |
| 399 | 399 | /** |
@@ -404,15 +404,15 @@ discard block |
||
| 404 | 404 | * @param mixed $value |
| 405 | 405 | * @return static |
| 406 | 406 | */ |
| 407 | - public function where($key, $operator, $value = null) |
|
| 407 | + public function where( $key, $operator, $value = null ) |
|
| 408 | 408 | { |
| 409 | - if (func_num_args() == 2) { |
|
| 409 | + if ( func_num_args() == 2 ) { |
|
| 410 | 410 | $value = $operator; |
| 411 | 411 | |
| 412 | 412 | $operator = '='; |
| 413 | 413 | } |
| 414 | 414 | |
| 415 | - return $this->filter($this->operatorForWhere($key, $operator, $value)); |
|
| 415 | + return $this->filter( $this->operatorForWhere( $key, $operator, $value ) ); |
|
| 416 | 416 | } |
| 417 | 417 | |
| 418 | 418 | /** |
@@ -423,12 +423,12 @@ discard block |
||
| 423 | 423 | * @param mixed $value |
| 424 | 424 | * @return \Closure |
| 425 | 425 | */ |
| 426 | - protected function operatorForWhere($key, $operator, $value) |
|
| 426 | + protected function operatorForWhere( $key, $operator, $value ) |
|
| 427 | 427 | { |
| 428 | - return function ($item) use ($key, $operator, $value) { |
|
| 429 | - $retrieved = data_get($item, $key); |
|
| 428 | + return function( $item ) use ( $key, $operator, $value ) { |
|
| 429 | + $retrieved = data_get( $item, $key ); |
|
| 430 | 430 | |
| 431 | - switch ($operator) { |
|
| 431 | + switch ( $operator ) { |
|
| 432 | 432 | default: |
| 433 | 433 | case '=': |
| 434 | 434 | case '==': return $retrieved == $value; |
@@ -451,9 +451,9 @@ discard block |
||
| 451 | 451 | * @param mixed $value |
| 452 | 452 | * @return static |
| 453 | 453 | */ |
| 454 | - public function whereStrict($key, $value) |
|
| 454 | + public function whereStrict( $key, $value ) |
|
| 455 | 455 | { |
| 456 | - return $this->where($key, '===', $value); |
|
| 456 | + return $this->where( $key, '===', $value ); |
|
| 457 | 457 | } |
| 458 | 458 | |
| 459 | 459 | /** |
@@ -464,12 +464,12 @@ discard block |
||
| 464 | 464 | * @param bool $strict |
| 465 | 465 | * @return static |
| 466 | 466 | */ |
| 467 | - public function whereIn($key, $values, $strict = false) |
|
| 467 | + public function whereIn( $key, $values, $strict = false ) |
|
| 468 | 468 | { |
| 469 | - $values = $this->getArrayableItems($values); |
|
| 469 | + $values = $this->getArrayableItems( $values ); |
|
| 470 | 470 | |
| 471 | - return $this->filter(function ($item) use ($key, $values, $strict) { |
|
| 472 | - return in_array(data_get($item, $key), $values, $strict); |
|
| 471 | + return $this->filter( function( $item ) use ( $key, $values, $strict ) { |
|
| 472 | + return in_array( data_get( $item, $key ), $values, $strict ); |
|
| 473 | 473 | }); |
| 474 | 474 | } |
| 475 | 475 | |
@@ -480,9 +480,9 @@ discard block |
||
| 480 | 480 | * @param mixed $values |
| 481 | 481 | * @return static |
| 482 | 482 | */ |
| 483 | - public function whereInStrict($key, $values) |
|
| 483 | + public function whereInStrict( $key, $values ) |
|
| 484 | 484 | { |
| 485 | - return $this->whereIn($key, $values, true); |
|
| 485 | + return $this->whereIn( $key, $values, true ); |
|
| 486 | 486 | } |
| 487 | 487 | |
| 488 | 488 | /** |
@@ -493,12 +493,12 @@ discard block |
||
| 493 | 493 | * @param bool $strict |
| 494 | 494 | * @return static |
| 495 | 495 | */ |
| 496 | - public function whereNotIn($key, $values, $strict = false) |
|
| 496 | + public function whereNotIn( $key, $values, $strict = false ) |
|
| 497 | 497 | { |
| 498 | - $values = $this->getArrayableItems($values); |
|
| 498 | + $values = $this->getArrayableItems( $values ); |
|
| 499 | 499 | |
| 500 | - return $this->reject(function ($item) use ($key, $values, $strict) { |
|
| 501 | - return in_array(data_get($item, $key), $values, $strict); |
|
| 500 | + return $this->reject( function( $item ) use ( $key, $values, $strict ) { |
|
| 501 | + return in_array( data_get( $item, $key ), $values, $strict ); |
|
| 502 | 502 | }); |
| 503 | 503 | } |
| 504 | 504 | |
@@ -509,9 +509,9 @@ discard block |
||
| 509 | 509 | * @param mixed $values |
| 510 | 510 | * @return static |
| 511 | 511 | */ |
| 512 | - public function whereNotInStrict($key, $values) |
|
| 512 | + public function whereNotInStrict( $key, $values ) |
|
| 513 | 513 | { |
| 514 | - return $this->whereNotIn($key, $values, true); |
|
| 514 | + return $this->whereNotIn( $key, $values, true ); |
|
| 515 | 515 | } |
| 516 | 516 | |
| 517 | 517 | /** |
@@ -521,9 +521,9 @@ discard block |
||
| 521 | 521 | * @param mixed $default |
| 522 | 522 | * @return mixed |
| 523 | 523 | */ |
| 524 | - public function first(callable $callback = null, $default = null) |
|
| 524 | + public function first( callable $callback = null, $default = null ) |
|
| 525 | 525 | { |
| 526 | - return Arr::first($this->items, $callback, $default); |
|
| 526 | + return Arr::first( $this->items, $callback, $default ); |
|
| 527 | 527 | } |
| 528 | 528 | |
| 529 | 529 | /** |
@@ -532,9 +532,9 @@ discard block |
||
| 532 | 532 | * @param int $depth |
| 533 | 533 | * @return static |
| 534 | 534 | */ |
| 535 | - public function flatten($depth = INF) |
|
| 535 | + public function flatten( $depth = INF ) |
|
| 536 | 536 | { |
| 537 | - return new static(Arr::flatten($this->items, $depth)); |
|
| 537 | + return new static( Arr::flatten( $this->items, $depth ) ); |
|
| 538 | 538 | } |
| 539 | 539 | |
| 540 | 540 | /** |
@@ -544,7 +544,7 @@ discard block |
||
| 544 | 544 | */ |
| 545 | 545 | public function flip() |
| 546 | 546 | { |
| 547 | - return new static(array_flip($this->items)); |
|
| 547 | + return new static( array_flip( $this->items ) ); |
|
| 548 | 548 | } |
| 549 | 549 | |
| 550 | 550 | /** |
@@ -553,10 +553,10 @@ discard block |
||
| 553 | 553 | * @param string|array $keys |
| 554 | 554 | * @return $this |
| 555 | 555 | */ |
| 556 | - public function forget($keys) |
|
| 556 | + public function forget( $keys ) |
|
| 557 | 557 | { |
| 558 | - foreach ((array) $keys as $key) { |
|
| 559 | - $this->offsetUnset($key); |
|
| 558 | + foreach ( (array)$keys as $key ) { |
|
| 559 | + $this->offsetUnset( $key ); |
|
| 560 | 560 | } |
| 561 | 561 | |
| 562 | 562 | return $this; |
@@ -569,13 +569,13 @@ discard block |
||
| 569 | 569 | * @param mixed $default |
| 570 | 570 | * @return mixed |
| 571 | 571 | */ |
| 572 | - public function get($key, $default = null) |
|
| 572 | + public function get( $key, $default = null ) |
|
| 573 | 573 | { |
| 574 | - if ($this->offsetExists($key)) { |
|
| 575 | - return $this->items[$key]; |
|
| 574 | + if ( $this->offsetExists( $key ) ) { |
|
| 575 | + return $this->items[ $key ]; |
|
| 576 | 576 | } |
| 577 | 577 | |
| 578 | - return value($default); |
|
| 578 | + return value( $default ); |
|
| 579 | 579 | } |
| 580 | 580 | |
| 581 | 581 | /** |
@@ -585,31 +585,31 @@ discard block |
||
| 585 | 585 | * @param bool $preserveKeys |
| 586 | 586 | * @return static |
| 587 | 587 | */ |
| 588 | - public function groupBy($groupBy, $preserveKeys = false) |
|
| 588 | + public function groupBy( $groupBy, $preserveKeys = false ) |
|
| 589 | 589 | { |
| 590 | - $groupBy = $this->valueRetriever($groupBy); |
|
| 590 | + $groupBy = $this->valueRetriever( $groupBy ); |
|
| 591 | 591 | |
| 592 | - $results = []; |
|
| 592 | + $results = [ ]; |
|
| 593 | 593 | |
| 594 | - foreach ($this->items as $key => $value) { |
|
| 595 | - $groupKeys = $groupBy($value, $key); |
|
| 594 | + foreach ( $this->items as $key => $value ) { |
|
| 595 | + $groupKeys = $groupBy( $value, $key ); |
|
| 596 | 596 | |
| 597 | - if (! is_array($groupKeys)) { |
|
| 598 | - $groupKeys = [$groupKeys]; |
|
| 597 | + if ( ! is_array( $groupKeys ) ) { |
|
| 598 | + $groupKeys = [ $groupKeys ]; |
|
| 599 | 599 | } |
| 600 | 600 | |
| 601 | - foreach ($groupKeys as $groupKey) { |
|
| 602 | - $groupKey = is_bool($groupKey) ? (int) $groupKey : $groupKey; |
|
| 601 | + foreach ( $groupKeys as $groupKey ) { |
|
| 602 | + $groupKey = is_bool( $groupKey ) ? (int)$groupKey : $groupKey; |
|
| 603 | 603 | |
| 604 | - if (! array_key_exists($groupKey, $results)) { |
|
| 605 | - $results[$groupKey] = new static; |
|
| 604 | + if ( ! array_key_exists( $groupKey, $results ) ) { |
|
| 605 | + $results[ $groupKey ] = new static; |
|
| 606 | 606 | } |
| 607 | 607 | |
| 608 | - $results[$groupKey]->offsetSet($preserveKeys ? $key : null, $value); |
|
| 608 | + $results[ $groupKey ]->offsetSet( $preserveKeys ? $key : null, $value ); |
|
| 609 | 609 | } |
| 610 | 610 | } |
| 611 | 611 | |
| 612 | - return new static($results); |
|
| 612 | + return new static( $results ); |
|
| 613 | 613 | } |
| 614 | 614 | |
| 615 | 615 | /** |
@@ -618,23 +618,23 @@ discard block |
||
| 618 | 618 | * @param callable|string $keyBy |
| 619 | 619 | * @return static |
| 620 | 620 | */ |
| 621 | - public function keyBy($keyBy) |
|
| 621 | + public function keyBy( $keyBy ) |
|
| 622 | 622 | { |
| 623 | - $keyBy = $this->valueRetriever($keyBy); |
|
| 623 | + $keyBy = $this->valueRetriever( $keyBy ); |
|
| 624 | 624 | |
| 625 | - $results = []; |
|
| 625 | + $results = [ ]; |
|
| 626 | 626 | |
| 627 | - foreach ($this->items as $key => $item) { |
|
| 628 | - $resolvedKey = $keyBy($item, $key); |
|
| 627 | + foreach ( $this->items as $key => $item ) { |
|
| 628 | + $resolvedKey = $keyBy( $item, $key ); |
|
| 629 | 629 | |
| 630 | - if (is_object($resolvedKey)) { |
|
| 631 | - $resolvedKey = (string) $resolvedKey; |
|
| 630 | + if ( is_object( $resolvedKey ) ) { |
|
| 631 | + $resolvedKey = (string)$resolvedKey; |
|
| 632 | 632 | } |
| 633 | 633 | |
| 634 | - $results[$resolvedKey] = $item; |
|
| 634 | + $results[ $resolvedKey ] = $item; |
|
| 635 | 635 | } |
| 636 | 636 | |
| 637 | - return new static($results); |
|
| 637 | + return new static( $results ); |
|
| 638 | 638 | } |
| 639 | 639 | |
| 640 | 640 | /** |
@@ -643,9 +643,9 @@ discard block |
||
| 643 | 643 | * @param mixed $key |
| 644 | 644 | * @return bool |
| 645 | 645 | */ |
| 646 | - public function has($key) |
|
| 646 | + public function has( $key ) |
|
| 647 | 647 | { |
| 648 | - return $this->offsetExists($key); |
|
| 648 | + return $this->offsetExists( $key ); |
|
| 649 | 649 | } |
| 650 | 650 | |
| 651 | 651 | /** |
@@ -655,15 +655,15 @@ discard block |
||
| 655 | 655 | * @param string $glue |
| 656 | 656 | * @return string |
| 657 | 657 | */ |
| 658 | - public function implode($value, $glue = null) |
|
| 658 | + public function implode( $value, $glue = null ) |
|
| 659 | 659 | { |
| 660 | 660 | $first = $this->first(); |
| 661 | 661 | |
| 662 | - if (is_array($first) || is_object($first)) { |
|
| 663 | - return implode($glue, $this->pluck($value)->all()); |
|
| 662 | + if ( is_array( $first ) || is_object( $first ) ) { |
|
| 663 | + return implode( $glue, $this->pluck( $value )->all() ); |
|
| 664 | 664 | } |
| 665 | 665 | |
| 666 | - return implode($value, $this->items); |
|
| 666 | + return implode( $value, $this->items ); |
|
| 667 | 667 | } |
| 668 | 668 | |
| 669 | 669 | /** |
@@ -672,9 +672,9 @@ discard block |
||
| 672 | 672 | * @param mixed $items |
| 673 | 673 | * @return static |
| 674 | 674 | */ |
| 675 | - public function intersect($items) |
|
| 675 | + public function intersect( $items ) |
|
| 676 | 676 | { |
| 677 | - return new static(array_intersect($this->items, $this->getArrayableItems($items))); |
|
| 677 | + return new static( array_intersect( $this->items, $this->getArrayableItems( $items ) ) ); |
|
| 678 | 678 | } |
| 679 | 679 | |
| 680 | 680 | /** |
@@ -683,9 +683,9 @@ discard block |
||
| 683 | 683 | * @param mixed $items |
| 684 | 684 | * @return static |
| 685 | 685 | */ |
| 686 | - public function intersectKey($items) |
|
| 686 | + public function intersectKey( $items ) |
|
| 687 | 687 | { |
| 688 | - return new static(array_intersect_key($this->items, $this->getArrayableItems($items))); |
|
| 688 | + return new static( array_intersect_key( $this->items, $this->getArrayableItems( $items ) ) ); |
|
| 689 | 689 | } |
| 690 | 690 | |
| 691 | 691 | /** |
@@ -695,7 +695,7 @@ discard block |
||
| 695 | 695 | */ |
| 696 | 696 | public function isEmpty() |
| 697 | 697 | { |
| 698 | - return empty($this->items); |
|
| 698 | + return empty( $this->items ); |
|
| 699 | 699 | } |
| 700 | 700 | |
| 701 | 701 | /** |
@@ -714,9 +714,9 @@ discard block |
||
| 714 | 714 | * @param mixed $value |
| 715 | 715 | * @return bool |
| 716 | 716 | */ |
| 717 | - protected function useAsCallable($value) |
|
| 717 | + protected function useAsCallable( $value ) |
|
| 718 | 718 | { |
| 719 | - return ! is_string($value) && is_callable($value); |
|
| 719 | + return ! is_string( $value ) && is_callable( $value ); |
|
| 720 | 720 | } |
| 721 | 721 | |
| 722 | 722 | /** |
@@ -726,7 +726,7 @@ discard block |
||
| 726 | 726 | */ |
| 727 | 727 | public function keys() |
| 728 | 728 | { |
| 729 | - return new static(array_keys($this->items)); |
|
| 729 | + return new static( array_keys( $this->items ) ); |
|
| 730 | 730 | } |
| 731 | 731 | |
| 732 | 732 | /** |
@@ -736,9 +736,9 @@ discard block |
||
| 736 | 736 | * @param mixed $default |
| 737 | 737 | * @return mixed |
| 738 | 738 | */ |
| 739 | - public function last(callable $callback = null, $default = null) |
|
| 739 | + public function last( callable $callback = null, $default = null ) |
|
| 740 | 740 | { |
| 741 | - return Arr::last($this->items, $callback, $default); |
|
| 741 | + return Arr::last( $this->items, $callback, $default ); |
|
| 742 | 742 | } |
| 743 | 743 | |
| 744 | 744 | /** |
@@ -748,9 +748,9 @@ discard block |
||
| 748 | 748 | * @param string|null $key |
| 749 | 749 | * @return static |
| 750 | 750 | */ |
| 751 | - public function pluck($value, $key = null) |
|
| 751 | + public function pluck( $value, $key = null ) |
|
| 752 | 752 | { |
| 753 | - return new static(Arr::pluck($this->items, $value, $key)); |
|
| 753 | + return new static( Arr::pluck( $this->items, $value, $key ) ); |
|
| 754 | 754 | } |
| 755 | 755 | |
| 756 | 756 | /** |
@@ -759,13 +759,13 @@ discard block |
||
| 759 | 759 | * @param callable $callback |
| 760 | 760 | * @return static |
| 761 | 761 | */ |
| 762 | - public function map(callable $callback) |
|
| 762 | + public function map( callable $callback ) |
|
| 763 | 763 | { |
| 764 | - $keys = array_keys($this->items); |
|
| 764 | + $keys = array_keys( $this->items ); |
|
| 765 | 765 | |
| 766 | - $items = array_map($callback, $this->items, $keys); |
|
| 766 | + $items = array_map( $callback, $this->items, $keys ); |
|
| 767 | 767 | |
| 768 | - return new static(array_combine($keys, $items)); |
|
| 768 | + return new static( array_combine( $keys, $items ) ); |
|
| 769 | 769 | } |
| 770 | 770 | |
| 771 | 771 | /** |
@@ -774,10 +774,10 @@ discard block |
||
| 774 | 774 | * @param callable $callback |
| 775 | 775 | * @return static |
| 776 | 776 | */ |
| 777 | - public function mapSpread(callable $callback) |
|
| 777 | + public function mapSpread( callable $callback ) |
|
| 778 | 778 | { |
| 779 | - return $this->map(function ($chunk) use ($callback) { |
|
| 780 | - return $callback(...$chunk); |
|
| 779 | + return $this->map( function( $chunk ) use ( $callback ) { |
|
| 780 | + return $callback( ...$chunk ); |
|
| 781 | 781 | }); |
| 782 | 782 | } |
| 783 | 783 | |
@@ -789,15 +789,15 @@ discard block |
||
| 789 | 789 | * @param callable $callback |
| 790 | 790 | * @return static |
| 791 | 791 | */ |
| 792 | - public function mapToGroups(callable $callback) |
|
| 792 | + public function mapToGroups( callable $callback ) |
|
| 793 | 793 | { |
| 794 | - $groups = $this->map($callback)->reduce(function ($groups, $pair) { |
|
| 795 | - $groups[key($pair)][] = reset($pair); |
|
| 794 | + $groups = $this->map( $callback )->reduce( function( $groups, $pair ) { |
|
| 795 | + $groups[ key( $pair ) ][ ] = reset( $pair ); |
|
| 796 | 796 | |
| 797 | 797 | return $groups; |
| 798 | - }, []); |
|
| 798 | + }, [ ] ); |
|
| 799 | 799 | |
| 800 | - return (new static($groups))->map([$this, 'make']); |
|
| 800 | + return ( new static( $groups ) )->map( [ $this, 'make' ] ); |
|
| 801 | 801 | } |
| 802 | 802 | |
| 803 | 803 | /** |
@@ -808,19 +808,19 @@ discard block |
||
| 808 | 808 | * @param callable $callback |
| 809 | 809 | * @return static |
| 810 | 810 | */ |
| 811 | - public function mapWithKeys(callable $callback) |
|
| 811 | + public function mapWithKeys( callable $callback ) |
|
| 812 | 812 | { |
| 813 | - $result = []; |
|
| 813 | + $result = [ ]; |
|
| 814 | 814 | |
| 815 | - foreach ($this->items as $key => $value) { |
|
| 816 | - $assoc = $callback($value, $key); |
|
| 815 | + foreach ( $this->items as $key => $value ) { |
|
| 816 | + $assoc = $callback( $value, $key ); |
|
| 817 | 817 | |
| 818 | - foreach ($assoc as $mapKey => $mapValue) { |
|
| 819 | - $result[$mapKey] = $mapValue; |
|
| 818 | + foreach ( $assoc as $mapKey => $mapValue ) { |
|
| 819 | + $result[ $mapKey ] = $mapValue; |
|
| 820 | 820 | } |
| 821 | 821 | } |
| 822 | 822 | |
| 823 | - return new static($result); |
|
| 823 | + return new static( $result ); |
|
| 824 | 824 | } |
| 825 | 825 | |
| 826 | 826 | /** |
@@ -829,9 +829,9 @@ discard block |
||
| 829 | 829 | * @param callable $callback |
| 830 | 830 | * @return static |
| 831 | 831 | */ |
| 832 | - public function flatMap(callable $callback) |
|
| 832 | + public function flatMap( callable $callback ) |
|
| 833 | 833 | { |
| 834 | - return $this->map($callback)->collapse(); |
|
| 834 | + return $this->map( $callback )->collapse(); |
|
| 835 | 835 | } |
| 836 | 836 | |
| 837 | 837 | /** |
@@ -840,16 +840,16 @@ discard block |
||
| 840 | 840 | * @param callable|string|null $callback |
| 841 | 841 | * @return mixed |
| 842 | 842 | */ |
| 843 | - public function max($callback = null) |
|
| 843 | + public function max( $callback = null ) |
|
| 844 | 844 | { |
| 845 | - $callback = $this->valueRetriever($callback); |
|
| 845 | + $callback = $this->valueRetriever( $callback ); |
|
| 846 | 846 | |
| 847 | - return $this->filter(function ($value) { |
|
| 848 | - return ! is_null($value); |
|
| 849 | - })->reduce(function ($result, $item) use ($callback) { |
|
| 850 | - $value = $callback($item); |
|
| 847 | + return $this->filter( function( $value ) { |
|
| 848 | + return ! is_null( $value ); |
|
| 849 | + })->reduce( function( $result, $item ) use ( $callback ) { |
|
| 850 | + $value = $callback( $item ); |
|
| 851 | 851 | |
| 852 | - return is_null($result) || $value > $result ? $value : $result; |
|
| 852 | + return is_null( $result ) || $value > $result ? $value : $result; |
|
| 853 | 853 | }); |
| 854 | 854 | } |
| 855 | 855 | |
@@ -859,9 +859,9 @@ discard block |
||
| 859 | 859 | * @param mixed $items |
| 860 | 860 | * @return static |
| 861 | 861 | */ |
| 862 | - public function merge($items) |
|
| 862 | + public function merge( $items ) |
|
| 863 | 863 | { |
| 864 | - return new static(array_merge($this->items, $this->getArrayableItems($items))); |
|
| 864 | + return new static( array_merge( $this->items, $this->getArrayableItems( $items ) ) ); |
|
| 865 | 865 | } |
| 866 | 866 | |
| 867 | 867 | /** |
@@ -870,9 +870,9 @@ discard block |
||
| 870 | 870 | * @param mixed $values |
| 871 | 871 | * @return static |
| 872 | 872 | */ |
| 873 | - public function combine($values) |
|
| 873 | + public function combine( $values ) |
|
| 874 | 874 | { |
| 875 | - return new static(array_combine($this->all(), $this->getArrayableItems($values))); |
|
| 875 | + return new static( array_combine( $this->all(), $this->getArrayableItems( $values ) ) ); |
|
| 876 | 876 | } |
| 877 | 877 | |
| 878 | 878 | /** |
@@ -881,9 +881,9 @@ discard block |
||
| 881 | 881 | * @param mixed $items |
| 882 | 882 | * @return static |
| 883 | 883 | */ |
| 884 | - public function union($items) |
|
| 884 | + public function union( $items ) |
|
| 885 | 885 | { |
| 886 | - return new static($this->items + $this->getArrayableItems($items)); |
|
| 886 | + return new static( $this->items + $this->getArrayableItems( $items ) ); |
|
| 887 | 887 | } |
| 888 | 888 | |
| 889 | 889 | /** |
@@ -892,16 +892,16 @@ discard block |
||
| 892 | 892 | * @param callable|string|null $callback |
| 893 | 893 | * @return mixed |
| 894 | 894 | */ |
| 895 | - public function min($callback = null) |
|
| 895 | + public function min( $callback = null ) |
|
| 896 | 896 | { |
| 897 | - $callback = $this->valueRetriever($callback); |
|
| 897 | + $callback = $this->valueRetriever( $callback ); |
|
| 898 | 898 | |
| 899 | - return $this->filter(function ($value) { |
|
| 900 | - return ! is_null($value); |
|
| 901 | - })->reduce(function ($result, $item) use ($callback) { |
|
| 902 | - $value = $callback($item); |
|
| 899 | + return $this->filter( function( $value ) { |
|
| 900 | + return ! is_null( $value ); |
|
| 901 | + })->reduce( function( $result, $item ) use ( $callback ) { |
|
| 902 | + $value = $callback( $item ); |
|
| 903 | 903 | |
| 904 | - return is_null($result) || $value < $result ? $value : $result; |
|
| 904 | + return is_null( $result ) || $value < $result ? $value : $result; |
|
| 905 | 905 | }); |
| 906 | 906 | } |
| 907 | 907 | |
@@ -912,21 +912,21 @@ discard block |
||
| 912 | 912 | * @param int $offset |
| 913 | 913 | * @return static |
| 914 | 914 | */ |
| 915 | - public function nth($step, $offset = 0) |
|
| 915 | + public function nth( $step, $offset = 0 ) |
|
| 916 | 916 | { |
| 917 | - $new = []; |
|
| 917 | + $new = [ ]; |
|
| 918 | 918 | |
| 919 | 919 | $position = 0; |
| 920 | 920 | |
| 921 | - foreach ($this->items as $item) { |
|
| 922 | - if ($position % $step === $offset) { |
|
| 923 | - $new[] = $item; |
|
| 921 | + foreach ( $this->items as $item ) { |
|
| 922 | + if ( $position % $step === $offset ) { |
|
| 923 | + $new[ ] = $item; |
|
| 924 | 924 | } |
| 925 | 925 | |
| 926 | 926 | $position++; |
| 927 | 927 | } |
| 928 | 928 | |
| 929 | - return new static($new); |
|
| 929 | + return new static( $new ); |
|
| 930 | 930 | } |
| 931 | 931 | |
| 932 | 932 | /** |
@@ -935,15 +935,15 @@ discard block |
||
| 935 | 935 | * @param mixed $keys |
| 936 | 936 | * @return static |
| 937 | 937 | */ |
| 938 | - public function only($keys) |
|
| 938 | + public function only( $keys ) |
|
| 939 | 939 | { |
| 940 | - if (is_null($keys)) { |
|
| 941 | - return new static($this->items); |
|
| 940 | + if ( is_null( $keys ) ) { |
|
| 941 | + return new static( $this->items ); |
|
| 942 | 942 | } |
| 943 | 943 | |
| 944 | - $keys = is_array($keys) ? $keys : func_get_args(); |
|
| 944 | + $keys = is_array( $keys ) ? $keys : func_get_args(); |
|
| 945 | 945 | |
| 946 | - return new static(Arr::only($this->items, $keys)); |
|
| 946 | + return new static( Arr::only( $this->items, $keys ) ); |
|
| 947 | 947 | } |
| 948 | 948 | |
| 949 | 949 | /** |
@@ -953,9 +953,9 @@ discard block |
||
| 953 | 953 | * @param int $perPage |
| 954 | 954 | * @return static |
| 955 | 955 | */ |
| 956 | - public function forPage($page, $perPage) |
|
| 956 | + public function forPage( $page, $perPage ) |
|
| 957 | 957 | { |
| 958 | - return $this->slice(($page - 1) * $perPage, $perPage); |
|
| 958 | + return $this->slice( ( $page - 1 ) * $perPage, $perPage ); |
|
| 959 | 959 | } |
| 960 | 960 | |
| 961 | 961 | /** |
@@ -964,17 +964,17 @@ discard block |
||
| 964 | 964 | * @param callable|string $callback |
| 965 | 965 | * @return static |
| 966 | 966 | */ |
| 967 | - public function partition($callback) |
|
| 967 | + public function partition( $callback ) |
|
| 968 | 968 | { |
| 969 | - $partitions = [new static, new static]; |
|
| 969 | + $partitions = [ new static, new static ]; |
|
| 970 | 970 | |
| 971 | - $callback = $this->valueRetriever($callback); |
|
| 971 | + $callback = $this->valueRetriever( $callback ); |
|
| 972 | 972 | |
| 973 | - foreach ($this->items as $key => $item) { |
|
| 974 | - $partitions[(int) ! $callback($item)][$key] = $item; |
|
| 973 | + foreach ( $this->items as $key => $item ) { |
|
| 974 | + $partitions[ (int)! $callback( $item ) ][ $key ] = $item; |
|
| 975 | 975 | } |
| 976 | 976 | |
| 977 | - return new static($partitions); |
|
| 977 | + return new static( $partitions ); |
|
| 978 | 978 | } |
| 979 | 979 | |
| 980 | 980 | /** |
@@ -983,9 +983,9 @@ discard block |
||
| 983 | 983 | * @param callable $callback |
| 984 | 984 | * @return mixed |
| 985 | 985 | */ |
| 986 | - public function pipe(callable $callback) |
|
| 986 | + public function pipe( callable $callback ) |
|
| 987 | 987 | { |
| 988 | - return $callback($this); |
|
| 988 | + return $callback( $this ); |
|
| 989 | 989 | } |
| 990 | 990 | |
| 991 | 991 | /** |
@@ -995,7 +995,7 @@ discard block |
||
| 995 | 995 | */ |
| 996 | 996 | public function pop() |
| 997 | 997 | { |
| 998 | - return array_pop($this->items); |
|
| 998 | + return array_pop( $this->items ); |
|
| 999 | 999 | } |
| 1000 | 1000 | |
| 1001 | 1001 | /** |
@@ -1005,9 +1005,9 @@ discard block |
||
| 1005 | 1005 | * @param mixed $key |
| 1006 | 1006 | * @return $this |
| 1007 | 1007 | */ |
| 1008 | - public function prepend($value, $key = null) |
|
| 1008 | + public function prepend( $value, $key = null ) |
|
| 1009 | 1009 | { |
| 1010 | - $this->items = Arr::prepend($this->items, $value, $key); |
|
| 1010 | + $this->items = Arr::prepend( $this->items, $value, $key ); |
|
| 1011 | 1011 | |
| 1012 | 1012 | return $this; |
| 1013 | 1013 | } |
@@ -1018,9 +1018,9 @@ discard block |
||
| 1018 | 1018 | * @param mixed $value |
| 1019 | 1019 | * @return $this |
| 1020 | 1020 | */ |
| 1021 | - public function push($value) |
|
| 1021 | + public function push( $value ) |
|
| 1022 | 1022 | { |
| 1023 | - $this->offsetSet(null, $value); |
|
| 1023 | + $this->offsetSet( null, $value ); |
|
| 1024 | 1024 | |
| 1025 | 1025 | return $this; |
| 1026 | 1026 | } |
@@ -1031,12 +1031,12 @@ discard block |
||
| 1031 | 1031 | * @param \Traversable $source |
| 1032 | 1032 | * @return self |
| 1033 | 1033 | */ |
| 1034 | - public function concat($source) |
|
| 1034 | + public function concat( $source ) |
|
| 1035 | 1035 | { |
| 1036 | - $result = new static($this); |
|
| 1036 | + $result = new static( $this ); |
|
| 1037 | 1037 | |
| 1038 | - foreach ($source as $item) { |
|
| 1039 | - $result->push($item); |
|
| 1038 | + foreach ( $source as $item ) { |
|
| 1039 | + $result->push( $item ); |
|
| 1040 | 1040 | } |
| 1041 | 1041 | |
| 1042 | 1042 | return $result; |
@@ -1049,9 +1049,9 @@ discard block |
||
| 1049 | 1049 | * @param mixed $default |
| 1050 | 1050 | * @return mixed |
| 1051 | 1051 | */ |
| 1052 | - public function pull($key, $default = null) |
|
| 1052 | + public function pull( $key, $default = null ) |
|
| 1053 | 1053 | { |
| 1054 | - return Arr::pull($this->items, $key, $default); |
|
| 1054 | + return Arr::pull( $this->items, $key, $default ); |
|
| 1055 | 1055 | } |
| 1056 | 1056 | |
| 1057 | 1057 | /** |
@@ -1061,9 +1061,9 @@ discard block |
||
| 1061 | 1061 | * @param mixed $value |
| 1062 | 1062 | * @return $this |
| 1063 | 1063 | */ |
| 1064 | - public function put($key, $value) |
|
| 1064 | + public function put( $key, $value ) |
|
| 1065 | 1065 | { |
| 1066 | - $this->offsetSet($key, $value); |
|
| 1066 | + $this->offsetSet( $key, $value ); |
|
| 1067 | 1067 | |
| 1068 | 1068 | return $this; |
| 1069 | 1069 | } |
@@ -1076,13 +1076,13 @@ discard block |
||
| 1076 | 1076 | * |
| 1077 | 1077 | * @throws \InvalidArgumentException |
| 1078 | 1078 | */ |
| 1079 | - public function random($number = null) |
|
| 1079 | + public function random( $number = null ) |
|
| 1080 | 1080 | { |
| 1081 | - if (is_null($number)) { |
|
| 1082 | - return Arr::random($this->items); |
|
| 1081 | + if ( is_null( $number ) ) { |
|
| 1082 | + return Arr::random( $this->items ); |
|
| 1083 | 1083 | } |
| 1084 | 1084 | |
| 1085 | - return new static(Arr::random($this->items, $number)); |
|
| 1085 | + return new static( Arr::random( $this->items, $number ) ); |
|
| 1086 | 1086 | } |
| 1087 | 1087 | |
| 1088 | 1088 | /** |
@@ -1092,9 +1092,9 @@ discard block |
||
| 1092 | 1092 | * @param mixed $initial |
| 1093 | 1093 | * @return mixed |
| 1094 | 1094 | */ |
| 1095 | - public function reduce(callable $callback, $initial = null) |
|
| 1095 | + public function reduce( callable $callback, $initial = null ) |
|
| 1096 | 1096 | { |
| 1097 | - return array_reduce($this->items, $callback, $initial); |
|
| 1097 | + return array_reduce( $this->items, $callback, $initial ); |
|
| 1098 | 1098 | } |
| 1099 | 1099 | |
| 1100 | 1100 | /** |
@@ -1103,15 +1103,15 @@ discard block |
||
| 1103 | 1103 | * @param callable|mixed $callback |
| 1104 | 1104 | * @return static |
| 1105 | 1105 | */ |
| 1106 | - public function reject($callback) |
|
| 1106 | + public function reject( $callback ) |
|
| 1107 | 1107 | { |
| 1108 | - if ($this->useAsCallable($callback)) { |
|
| 1109 | - return $this->filter(function ($value, $key) use ($callback) { |
|
| 1110 | - return ! $callback($value, $key); |
|
| 1108 | + if ( $this->useAsCallable( $callback ) ) { |
|
| 1109 | + return $this->filter( function( $value, $key ) use ( $callback ) { |
|
| 1110 | + return ! $callback( $value, $key ); |
|
| 1111 | 1111 | }); |
| 1112 | 1112 | } |
| 1113 | 1113 | |
| 1114 | - return $this->filter(function ($item) use ($callback) { |
|
| 1114 | + return $this->filter( function( $item ) use ( $callback ) { |
|
| 1115 | 1115 | return $item != $callback; |
| 1116 | 1116 | }); |
| 1117 | 1117 | } |
@@ -1123,7 +1123,7 @@ discard block |
||
| 1123 | 1123 | */ |
| 1124 | 1124 | public function reverse() |
| 1125 | 1125 | { |
| 1126 | - return new static(array_reverse($this->items, true)); |
|
| 1126 | + return new static( array_reverse( $this->items, true ) ); |
|
| 1127 | 1127 | } |
| 1128 | 1128 | |
| 1129 | 1129 | /** |
@@ -1133,14 +1133,14 @@ discard block |
||
| 1133 | 1133 | * @param bool $strict |
| 1134 | 1134 | * @return mixed |
| 1135 | 1135 | */ |
| 1136 | - public function search($value, $strict = false) |
|
| 1136 | + public function search( $value, $strict = false ) |
|
| 1137 | 1137 | { |
| 1138 | - if (! $this->useAsCallable($value)) { |
|
| 1139 | - return array_search($value, $this->items, $strict); |
|
| 1138 | + if ( ! $this->useAsCallable( $value ) ) { |
|
| 1139 | + return array_search( $value, $this->items, $strict ); |
|
| 1140 | 1140 | } |
| 1141 | 1141 | |
| 1142 | - foreach ($this->items as $key => $item) { |
|
| 1143 | - if (call_user_func($value, $item, $key)) { |
|
| 1142 | + foreach ( $this->items as $key => $item ) { |
|
| 1143 | + if ( call_user_func( $value, $item, $key ) ) { |
|
| 1144 | 1144 | return $key; |
| 1145 | 1145 | } |
| 1146 | 1146 | } |
@@ -1155,7 +1155,7 @@ discard block |
||
| 1155 | 1155 | */ |
| 1156 | 1156 | public function shift() |
| 1157 | 1157 | { |
| 1158 | - return array_shift($this->items); |
|
| 1158 | + return array_shift( $this->items ); |
|
| 1159 | 1159 | } |
| 1160 | 1160 | |
| 1161 | 1161 | /** |
@@ -1164,21 +1164,21 @@ discard block |
||
| 1164 | 1164 | * @param int $seed |
| 1165 | 1165 | * @return static |
| 1166 | 1166 | */ |
| 1167 | - public function shuffle($seed = null) |
|
| 1167 | + public function shuffle( $seed = null ) |
|
| 1168 | 1168 | { |
| 1169 | 1169 | $items = $this->items; |
| 1170 | 1170 | |
| 1171 | - if (is_null($seed)) { |
|
| 1172 | - shuffle($items); |
|
| 1171 | + if ( is_null( $seed ) ) { |
|
| 1172 | + shuffle( $items ); |
|
| 1173 | 1173 | } else { |
| 1174 | - srand($seed); |
|
| 1174 | + srand( $seed ); |
|
| 1175 | 1175 | |
| 1176 | - usort($items, function () { |
|
| 1176 | + usort( $items, function() { |
|
| 1177 | 1177 | return rand(-1, 1); |
| 1178 | 1178 | }); |
| 1179 | 1179 | } |
| 1180 | 1180 | |
| 1181 | - return new static($items); |
|
| 1181 | + return new static( $items ); |
|
| 1182 | 1182 | } |
| 1183 | 1183 | |
| 1184 | 1184 | /** |
@@ -1188,9 +1188,9 @@ discard block |
||
| 1188 | 1188 | * @param int $length |
| 1189 | 1189 | * @return static |
| 1190 | 1190 | */ |
| 1191 | - public function slice($offset, $length = null) |
|
| 1191 | + public function slice( $offset, $length = null ) |
|
| 1192 | 1192 | { |
| 1193 | - return new static(array_slice($this->items, $offset, $length, true)); |
|
| 1193 | + return new static( array_slice( $this->items, $offset, $length, true ) ); |
|
| 1194 | 1194 | } |
| 1195 | 1195 | |
| 1196 | 1196 | /** |
@@ -1199,15 +1199,15 @@ discard block |
||
| 1199 | 1199 | * @param int $numberOfGroups |
| 1200 | 1200 | * @return static |
| 1201 | 1201 | */ |
| 1202 | - public function split($numberOfGroups) |
|
| 1202 | + public function split( $numberOfGroups ) |
|
| 1203 | 1203 | { |
| 1204 | - if ($this->isEmpty()) { |
|
| 1204 | + if ( $this->isEmpty() ) { |
|
| 1205 | 1205 | return new static; |
| 1206 | 1206 | } |
| 1207 | 1207 | |
| 1208 | - $groupSize = ceil($this->count() / $numberOfGroups); |
|
| 1208 | + $groupSize = ceil( $this->count() / $numberOfGroups ); |
|
| 1209 | 1209 | |
| 1210 | - return $this->chunk($groupSize); |
|
| 1210 | + return $this->chunk( $groupSize ); |
|
| 1211 | 1211 | } |
| 1212 | 1212 | |
| 1213 | 1213 | /** |
@@ -1216,19 +1216,19 @@ discard block |
||
| 1216 | 1216 | * @param int $size |
| 1217 | 1217 | * @return static |
| 1218 | 1218 | */ |
| 1219 | - public function chunk($size) |
|
| 1219 | + public function chunk( $size ) |
|
| 1220 | 1220 | { |
| 1221 | - if ($size <= 0) { |
|
| 1221 | + if ( $size <= 0 ) { |
|
| 1222 | 1222 | return new static; |
| 1223 | 1223 | } |
| 1224 | 1224 | |
| 1225 | - $chunks = []; |
|
| 1225 | + $chunks = [ ]; |
|
| 1226 | 1226 | |
| 1227 | - foreach (array_chunk($this->items, $size, true) as $chunk) { |
|
| 1228 | - $chunks[] = new static($chunk); |
|
| 1227 | + foreach ( array_chunk( $this->items, $size, true ) as $chunk ) { |
|
| 1228 | + $chunks[ ] = new static( $chunk ); |
|
| 1229 | 1229 | } |
| 1230 | 1230 | |
| 1231 | - return new static($chunks); |
|
| 1231 | + return new static( $chunks ); |
|
| 1232 | 1232 | } |
| 1233 | 1233 | |
| 1234 | 1234 | /** |
@@ -1237,15 +1237,15 @@ discard block |
||
| 1237 | 1237 | * @param callable|null $callback |
| 1238 | 1238 | * @return static |
| 1239 | 1239 | */ |
| 1240 | - public function sort(callable $callback = null) |
|
| 1240 | + public function sort( callable $callback = null ) |
|
| 1241 | 1241 | { |
| 1242 | 1242 | $items = $this->items; |
| 1243 | 1243 | |
| 1244 | 1244 | $callback |
| 1245 | - ? uasort($items, $callback) |
|
| 1246 | - : asort($items); |
|
| 1245 | + ? uasort( $items, $callback ) |
|
| 1246 | + : asort( $items ); |
|
| 1247 | 1247 | |
| 1248 | - return new static($items); |
|
| 1248 | + return new static( $items ); |
|
| 1249 | 1249 | } |
| 1250 | 1250 | |
| 1251 | 1251 | /** |
@@ -1256,30 +1256,30 @@ discard block |
||
| 1256 | 1256 | * @param bool $descending |
| 1257 | 1257 | * @return static |
| 1258 | 1258 | */ |
| 1259 | - public function sortBy($callback, $options = SORT_REGULAR, $descending = false) |
|
| 1259 | + public function sortBy( $callback, $options = SORT_REGULAR, $descending = false ) |
|
| 1260 | 1260 | { |
| 1261 | - $results = []; |
|
| 1261 | + $results = [ ]; |
|
| 1262 | 1262 | |
| 1263 | - $callback = $this->valueRetriever($callback); |
|
| 1263 | + $callback = $this->valueRetriever( $callback ); |
|
| 1264 | 1264 | |
| 1265 | 1265 | // First we will loop through the items and get the comparator from a callback |
| 1266 | 1266 | // function which we were given. Then, we will sort the returned values and |
| 1267 | 1267 | // and grab the corresponding values for the sorted keys from this array. |
| 1268 | - foreach ($this->items as $key => $value) { |
|
| 1269 | - $results[$key] = $callback($value, $key); |
|
| 1268 | + foreach ( $this->items as $key => $value ) { |
|
| 1269 | + $results[ $key ] = $callback( $value, $key ); |
|
| 1270 | 1270 | } |
| 1271 | 1271 | |
| 1272 | - $descending ? arsort($results, $options) |
|
| 1273 | - : asort($results, $options); |
|
| 1272 | + $descending ? arsort( $results, $options ) |
|
| 1273 | + : asort( $results, $options ); |
|
| 1274 | 1274 | |
| 1275 | 1275 | // Once we have sorted all of the keys in the array, we will loop through them |
| 1276 | 1276 | // and grab the corresponding model so we can set the underlying items list |
| 1277 | 1277 | // to the sorted version. Then we'll just return the collection instance. |
| 1278 | - foreach (array_keys($results) as $key) { |
|
| 1279 | - $results[$key] = $this->items[$key]; |
|
| 1278 | + foreach ( array_keys( $results ) as $key ) { |
|
| 1279 | + $results[ $key ] = $this->items[ $key ]; |
|
| 1280 | 1280 | } |
| 1281 | 1281 | |
| 1282 | - return new static($results); |
|
| 1282 | + return new static( $results ); |
|
| 1283 | 1283 | } |
| 1284 | 1284 | |
| 1285 | 1285 | /** |
@@ -1289,9 +1289,9 @@ discard block |
||
| 1289 | 1289 | * @param int $options |
| 1290 | 1290 | * @return static |
| 1291 | 1291 | */ |
| 1292 | - public function sortByDesc($callback, $options = SORT_REGULAR) |
|
| 1292 | + public function sortByDesc( $callback, $options = SORT_REGULAR ) |
|
| 1293 | 1293 | { |
| 1294 | - return $this->sortBy($callback, $options, true); |
|
| 1294 | + return $this->sortBy( $callback, $options, true ); |
|
| 1295 | 1295 | } |
| 1296 | 1296 | |
| 1297 | 1297 | /** |
@@ -1302,13 +1302,13 @@ discard block |
||
| 1302 | 1302 | * @param mixed $replacement |
| 1303 | 1303 | * @return static |
| 1304 | 1304 | */ |
| 1305 | - public function splice($offset, $length = null, $replacement = []) |
|
| 1305 | + public function splice( $offset, $length = null, $replacement = [ ] ) |
|
| 1306 | 1306 | { |
| 1307 | - if (func_num_args() == 1) { |
|
| 1308 | - return new static(array_splice($this->items, $offset)); |
|
| 1307 | + if ( func_num_args() == 1 ) { |
|
| 1308 | + return new static( array_splice( $this->items, $offset ) ); |
|
| 1309 | 1309 | } |
| 1310 | 1310 | |
| 1311 | - return new static(array_splice($this->items, $offset, $length, $replacement)); |
|
| 1311 | + return new static( array_splice( $this->items, $offset, $length, $replacement ) ); |
|
| 1312 | 1312 | } |
| 1313 | 1313 | |
| 1314 | 1314 | /** |
@@ -1317,17 +1317,17 @@ discard block |
||
| 1317 | 1317 | * @param callable|string|null $callback |
| 1318 | 1318 | * @return mixed |
| 1319 | 1319 | */ |
| 1320 | - public function sum($callback = null) |
|
| 1320 | + public function sum( $callback = null ) |
|
| 1321 | 1321 | { |
| 1322 | - if (is_null($callback)) { |
|
| 1323 | - return array_sum($this->items); |
|
| 1322 | + if ( is_null( $callback ) ) { |
|
| 1323 | + return array_sum( $this->items ); |
|
| 1324 | 1324 | } |
| 1325 | 1325 | |
| 1326 | - $callback = $this->valueRetriever($callback); |
|
| 1326 | + $callback = $this->valueRetriever( $callback ); |
|
| 1327 | 1327 | |
| 1328 | - return $this->reduce(function ($result, $item) use ($callback) { |
|
| 1329 | - return $result + $callback($item); |
|
| 1330 | - }, 0); |
|
| 1328 | + return $this->reduce( function( $result, $item ) use ( $callback ) { |
|
| 1329 | + return $result + $callback( $item ); |
|
| 1330 | + }, 0 ); |
|
| 1331 | 1331 | } |
| 1332 | 1332 | |
| 1333 | 1333 | /** |
@@ -1336,13 +1336,13 @@ discard block |
||
| 1336 | 1336 | * @param int $limit |
| 1337 | 1337 | * @return static |
| 1338 | 1338 | */ |
| 1339 | - public function take($limit) |
|
| 1339 | + public function take( $limit ) |
|
| 1340 | 1340 | { |
| 1341 | - if ($limit < 0) { |
|
| 1342 | - return $this->slice($limit, abs($limit)); |
|
| 1341 | + if ( $limit < 0 ) { |
|
| 1342 | + return $this->slice( $limit, abs( $limit ) ); |
|
| 1343 | 1343 | } |
| 1344 | 1344 | |
| 1345 | - return $this->slice(0, $limit); |
|
| 1345 | + return $this->slice( 0, $limit ); |
|
| 1346 | 1346 | } |
| 1347 | 1347 | |
| 1348 | 1348 | /** |
@@ -1351,9 +1351,9 @@ discard block |
||
| 1351 | 1351 | * @param callable $callback |
| 1352 | 1352 | * @return $this |
| 1353 | 1353 | */ |
| 1354 | - public function tap(callable $callback) |
|
| 1354 | + public function tap( callable $callback ) |
|
| 1355 | 1355 | { |
| 1356 | - $callback(new static($this->items)); |
|
| 1356 | + $callback( new static( $this->items ) ); |
|
| 1357 | 1357 | |
| 1358 | 1358 | return $this; |
| 1359 | 1359 | } |
@@ -1364,9 +1364,9 @@ discard block |
||
| 1364 | 1364 | * @param callable $callback |
| 1365 | 1365 | * @return $this |
| 1366 | 1366 | */ |
| 1367 | - public function transform(callable $callback) |
|
| 1367 | + public function transform( callable $callback ) |
|
| 1368 | 1368 | { |
| 1369 | - $this->items = $this->map($callback)->all(); |
|
| 1369 | + $this->items = $this->map( $callback )->all(); |
|
| 1370 | 1370 | |
| 1371 | 1371 | return $this; |
| 1372 | 1372 | } |
@@ -1378,22 +1378,22 @@ discard block |
||
| 1378 | 1378 | * @param bool $strict |
| 1379 | 1379 | * @return static |
| 1380 | 1380 | */ |
| 1381 | - public function unique($key = null, $strict = false) |
|
| 1381 | + public function unique( $key = null, $strict = false ) |
|
| 1382 | 1382 | { |
| 1383 | - if (is_null($key)) { |
|
| 1384 | - return new static(array_unique($this->items, SORT_REGULAR)); |
|
| 1383 | + if ( is_null( $key ) ) { |
|
| 1384 | + return new static( array_unique( $this->items, SORT_REGULAR ) ); |
|
| 1385 | 1385 | } |
| 1386 | 1386 | |
| 1387 | - $callback = $this->valueRetriever($key); |
|
| 1387 | + $callback = $this->valueRetriever( $key ); |
|
| 1388 | 1388 | |
| 1389 | - $exists = []; |
|
| 1389 | + $exists = [ ]; |
|
| 1390 | 1390 | |
| 1391 | - return $this->reject(function ($item, $key) use ($callback, $strict, &$exists) { |
|
| 1392 | - if (in_array($id = $callback($item, $key), $exists, $strict)) { |
|
| 1391 | + return $this->reject( function( $item, $key ) use ( $callback, $strict, &$exists ) { |
|
| 1392 | + if ( in_array( $id = $callback( $item, $key ), $exists, $strict ) ) { |
|
| 1393 | 1393 | return true; |
| 1394 | 1394 | } |
| 1395 | 1395 | |
| 1396 | - $exists[] = $id; |
|
| 1396 | + $exists[ ] = $id; |
|
| 1397 | 1397 | }); |
| 1398 | 1398 | } |
| 1399 | 1399 | |
@@ -1403,9 +1403,9 @@ discard block |
||
| 1403 | 1403 | * @param string|callable|null $key |
| 1404 | 1404 | * @return static |
| 1405 | 1405 | */ |
| 1406 | - public function uniqueStrict($key = null) |
|
| 1406 | + public function uniqueStrict( $key = null ) |
|
| 1407 | 1407 | { |
| 1408 | - return $this->unique($key, true); |
|
| 1408 | + return $this->unique( $key, true ); |
|
| 1409 | 1409 | } |
| 1410 | 1410 | |
| 1411 | 1411 | /** |
@@ -1415,7 +1415,7 @@ discard block |
||
| 1415 | 1415 | */ |
| 1416 | 1416 | public function values() |
| 1417 | 1417 | { |
| 1418 | - return new static(array_values($this->items)); |
|
| 1418 | + return new static( array_values( $this->items ) ); |
|
| 1419 | 1419 | } |
| 1420 | 1420 | |
| 1421 | 1421 | /** |
@@ -1424,14 +1424,14 @@ discard block |
||
| 1424 | 1424 | * @param string $value |
| 1425 | 1425 | * @return callable |
| 1426 | 1426 | */ |
| 1427 | - protected function valueRetriever($value) |
|
| 1427 | + protected function valueRetriever( $value ) |
|
| 1428 | 1428 | { |
| 1429 | - if ($this->useAsCallable($value)) { |
|
| 1429 | + if ( $this->useAsCallable( $value ) ) { |
|
| 1430 | 1430 | return $value; |
| 1431 | 1431 | } |
| 1432 | 1432 | |
| 1433 | - return function ($item) use ($value) { |
|
| 1434 | - return data_get($item, $value); |
|
| 1433 | + return function( $item ) use ( $value ) { |
|
| 1434 | + return data_get( $item, $value ); |
|
| 1435 | 1435 | }; |
| 1436 | 1436 | } |
| 1437 | 1437 | |
@@ -1444,17 +1444,17 @@ discard block |
||
| 1444 | 1444 | * @param mixed ...$items |
| 1445 | 1445 | * @return static |
| 1446 | 1446 | */ |
| 1447 | - public function zip($items) |
|
| 1447 | + public function zip( $items ) |
|
| 1448 | 1448 | { |
| 1449 | - $arrayableItems = array_map(function ($items) { |
|
| 1450 | - return $this->getArrayableItems($items); |
|
| 1451 | - }, func_get_args()); |
|
| 1449 | + $arrayableItems = array_map( function( $items ) { |
|
| 1450 | + return $this->getArrayableItems( $items ); |
|
| 1451 | + }, func_get_args() ); |
|
| 1452 | 1452 | |
| 1453 | - $params = array_merge([function () { |
|
| 1454 | - return new static(func_get_args()); |
|
| 1455 | - }, $this->items], $arrayableItems); |
|
| 1453 | + $params = array_merge( [ function() { |
|
| 1454 | + return new static( func_get_args() ); |
|
| 1455 | + }, $this->items ], $arrayableItems ); |
|
| 1456 | 1456 | |
| 1457 | - return new static(call_user_func_array('array_map', $params)); |
|
| 1457 | + return new static( call_user_func_array( 'array_map', $params ) ); |
|
| 1458 | 1458 | } |
| 1459 | 1459 | |
| 1460 | 1460 | /** |
@@ -1464,9 +1464,9 @@ discard block |
||
| 1464 | 1464 | */ |
| 1465 | 1465 | public function toArray() |
| 1466 | 1466 | { |
| 1467 | - return array_map(function ($value) { |
|
| 1467 | + return array_map( function( $value ) { |
|
| 1468 | 1468 | return $value instanceof Arrayable ? $value->toArray() : $value; |
| 1469 | - }, $this->items); |
|
| 1469 | + }, $this->items ); |
|
| 1470 | 1470 | } |
| 1471 | 1471 | |
| 1472 | 1472 | /** |
@@ -1476,17 +1476,17 @@ discard block |
||
| 1476 | 1476 | */ |
| 1477 | 1477 | public function jsonSerialize() |
| 1478 | 1478 | { |
| 1479 | - return array_map(function ($value) { |
|
| 1480 | - if ($value instanceof JsonSerializable) { |
|
| 1479 | + return array_map( function( $value ) { |
|
| 1480 | + if ( $value instanceof JsonSerializable ) { |
|
| 1481 | 1481 | return $value->jsonSerialize(); |
| 1482 | - } elseif ($value instanceof Jsonable) { |
|
| 1483 | - return json_decode($value->toJson(), true); |
|
| 1484 | - } elseif ($value instanceof Arrayable) { |
|
| 1482 | + } elseif ( $value instanceof Jsonable ) { |
|
| 1483 | + return json_decode( $value->toJson(), true ); |
|
| 1484 | + } elseif ( $value instanceof Arrayable ) { |
|
| 1485 | 1485 | return $value->toArray(); |
| 1486 | 1486 | } else { |
| 1487 | 1487 | return $value; |
| 1488 | 1488 | } |
| 1489 | - }, $this->items); |
|
| 1489 | + }, $this->items ); |
|
| 1490 | 1490 | } |
| 1491 | 1491 | |
| 1492 | 1492 | /** |
@@ -1495,9 +1495,9 @@ discard block |
||
| 1495 | 1495 | * @param int $options |
| 1496 | 1496 | * @return string |
| 1497 | 1497 | */ |
| 1498 | - public function toJson($options = 0) |
|
| 1498 | + public function toJson( $options = 0 ) |
|
| 1499 | 1499 | { |
| 1500 | - return json_encode($this->jsonSerialize(), $options); |
|
| 1500 | + return json_encode( $this->jsonSerialize(), $options ); |
|
| 1501 | 1501 | } |
| 1502 | 1502 | |
| 1503 | 1503 | /** |
@@ -1507,7 +1507,7 @@ discard block |
||
| 1507 | 1507 | */ |
| 1508 | 1508 | public function getIterator() |
| 1509 | 1509 | { |
| 1510 | - return new ArrayIterator($this->items); |
|
| 1510 | + return new ArrayIterator( $this->items ); |
|
| 1511 | 1511 | } |
| 1512 | 1512 | |
| 1513 | 1513 | /** |
@@ -1516,9 +1516,9 @@ discard block |
||
| 1516 | 1516 | * @param int $flags |
| 1517 | 1517 | * @return \CachingIterator |
| 1518 | 1518 | */ |
| 1519 | - public function getCachingIterator($flags = CachingIterator::CALL_TOSTRING) |
|
| 1519 | + public function getCachingIterator( $flags = CachingIterator::CALL_TOSTRING ) |
|
| 1520 | 1520 | { |
| 1521 | - return new CachingIterator($this->getIterator(), $flags); |
|
| 1521 | + return new CachingIterator( $this->getIterator(), $flags ); |
|
| 1522 | 1522 | } |
| 1523 | 1523 | |
| 1524 | 1524 | /** |
@@ -1528,7 +1528,7 @@ discard block |
||
| 1528 | 1528 | */ |
| 1529 | 1529 | public function count() |
| 1530 | 1530 | { |
| 1531 | - return count($this->items); |
|
| 1531 | + return count( $this->items ); |
|
| 1532 | 1532 | } |
| 1533 | 1533 | |
| 1534 | 1534 | /** |
@@ -1538,7 +1538,7 @@ discard block |
||
| 1538 | 1538 | */ |
| 1539 | 1539 | public function toBase() |
| 1540 | 1540 | { |
| 1541 | - return new self($this); |
|
| 1541 | + return new self( $this ); |
|
| 1542 | 1542 | } |
| 1543 | 1543 | |
| 1544 | 1544 | /** |
@@ -1547,9 +1547,9 @@ discard block |
||
| 1547 | 1547 | * @param mixed $key |
| 1548 | 1548 | * @return bool |
| 1549 | 1549 | */ |
| 1550 | - public function offsetExists($key) |
|
| 1550 | + public function offsetExists( $key ) |
|
| 1551 | 1551 | { |
| 1552 | - return array_key_exists($key, $this->items); |
|
| 1552 | + return array_key_exists( $key, $this->items ); |
|
| 1553 | 1553 | } |
| 1554 | 1554 | |
| 1555 | 1555 | /** |
@@ -1558,9 +1558,9 @@ discard block |
||
| 1558 | 1558 | * @param mixed $key |
| 1559 | 1559 | * @return mixed |
| 1560 | 1560 | */ |
| 1561 | - public function offsetGet($key) |
|
| 1561 | + public function offsetGet( $key ) |
|
| 1562 | 1562 | { |
| 1563 | - return $this->items[$key]; |
|
| 1563 | + return $this->items[ $key ]; |
|
| 1564 | 1564 | } |
| 1565 | 1565 | |
| 1566 | 1566 | /** |
@@ -1570,12 +1570,12 @@ discard block |
||
| 1570 | 1570 | * @param mixed $value |
| 1571 | 1571 | * @return void |
| 1572 | 1572 | */ |
| 1573 | - public function offsetSet($key, $value) |
|
| 1573 | + public function offsetSet( $key, $value ) |
|
| 1574 | 1574 | { |
| 1575 | - if (is_null($key)) { |
|
| 1576 | - $this->items[] = $value; |
|
| 1575 | + if ( is_null( $key ) ) { |
|
| 1576 | + $this->items[ ] = $value; |
|
| 1577 | 1577 | } else { |
| 1578 | - $this->items[$key] = $value; |
|
| 1578 | + $this->items[ $key ] = $value; |
|
| 1579 | 1579 | } |
| 1580 | 1580 | } |
| 1581 | 1581 | |
@@ -1585,9 +1585,9 @@ discard block |
||
| 1585 | 1585 | * @param string $key |
| 1586 | 1586 | * @return void |
| 1587 | 1587 | */ |
| 1588 | - public function offsetUnset($key) |
|
| 1588 | + public function offsetUnset( $key ) |
|
| 1589 | 1589 | { |
| 1590 | - unset($this->items[$key]); |
|
| 1590 | + unset( $this->items[ $key ] ); |
|
| 1591 | 1591 | } |
| 1592 | 1592 | |
| 1593 | 1593 | /** |
@@ -1606,23 +1606,23 @@ discard block |
||
| 1606 | 1606 | * @param mixed $items |
| 1607 | 1607 | * @return array |
| 1608 | 1608 | */ |
| 1609 | - protected function getArrayableItems($items) |
|
| 1609 | + protected function getArrayableItems( $items ) |
|
| 1610 | 1610 | { |
| 1611 | - if (is_array($items)) { |
|
| 1611 | + if ( is_array( $items ) ) { |
|
| 1612 | 1612 | return $items; |
| 1613 | - } elseif ($items instanceof self) { |
|
| 1613 | + } elseif ( $items instanceof self ) { |
|
| 1614 | 1614 | return $items->all(); |
| 1615 | - } elseif ($items instanceof Arrayable) { |
|
| 1615 | + } elseif ( $items instanceof Arrayable ) { |
|
| 1616 | 1616 | return $items->toArray(); |
| 1617 | - } elseif ($items instanceof Jsonable) { |
|
| 1618 | - return json_decode($items->toJson(), true); |
|
| 1619 | - } elseif ($items instanceof JsonSerializable) { |
|
| 1617 | + } elseif ( $items instanceof Jsonable ) { |
|
| 1618 | + return json_decode( $items->toJson(), true ); |
|
| 1619 | + } elseif ( $items instanceof JsonSerializable ) { |
|
| 1620 | 1620 | return $items->jsonSerialize(); |
| 1621 | - } elseif ($items instanceof Traversable) { |
|
| 1622 | - return iterator_to_array($items); |
|
| 1621 | + } elseif ( $items instanceof Traversable ) { |
|
| 1622 | + return iterator_to_array( $items ); |
|
| 1623 | 1623 | } |
| 1624 | 1624 | |
| 1625 | - return (array) $items; |
|
| 1625 | + return (array)$items; |
|
| 1626 | 1626 | } |
| 1627 | 1627 | |
| 1628 | 1628 | /** |
@@ -1631,9 +1631,9 @@ discard block |
||
| 1631 | 1631 | * @param string $method |
| 1632 | 1632 | * @return void |
| 1633 | 1633 | */ |
| 1634 | - public static function proxy($method) |
|
| 1634 | + public static function proxy( $method ) |
|
| 1635 | 1635 | { |
| 1636 | - static::$proxies[] = $method; |
|
| 1636 | + static::$proxies[ ] = $method; |
|
| 1637 | 1637 | } |
| 1638 | 1638 | |
| 1639 | 1639 | /** |
@@ -1644,12 +1644,12 @@ discard block |
||
| 1644 | 1644 | * |
| 1645 | 1645 | * @throws \Exception |
| 1646 | 1646 | */ |
| 1647 | - public function __get($key) |
|
| 1647 | + public function __get( $key ) |
|
| 1648 | 1648 | { |
| 1649 | - if (! in_array($key, static::$proxies)) { |
|
| 1650 | - throw new Exception("Property [{$key}] does not exist on this collection instance."); |
|
| 1649 | + if ( ! in_array( $key, static::$proxies ) ) { |
|
| 1650 | + throw new Exception( "Property [{$key}] does not exist on this collection instance." ); |
|
| 1651 | 1651 | } |
| 1652 | 1652 | |
| 1653 | - return new HigherOrderCollectionProxy($this, $key); |
|
| 1653 | + return new HigherOrderCollectionProxy( $this, $key ); |
|
| 1654 | 1654 | } |
| 1655 | 1655 | } |
@@ -16,9 +16,9 @@ |
||
| 16 | 16 | * @param mixed $default |
| 17 | 17 | * @return mixed |
| 18 | 18 | */ |
| 19 | - public static function get($key = null, $default = null) |
|
| 19 | + public static function get( $key = null, $default = null ) |
|
| 20 | 20 | { |
| 21 | - return static::$app['request']->input($key, $default); |
|
| 21 | + return static::$app[ 'request' ]->input( $key, $default ); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | /** |
@@ -16,9 +16,9 @@ discard block |
||
| 16 | 16 | * @param mixed $value |
| 17 | 17 | * @return bool |
| 18 | 18 | */ |
| 19 | - public static function accessible($value) |
|
| 19 | + public static function accessible( $value ) |
|
| 20 | 20 | { |
| 21 | - return is_array($value) || $value instanceof ArrayAccess; |
|
| 21 | + return is_array( $value ) || $value instanceof ArrayAccess; |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | /** |
@@ -29,10 +29,10 @@ discard block |
||
| 29 | 29 | * @param mixed $value |
| 30 | 30 | * @return array |
| 31 | 31 | */ |
| 32 | - public static function add($array, $key, $value) |
|
| 32 | + public static function add( $array, $key, $value ) |
|
| 33 | 33 | { |
| 34 | - if (is_null(static::get($array, $key))) { |
|
| 35 | - static::set($array, $key, $value); |
|
| 34 | + if ( is_null( static::get( $array, $key ) ) ) { |
|
| 35 | + static::set( $array, $key, $value ); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | return $array; |
@@ -44,18 +44,18 @@ discard block |
||
| 44 | 44 | * @param array $array |
| 45 | 45 | * @return array |
| 46 | 46 | */ |
| 47 | - public static function collapse($array) |
|
| 47 | + public static function collapse( $array ) |
|
| 48 | 48 | { |
| 49 | - $results = []; |
|
| 49 | + $results = [ ]; |
|
| 50 | 50 | |
| 51 | - foreach ($array as $values) { |
|
| 52 | - if ($values instanceof Collection) { |
|
| 51 | + foreach ( $array as $values ) { |
|
| 52 | + if ( $values instanceof Collection ) { |
|
| 53 | 53 | $values = $values->all(); |
| 54 | - } elseif (! is_array($values)) { |
|
| 54 | + } elseif ( ! is_array( $values ) ) { |
|
| 55 | 55 | continue; |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | - $results = array_merge($results, $values); |
|
| 58 | + $results = array_merge( $results, $values ); |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | return $results; |
@@ -67,18 +67,18 @@ discard block |
||
| 67 | 67 | * @param array ...$arrays |
| 68 | 68 | * @return array |
| 69 | 69 | */ |
| 70 | - public static function crossJoin(...$arrays) |
|
| 70 | + public static function crossJoin( ...$arrays ) |
|
| 71 | 71 | { |
| 72 | - $results = [[]]; |
|
| 72 | + $results = [ [ ] ]; |
|
| 73 | 73 | |
| 74 | - foreach ($arrays as $index => $array) { |
|
| 75 | - $append = []; |
|
| 74 | + foreach ( $arrays as $index => $array ) { |
|
| 75 | + $append = [ ]; |
|
| 76 | 76 | |
| 77 | - foreach ($results as $product) { |
|
| 78 | - foreach ($array as $item) { |
|
| 79 | - $product[$index] = $item; |
|
| 77 | + foreach ( $results as $product ) { |
|
| 78 | + foreach ( $array as $item ) { |
|
| 79 | + $product[ $index ] = $item; |
|
| 80 | 80 | |
| 81 | - $append[] = $product; |
|
| 81 | + $append[ ] = $product; |
|
| 82 | 82 | } |
| 83 | 83 | } |
| 84 | 84 | |
@@ -94,9 +94,9 @@ discard block |
||
| 94 | 94 | * @param array $array |
| 95 | 95 | * @return array |
| 96 | 96 | */ |
| 97 | - public static function divide($array) |
|
| 97 | + public static function divide( $array ) |
|
| 98 | 98 | { |
| 99 | - return [array_keys($array), array_values($array)]; |
|
| 99 | + return [ array_keys( $array ), array_values( $array ) ]; |
|
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | /** |
@@ -106,15 +106,15 @@ discard block |
||
| 106 | 106 | * @param string $prepend |
| 107 | 107 | * @return array |
| 108 | 108 | */ |
| 109 | - public static function dot($array, $prepend = '') |
|
| 109 | + public static function dot( $array, $prepend = '' ) |
|
| 110 | 110 | { |
| 111 | - $results = []; |
|
| 111 | + $results = [ ]; |
|
| 112 | 112 | |
| 113 | - foreach ($array as $key => $value) { |
|
| 114 | - if (is_array($value) && ! empty($value)) { |
|
| 115 | - $results = array_merge($results, static::dot($value, $prepend.$key.'.')); |
|
| 113 | + foreach ( $array as $key => $value ) { |
|
| 114 | + if ( is_array( $value ) && ! empty( $value ) ) { |
|
| 115 | + $results = array_merge( $results, static::dot( $value, $prepend . $key . '.' ) ); |
|
| 116 | 116 | } else { |
| 117 | - $results[$prepend.$key] = $value; |
|
| 117 | + $results[ $prepend . $key ] = $value; |
|
| 118 | 118 | } |
| 119 | 119 | } |
| 120 | 120 | |
@@ -128,9 +128,9 @@ discard block |
||
| 128 | 128 | * @param array|string $keys |
| 129 | 129 | * @return array |
| 130 | 130 | */ |
| 131 | - public static function except($array, $keys) |
|
| 131 | + public static function except( $array, $keys ) |
|
| 132 | 132 | { |
| 133 | - static::forget($array, $keys); |
|
| 133 | + static::forget( $array, $keys ); |
|
| 134 | 134 | |
| 135 | 135 | return $array; |
| 136 | 136 | } |
@@ -142,13 +142,13 @@ discard block |
||
| 142 | 142 | * @param string|int $key |
| 143 | 143 | * @return bool |
| 144 | 144 | */ |
| 145 | - public static function exists($array, $key) |
|
| 145 | + public static function exists( $array, $key ) |
|
| 146 | 146 | { |
| 147 | - if ($array instanceof ArrayAccess) { |
|
| 148 | - return $array->offsetExists($key); |
|
| 147 | + if ( $array instanceof ArrayAccess ) { |
|
| 148 | + return $array->offsetExists( $key ); |
|
| 149 | 149 | } |
| 150 | 150 | |
| 151 | - return array_key_exists($key, $array); |
|
| 151 | + return array_key_exists( $key, $array ); |
|
| 152 | 152 | } |
| 153 | 153 | |
| 154 | 154 | /** |
@@ -159,25 +159,25 @@ discard block |
||
| 159 | 159 | * @param mixed $default |
| 160 | 160 | * @return mixed |
| 161 | 161 | */ |
| 162 | - public static function first($array, callable $callback = null, $default = null) |
|
| 162 | + public static function first( $array, callable $callback = null, $default = null ) |
|
| 163 | 163 | { |
| 164 | - if (is_null($callback)) { |
|
| 165 | - if (empty($array)) { |
|
| 166 | - return value($default); |
|
| 164 | + if ( is_null( $callback ) ) { |
|
| 165 | + if ( empty( $array ) ) { |
|
| 166 | + return value( $default ); |
|
| 167 | 167 | } |
| 168 | 168 | |
| 169 | - foreach ($array as $item) { |
|
| 169 | + foreach ( $array as $item ) { |
|
| 170 | 170 | return $item; |
| 171 | 171 | } |
| 172 | 172 | } |
| 173 | 173 | |
| 174 | - foreach ($array as $key => $value) { |
|
| 175 | - if (call_user_func($callback, $value, $key)) { |
|
| 174 | + foreach ( $array as $key => $value ) { |
|
| 175 | + if ( call_user_func( $callback, $value, $key ) ) { |
|
| 176 | 176 | return $value; |
| 177 | 177 | } |
| 178 | 178 | } |
| 179 | 179 | |
| 180 | - return value($default); |
|
| 180 | + return value( $default ); |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | /** |
@@ -188,13 +188,13 @@ discard block |
||
| 188 | 188 | * @param mixed $default |
| 189 | 189 | * @return mixed |
| 190 | 190 | */ |
| 191 | - public static function last($array, callable $callback = null, $default = null) |
|
| 191 | + public static function last( $array, callable $callback = null, $default = null ) |
|
| 192 | 192 | { |
| 193 | - if (is_null($callback)) { |
|
| 194 | - return empty($array) ? value($default) : end($array); |
|
| 193 | + if ( is_null( $callback ) ) { |
|
| 194 | + return empty( $array ) ? value( $default ) : end( $array ); |
|
| 195 | 195 | } |
| 196 | 196 | |
| 197 | - return static::first(array_reverse($array, true), $callback, $default); |
|
| 197 | + return static::first( array_reverse( $array, true ), $callback, $default ); |
|
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | /** |
@@ -204,19 +204,19 @@ discard block |
||
| 204 | 204 | * @param int $depth |
| 205 | 205 | * @return array |
| 206 | 206 | */ |
| 207 | - public static function flatten($array, $depth = INF) |
|
| 207 | + public static function flatten( $array, $depth = INF ) |
|
| 208 | 208 | { |
| 209 | - return array_reduce($array, function ($result, $item) use ($depth) { |
|
| 209 | + return array_reduce( $array, function( $result, $item ) use ( $depth ) { |
|
| 210 | 210 | $item = $item instanceof Collection ? $item->all() : $item; |
| 211 | 211 | |
| 212 | - if (! is_array($item)) { |
|
| 213 | - return array_merge($result, [$item]); |
|
| 214 | - } elseif ($depth === 1) { |
|
| 215 | - return array_merge($result, array_values($item)); |
|
| 212 | + if ( ! is_array( $item ) ) { |
|
| 213 | + return array_merge( $result, [ $item ] ); |
|
| 214 | + } elseif ( $depth === 1 ) { |
|
| 215 | + return array_merge( $result, array_values( $item ) ); |
|
| 216 | 216 | } else { |
| 217 | - return array_merge($result, static::flatten($item, $depth - 1)); |
|
| 217 | + return array_merge( $result, static::flatten( $item, $depth - 1 ) ); |
|
| 218 | 218 | } |
| 219 | - }, []); |
|
| 219 | + }, [ ] ); |
|
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | /** |
@@ -226,40 +226,40 @@ discard block |
||
| 226 | 226 | * @param array|string $keys |
| 227 | 227 | * @return void |
| 228 | 228 | */ |
| 229 | - public static function forget(&$array, $keys) |
|
| 229 | + public static function forget( &$array, $keys ) |
|
| 230 | 230 | { |
| 231 | 231 | $original = &$array; |
| 232 | 232 | |
| 233 | - $keys = (array) $keys; |
|
| 233 | + $keys = (array)$keys; |
|
| 234 | 234 | |
| 235 | - if (count($keys) === 0) { |
|
| 235 | + if ( count( $keys ) === 0 ) { |
|
| 236 | 236 | return; |
| 237 | 237 | } |
| 238 | 238 | |
| 239 | - foreach ($keys as $key) { |
|
| 239 | + foreach ( $keys as $key ) { |
|
| 240 | 240 | // if the exact key exists in the top-level, remove it |
| 241 | - if (static::exists($array, $key)) { |
|
| 242 | - unset($array[$key]); |
|
| 241 | + if ( static::exists( $array, $key ) ) { |
|
| 242 | + unset( $array[ $key ] ); |
|
| 243 | 243 | |
| 244 | 244 | continue; |
| 245 | 245 | } |
| 246 | 246 | |
| 247 | - $parts = explode('.', $key); |
|
| 247 | + $parts = explode( '.', $key ); |
|
| 248 | 248 | |
| 249 | 249 | // clean up before each pass |
| 250 | 250 | $array = &$original; |
| 251 | 251 | |
| 252 | - while (count($parts) > 1) { |
|
| 253 | - $part = array_shift($parts); |
|
| 252 | + while ( count( $parts ) > 1 ) { |
|
| 253 | + $part = array_shift( $parts ); |
|
| 254 | 254 | |
| 255 | - if (isset($array[$part]) && is_array($array[$part])) { |
|
| 256 | - $array = &$array[$part]; |
|
| 255 | + if ( isset( $array[ $part ] ) && is_array( $array[ $part ] ) ) { |
|
| 256 | + $array = &$array[ $part ]; |
|
| 257 | 257 | } else { |
| 258 | 258 | continue 2; |
| 259 | 259 | } |
| 260 | 260 | } |
| 261 | 261 | |
| 262 | - unset($array[array_shift($parts)]); |
|
| 262 | + unset( $array[ array_shift( $parts ) ] ); |
|
| 263 | 263 | } |
| 264 | 264 | } |
| 265 | 265 | |
@@ -271,25 +271,25 @@ discard block |
||
| 271 | 271 | * @param mixed $default |
| 272 | 272 | * @return mixed |
| 273 | 273 | */ |
| 274 | - public static function get($array, $key, $default = null) |
|
| 274 | + public static function get( $array, $key, $default = null ) |
|
| 275 | 275 | { |
| 276 | - if (! static::accessible($array)) { |
|
| 277 | - return value($default); |
|
| 276 | + if ( ! static::accessible( $array ) ) { |
|
| 277 | + return value( $default ); |
|
| 278 | 278 | } |
| 279 | 279 | |
| 280 | - if (is_null($key)) { |
|
| 280 | + if ( is_null( $key ) ) { |
|
| 281 | 281 | return $array; |
| 282 | 282 | } |
| 283 | 283 | |
| 284 | - if (static::exists($array, $key)) { |
|
| 285 | - return $array[$key]; |
|
| 284 | + if ( static::exists( $array, $key ) ) { |
|
| 285 | + return $array[ $key ]; |
|
| 286 | 286 | } |
| 287 | 287 | |
| 288 | - foreach (explode('.', $key) as $segment) { |
|
| 289 | - if (static::accessible($array) && static::exists($array, $segment)) { |
|
| 290 | - $array = $array[$segment]; |
|
| 288 | + foreach ( explode( '.', $key ) as $segment ) { |
|
| 289 | + if ( static::accessible( $array ) && static::exists( $array, $segment ) ) { |
|
| 290 | + $array = $array[ $segment ]; |
|
| 291 | 291 | } else { |
| 292 | - return value($default); |
|
| 292 | + return value( $default ); |
|
| 293 | 293 | } |
| 294 | 294 | } |
| 295 | 295 | |
@@ -303,32 +303,32 @@ discard block |
||
| 303 | 303 | * @param string|array $keys |
| 304 | 304 | * @return bool |
| 305 | 305 | */ |
| 306 | - public static function has($array, $keys) |
|
| 306 | + public static function has( $array, $keys ) |
|
| 307 | 307 | { |
| 308 | - if (is_null($keys)) { |
|
| 308 | + if ( is_null( $keys ) ) { |
|
| 309 | 309 | return false; |
| 310 | 310 | } |
| 311 | 311 | |
| 312 | - $keys = (array) $keys; |
|
| 312 | + $keys = (array)$keys; |
|
| 313 | 313 | |
| 314 | - if (! $array) { |
|
| 314 | + if ( ! $array ) { |
|
| 315 | 315 | return false; |
| 316 | 316 | } |
| 317 | 317 | |
| 318 | - if ($keys === []) { |
|
| 318 | + if ( $keys === [ ] ) { |
|
| 319 | 319 | return false; |
| 320 | 320 | } |
| 321 | 321 | |
| 322 | - foreach ($keys as $key) { |
|
| 322 | + foreach ( $keys as $key ) { |
|
| 323 | 323 | $subKeyArray = $array; |
| 324 | 324 | |
| 325 | - if (static::exists($array, $key)) { |
|
| 325 | + if ( static::exists( $array, $key ) ) { |
|
| 326 | 326 | continue; |
| 327 | 327 | } |
| 328 | 328 | |
| 329 | - foreach (explode('.', $key) as $segment) { |
|
| 330 | - if (static::accessible($subKeyArray) && static::exists($subKeyArray, $segment)) { |
|
| 331 | - $subKeyArray = $subKeyArray[$segment]; |
|
| 329 | + foreach ( explode( '.', $key ) as $segment ) { |
|
| 330 | + if ( static::accessible( $subKeyArray ) && static::exists( $subKeyArray, $segment ) ) { |
|
| 331 | + $subKeyArray = $subKeyArray[ $segment ]; |
|
| 332 | 332 | } else { |
| 333 | 333 | return false; |
| 334 | 334 | } |
@@ -346,11 +346,11 @@ discard block |
||
| 346 | 346 | * @param array $array |
| 347 | 347 | * @return bool |
| 348 | 348 | */ |
| 349 | - public static function isAssoc(array $array) |
|
| 349 | + public static function isAssoc( array $array ) |
|
| 350 | 350 | { |
| 351 | - $keys = array_keys($array); |
|
| 351 | + $keys = array_keys( $array ); |
|
| 352 | 352 | |
| 353 | - return array_keys($keys) !== $keys; |
|
| 353 | + return array_keys( $keys ) !== $keys; |
|
| 354 | 354 | } |
| 355 | 355 | |
| 356 | 356 | /** |
@@ -360,9 +360,9 @@ discard block |
||
| 360 | 360 | * @param array|string $keys |
| 361 | 361 | * @return array |
| 362 | 362 | */ |
| 363 | - public static function only($array, $keys) |
|
| 363 | + public static function only( $array, $keys ) |
|
| 364 | 364 | { |
| 365 | - return array_intersect_key($array, array_flip((array) $keys)); |
|
| 365 | + return array_intersect_key( $array, array_flip( (array)$keys ) ); |
|
| 366 | 366 | } |
| 367 | 367 | |
| 368 | 368 | /** |
@@ -373,28 +373,28 @@ discard block |
||
| 373 | 373 | * @param string|array|null $key |
| 374 | 374 | * @return array |
| 375 | 375 | */ |
| 376 | - public static function pluck($array, $value, $key = null) |
|
| 376 | + public static function pluck( $array, $value, $key = null ) |
|
| 377 | 377 | { |
| 378 | - $results = []; |
|
| 378 | + $results = [ ]; |
|
| 379 | 379 | |
| 380 | - list($value, $key) = static::explodePluckParameters($value, $key); |
|
| 380 | + list( $value, $key ) = static::explodePluckParameters( $value, $key ); |
|
| 381 | 381 | |
| 382 | - foreach ($array as $item) { |
|
| 383 | - $itemValue = data_get($item, $value); |
|
| 382 | + foreach ( $array as $item ) { |
|
| 383 | + $itemValue = data_get( $item, $value ); |
|
| 384 | 384 | |
| 385 | 385 | // If the key is "null", we will just append the value to the array and keep |
| 386 | 386 | // looping. Otherwise we will key the array using the value of the key we |
| 387 | 387 | // received from the developer. Then we'll return the final array form. |
| 388 | - if (is_null($key)) { |
|
| 389 | - $results[] = $itemValue; |
|
| 388 | + if ( is_null( $key ) ) { |
|
| 389 | + $results[ ] = $itemValue; |
|
| 390 | 390 | } else { |
| 391 | - $itemKey = data_get($item, $key); |
|
| 391 | + $itemKey = data_get( $item, $key ); |
|
| 392 | 392 | |
| 393 | - if (is_object($itemKey) && method_exists($itemKey, '__toString')) { |
|
| 394 | - $itemKey = (string) $itemKey; |
|
| 393 | + if ( is_object( $itemKey ) && method_exists( $itemKey, '__toString' ) ) { |
|
| 394 | + $itemKey = (string)$itemKey; |
|
| 395 | 395 | } |
| 396 | 396 | |
| 397 | - $results[$itemKey] = $itemValue; |
|
| 397 | + $results[ $itemKey ] = $itemValue; |
|
| 398 | 398 | } |
| 399 | 399 | } |
| 400 | 400 | |
@@ -408,13 +408,13 @@ discard block |
||
| 408 | 408 | * @param string|array|null $key |
| 409 | 409 | * @return array |
| 410 | 410 | */ |
| 411 | - protected static function explodePluckParameters($value, $key) |
|
| 411 | + protected static function explodePluckParameters( $value, $key ) |
|
| 412 | 412 | { |
| 413 | - $value = is_string($value) ? explode('.', $value) : $value; |
|
| 413 | + $value = is_string( $value ) ? explode( '.', $value ) : $value; |
|
| 414 | 414 | |
| 415 | - $key = is_null($key) || is_array($key) ? $key : explode('.', $key); |
|
| 415 | + $key = is_null( $key ) || is_array( $key ) ? $key : explode( '.', $key ); |
|
| 416 | 416 | |
| 417 | - return [$value, $key]; |
|
| 417 | + return [ $value, $key ]; |
|
| 418 | 418 | } |
| 419 | 419 | |
| 420 | 420 | /** |
@@ -425,12 +425,12 @@ discard block |
||
| 425 | 425 | * @param mixed $key |
| 426 | 426 | * @return array |
| 427 | 427 | */ |
| 428 | - public static function prepend($array, $value, $key = null) |
|
| 428 | + public static function prepend( $array, $value, $key = null ) |
|
| 429 | 429 | { |
| 430 | - if (is_null($key)) { |
|
| 431 | - array_unshift($array, $value); |
|
| 430 | + if ( is_null( $key ) ) { |
|
| 431 | + array_unshift( $array, $value ); |
|
| 432 | 432 | } else { |
| 433 | - $array = [$key => $value] + $array; |
|
| 433 | + $array = [ $key => $value ] + $array; |
|
| 434 | 434 | } |
| 435 | 435 | |
| 436 | 436 | return $array; |
@@ -444,11 +444,11 @@ discard block |
||
| 444 | 444 | * @param mixed $default |
| 445 | 445 | * @return mixed |
| 446 | 446 | */ |
| 447 | - public static function pull(&$array, $key, $default = null) |
|
| 447 | + public static function pull( &$array, $key, $default = null ) |
|
| 448 | 448 | { |
| 449 | - $value = static::get($array, $key, $default); |
|
| 449 | + $value = static::get( $array, $key, $default ); |
|
| 450 | 450 | |
| 451 | - static::forget($array, $key); |
|
| 451 | + static::forget( $array, $key ); |
|
| 452 | 452 | |
| 453 | 453 | return $value; |
| 454 | 454 | } |
@@ -462,32 +462,32 @@ discard block |
||
| 462 | 462 | * |
| 463 | 463 | * @throws \InvalidArgumentException |
| 464 | 464 | */ |
| 465 | - public static function random($array, $number = null) |
|
| 465 | + public static function random( $array, $number = null ) |
|
| 466 | 466 | { |
| 467 | - $requested = is_null($number) ? 1 : $number; |
|
| 467 | + $requested = is_null( $number ) ? 1 : $number; |
|
| 468 | 468 | |
| 469 | - $count = count($array); |
|
| 469 | + $count = count( $array ); |
|
| 470 | 470 | |
| 471 | - if ($requested > $count) { |
|
| 471 | + if ( $requested > $count ) { |
|
| 472 | 472 | throw new InvalidArgumentException( |
| 473 | 473 | "You requested {$requested} items, but there are only {$count} items available." |
| 474 | 474 | ); |
| 475 | 475 | } |
| 476 | 476 | |
| 477 | - if (is_null($number)) { |
|
| 478 | - return $array[array_rand($array)]; |
|
| 477 | + if ( is_null( $number ) ) { |
|
| 478 | + return $array[ array_rand( $array ) ]; |
|
| 479 | 479 | } |
| 480 | 480 | |
| 481 | - if ((int) $number === 0) { |
|
| 482 | - return []; |
|
| 481 | + if ( (int)$number === 0 ) { |
|
| 482 | + return [ ]; |
|
| 483 | 483 | } |
| 484 | 484 | |
| 485 | - $keys = array_rand($array, $number); |
|
| 485 | + $keys = array_rand( $array, $number ); |
|
| 486 | 486 | |
| 487 | - $results = []; |
|
| 487 | + $results = [ ]; |
|
| 488 | 488 | |
| 489 | - foreach ((array) $keys as $key) { |
|
| 490 | - $results[] = $array[$key]; |
|
| 489 | + foreach ( (array)$keys as $key ) { |
|
| 490 | + $results[ ] = $array[ $key ]; |
|
| 491 | 491 | } |
| 492 | 492 | |
| 493 | 493 | return $results; |
@@ -503,28 +503,28 @@ discard block |
||
| 503 | 503 | * @param mixed $value |
| 504 | 504 | * @return array |
| 505 | 505 | */ |
| 506 | - public static function set(&$array, $key, $value) |
|
| 506 | + public static function set( &$array, $key, $value ) |
|
| 507 | 507 | { |
| 508 | - if (is_null($key)) { |
|
| 508 | + if ( is_null( $key ) ) { |
|
| 509 | 509 | return $array = $value; |
| 510 | 510 | } |
| 511 | 511 | |
| 512 | - $keys = explode('.', $key); |
|
| 512 | + $keys = explode( '.', $key ); |
|
| 513 | 513 | |
| 514 | - while (count($keys) > 1) { |
|
| 515 | - $key = array_shift($keys); |
|
| 514 | + while ( count( $keys ) > 1 ) { |
|
| 515 | + $key = array_shift( $keys ); |
|
| 516 | 516 | |
| 517 | 517 | // If the key doesn't exist at this depth, we will just create an empty array |
| 518 | 518 | // to hold the next value, allowing us to create the arrays to hold final |
| 519 | 519 | // values at the correct depth. Then we'll keep digging into the array. |
| 520 | - if (! isset($array[$key]) || ! is_array($array[$key])) { |
|
| 521 | - $array[$key] = []; |
|
| 520 | + if ( ! isset( $array[ $key ] ) || ! is_array( $array[ $key ] ) ) { |
|
| 521 | + $array[ $key ] = [ ]; |
|
| 522 | 522 | } |
| 523 | 523 | |
| 524 | - $array = &$array[$key]; |
|
| 524 | + $array = &$array[ $key ]; |
|
| 525 | 525 | } |
| 526 | 526 | |
| 527 | - $array[array_shift($keys)] = $value; |
|
| 527 | + $array[ array_shift( $keys ) ] = $value; |
|
| 528 | 528 | |
| 529 | 529 | return $array; |
| 530 | 530 | } |
@@ -535,9 +535,9 @@ discard block |
||
| 535 | 535 | * @param array $array |
| 536 | 536 | * @return array |
| 537 | 537 | */ |
| 538 | - public static function shuffle($array) |
|
| 538 | + public static function shuffle( $array ) |
|
| 539 | 539 | { |
| 540 | - shuffle($array); |
|
| 540 | + shuffle( $array ); |
|
| 541 | 541 | |
| 542 | 542 | return $array; |
| 543 | 543 | } |
@@ -549,9 +549,9 @@ discard block |
||
| 549 | 549 | * @param callable|string $callback |
| 550 | 550 | * @return array |
| 551 | 551 | */ |
| 552 | - public static function sort($array, $callback) |
|
| 552 | + public static function sort( $array, $callback ) |
|
| 553 | 553 | { |
| 554 | - return Collection::make($array)->sortBy($callback)->all(); |
|
| 554 | + return Collection::make( $array )->sortBy( $callback )->all(); |
|
| 555 | 555 | } |
| 556 | 556 | |
| 557 | 557 | /** |
@@ -560,18 +560,18 @@ discard block |
||
| 560 | 560 | * @param array $array |
| 561 | 561 | * @return array |
| 562 | 562 | */ |
| 563 | - public static function sortRecursive($array) |
|
| 563 | + public static function sortRecursive( $array ) |
|
| 564 | 564 | { |
| 565 | - foreach ($array as &$value) { |
|
| 566 | - if (is_array($value)) { |
|
| 567 | - $value = static::sortRecursive($value); |
|
| 565 | + foreach ( $array as &$value ) { |
|
| 566 | + if ( is_array( $value ) ) { |
|
| 567 | + $value = static::sortRecursive( $value ); |
|
| 568 | 568 | } |
| 569 | 569 | } |
| 570 | 570 | |
| 571 | - if (static::isAssoc($array)) { |
|
| 572 | - ksort($array); |
|
| 571 | + if ( static::isAssoc( $array ) ) { |
|
| 572 | + ksort( $array ); |
|
| 573 | 573 | } else { |
| 574 | - sort($array); |
|
| 574 | + sort( $array ); |
|
| 575 | 575 | } |
| 576 | 576 | |
| 577 | 577 | return $array; |
@@ -584,9 +584,9 @@ discard block |
||
| 584 | 584 | * @param callable $callback |
| 585 | 585 | * @return array |
| 586 | 586 | */ |
| 587 | - public static function where($array, callable $callback) |
|
| 587 | + public static function where( $array, callable $callback ) |
|
| 588 | 588 | { |
| 589 | - return array_filter($array, $callback, ARRAY_FILTER_USE_BOTH); |
|
| 589 | + return array_filter( $array, $callback, ARRAY_FILTER_USE_BOTH ); |
|
| 590 | 590 | } |
| 591 | 591 | |
| 592 | 592 | /** |
@@ -595,8 +595,8 @@ discard block |
||
| 595 | 595 | * @param mixed $value |
| 596 | 596 | * @return array |
| 597 | 597 | */ |
| 598 | - public static function wrap($value) |
|
| 598 | + public static function wrap( $value ) |
|
| 599 | 599 | { |
| 600 | - return ! is_array($value) ? [$value] : $value; |
|
| 600 | + return ! is_array( $value ) ? [ $value ] : $value; |
|
| 601 | 601 | } |
| 602 | 602 | } |
@@ -13,14 +13,14 @@ |
||
| 13 | 13 | * @param mixed $value |
| 14 | 14 | * @return void |
| 15 | 15 | */ |
| 16 | - public function dump($value) |
|
| 16 | + public function dump( $value ) |
|
| 17 | 17 | { |
| 18 | - if (class_exists(CliDumper::class)) { |
|
| 18 | + if ( class_exists( CliDumper::class ) ) { |
|
| 19 | 19 | $dumper = 'cli' === PHP_SAPI ? new CliDumper : new HtmlDumper; |
| 20 | 20 | |
| 21 | - $dumper->dump((new VarCloner)->cloneVar($value)); |
|
| 21 | + $dumper->dump( ( new VarCloner )->cloneVar( $value ) ); |
|
| 22 | 22 | } else { |
| 23 | - var_dump($value); |
|
| 23 | + var_dump( $value ); |
|
| 24 | 24 | } |
| 25 | 25 | } |
| 26 | 26 | } |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | * @param array $context |
| 12 | 12 | * @return void |
| 13 | 13 | */ |
| 14 | - public function alert($message, array $context = []); |
|
| 14 | + public function alert( $message, array $context = [ ] ); |
|
| 15 | 15 | |
| 16 | 16 | /** |
| 17 | 17 | * Log a critical message to the logs. |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | * @param array $context |
| 21 | 21 | * @return void |
| 22 | 22 | */ |
| 23 | - public function critical($message, array $context = []); |
|
| 23 | + public function critical( $message, array $context = [ ] ); |
|
| 24 | 24 | |
| 25 | 25 | /** |
| 26 | 26 | * Log an error message to the logs. |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | * @param array $context |
| 30 | 30 | * @return void |
| 31 | 31 | */ |
| 32 | - public function error($message, array $context = []); |
|
| 32 | + public function error( $message, array $context = [ ] ); |
|
| 33 | 33 | |
| 34 | 34 | /** |
| 35 | 35 | * Log a warning message to the logs. |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | * @param array $context |
| 39 | 39 | * @return void |
| 40 | 40 | */ |
| 41 | - public function warning($message, array $context = []); |
|
| 41 | + public function warning( $message, array $context = [ ] ); |
|
| 42 | 42 | |
| 43 | 43 | /** |
| 44 | 44 | * Log a notice to the logs. |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | * @param array $context |
| 48 | 48 | * @return void |
| 49 | 49 | */ |
| 50 | - public function notice($message, array $context = []); |
|
| 50 | + public function notice( $message, array $context = [ ] ); |
|
| 51 | 51 | |
| 52 | 52 | /** |
| 53 | 53 | * Log an informational message to the logs. |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | * @param array $context |
| 57 | 57 | * @return void |
| 58 | 58 | */ |
| 59 | - public function info($message, array $context = []); |
|
| 59 | + public function info( $message, array $context = [ ] ); |
|
| 60 | 60 | |
| 61 | 61 | /** |
| 62 | 62 | * Log a debug message to the logs. |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | * @param array $context |
| 66 | 66 | * @return void |
| 67 | 67 | */ |
| 68 | - public function debug($message, array $context = []); |
|
| 68 | + public function debug( $message, array $context = [ ] ); |
|
| 69 | 69 | |
| 70 | 70 | /** |
| 71 | 71 | * Log a message to the logs. |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | * @param array $context |
| 76 | 76 | * @return void |
| 77 | 77 | */ |
| 78 | - public function log($level, $message, array $context = []); |
|
| 78 | + public function log( $level, $message, array $context = [ ] ); |
|
| 79 | 79 | |
| 80 | 80 | /** |
| 81 | 81 | * Register a file log handler. |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | * @param string $level |
| 85 | 85 | * @return void |
| 86 | 86 | */ |
| 87 | - public function useFiles($path, $level = 'debug'); |
|
| 87 | + public function useFiles( $path, $level = 'debug' ); |
|
| 88 | 88 | |
| 89 | 89 | /** |
| 90 | 90 | * Register a daily file log handler. |
@@ -94,5 +94,5 @@ discard block |
||
| 94 | 94 | * @param string $level |
| 95 | 95 | * @return void |
| 96 | 96 | */ |
| 97 | - public function useDailyFiles($path, $days = 0, $level = 'debug'); |
|
| 97 | + public function useDailyFiles( $path, $days = 0, $level = 'debug' ); |
|
| 98 | 98 | } |