From bbe1d9838c93339348bd5464a4b8a2d9ffbdee9c Mon Sep 17 00:00:00 2001 From: Johan Janssens Date: Mon, 16 May 2016 02:11:59 +0200 Subject: [PATCH] Code cleanup --- code/command/mixin/mixin.php | 2 +- code/dispatcher/abstract.php | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/command/mixin/mixin.php b/code/command/mixin/mixin.php index 1ab4ad165f..172a1055da 100644 --- a/code/command/mixin/mixin.php +++ b/code/command/mixin/mixin.php @@ -324,7 +324,7 @@ public function getMixableMethods($exclude = array()) /** * Get the priority of the handler * - * @return integer The handler priority + * @return integer The handler priority */ public function getPriority() { diff --git a/code/dispatcher/abstract.php b/code/dispatcher/abstract.php index a942586c41..d504d896f8 100644 --- a/code/dispatcher/abstract.php +++ b/code/dispatcher/abstract.php @@ -166,8 +166,8 @@ public function getController() /** * Method to set a controller object attached to the dispatcher * - * @param mixed $controller An object that implements ControllerInterface, ObjectIdentifier object - * or valid identifier string + * @param mixed $controller An object that implements ControllerInterface, ObjectIdentifier object + * or valid identifier string * @param array $config An optional associative array of configuration options * @return $this */ @@ -182,9 +182,9 @@ public function setController($controller, $config = array()) $controller = StringInflector::singularize($controller); } - $identifier = $this->getIdentifier()->toArray(); - $identifier['path'] = array('controller'); - $identifier['name'] = $controller; + $identifier = $this->getIdentifier()->toArray(); + $identifier['path'] = array('controller'); + $identifier['name'] = $controller; $identifier = $this->getIdentifier($identifier); } @@ -301,7 +301,7 @@ protected function _actionRedirect(DispatcherContextInterface $context) * Handle errors and exceptions * * @throws \InvalidArgumentException If the action parameter is not an instance of Exception or ExceptionError - * @param DispatcherContextInterface $context A dispatcher context object + * @param DispatcherContextInterface $context A dispatcher context object */ protected function _actionFail(DispatcherContextInterface $context) {