Merge pull request #838 from dogmatic69/security-component-cleanup

cleaning up the code, removing extra variables set and un-needed else
cakephp · Sep 13, 2012 · 51e0715 · 51e0715
2 parents f22d4c0 + bf18fc4
commit 51e0715
Showing 1 changed file with 9 additions and 17 deletions.
diff --git a/lib/Cake/Controller/Component/SecurityComponent.php b/lib/Cake/Controller/Component/SecurityComponent.php
@@ -246,8 +246,7 @@ public function startup(Controller $controller) {
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/security-component.html#SecurityComponent::requirePost
  */
 	public function requirePost() {
-		$args = func_get_args();
+		$this->_requireMethod('Post', func_get_args());
-		$this->_requireMethod('Post', $args);
 	}
 
 /**
@@ -256,8 +255,7 @@ public function requirePost() {
  * @return void
  */
 	public function requireGet() {
-		$args = func_get_args();
+		$this->_requireMethod('Get', func_get_args());
-		$this->_requireMethod('Get', $args);
 	}
 
 /**
@@ -266,8 +264,7 @@ public function requireGet() {
  * @return void
  */
 	public function requirePut() {
-		$args = func_get_args();
+		$this->_requireMethod('Put', func_get_args());
-		$this->_requireMethod('Put', $args);
 	}
 
 /**
@@ -276,8 +273,7 @@ public function requirePut() {
  * @return void
  */
 	public function requireDelete() {
-		$args = func_get_args();
+		$this->_requireMethod('Delete', func_get_args());
-		$this->_requireMethod('Delete', $args);
 	}
 
 /**
@@ -287,8 +283,7 @@ public function requireDelete() {
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/security-component.html#SecurityComponent::requireSecure
  */
 	public function requireSecure() {
-		$args = func_get_args();
+		$this->_requireMethod('Secure', func_get_args());
-		$this->_requireMethod('Secure', $args);
 	}
 
 /**
@@ -298,8 +293,7 @@ public function requireSecure() {
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/security-component.html#SecurityComponent::requireAuth
  */
 	public function requireAuth() {
-		$args = func_get_args();
+		$this->_requireMethod('Auth', func_get_args());
-		$this->_requireMethod('Auth', $args);
 	}
 
 /**
@@ -316,9 +310,8 @@ public function requireAuth() {
 	public function blackHole(Controller $controller, $error = '') {
 		if ($this->blackHoleCallback == null) {
 			throw new BadRequestException(__d('cake_dev', 'The request has been black-holed'));
-		} else {
-			return $this->_callback($controller, $this->blackHoleCallback, array($error));
 		}
+		return $this->_callback($controller, $this->blackHoleCallback, array($error));
 	}
 
 /**
@@ -593,11 +586,10 @@ protected function _expireTokens($tokens) {
  * @throws BadRequestException When a the blackholeCallback is not callable.
  */
 	protected function _callback(Controller $controller, $method, $params = array()) {
-		if (is_callable(array($controller, $method))) {
+		if (!is_callable(array($controller, $method))) {
-			return call_user_func_array(array(&$controller, $method), empty($params) ? null : $params);
-		} else {
 			throw new BadRequestException(__d('cake_dev', 'The request has been black-holed'));
 		}
+		return call_user_func_array(array(&$controller, $method), empty($params) ? null : $params);
 	}
 
 }