Skip to content

Commit 29d2c53

Browse files
committed
args() now takes defaults and removes 'url'
1 parent e141930 commit 29d2c53

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

Controller/Component/InputComponent.php

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,14 +160,18 @@ public function get($name, $default=false) {
160160
* - passedArgs
161161
* - query
162162
*
163+
* @param array $defaults
163164
* @return array $args
164165
*/
165-
public function args() {
166-
return array_merge(
167-
$this->request->named,
168-
$this->request->passedArgs,
169-
$this->request->query
166+
public function args($defaults = []) {
167+
$args = array_merge(
168+
(array)$defaults,
169+
(array)$this->request->named,
170+
(array)$this->request->passedArgs,
171+
(array)$this->request->query
170172
);
173+
unset($args['url']);
174+
return $args;
171175
}
172176

173177

0 commit comments

Comments
 (0)