adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 17:16:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleaning up the code, removing extra variables set and un-needed else

Browse source
This commit is contained in:
dogmatic69 2012-09-13 22:06:40 +01:00
parent 25b447149d
commit bf18fc4dda
1 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/Cake/Controller/Component/SecurityComponent.php
View file

@ -246,8 +246,7 @@ class SecurityComponent extends Component {
* @link http://book.cakephp.org/2.0/en/core-libraries/components/security-component.html#SecurityComponent::requirePost * @link http://book.cakephp.org/2.0/en/core-libraries/components/security-component.html#SecurityComponent::requirePost
*/ */
public function requirePost() { public function requirePost() {
$args = func_get_args(); $this->_requireMethod('Post', func_get_args());
$this->_requireMethod('Post', $args);
} }
/** /**
@ -256,8 +255,7 @@ class SecurityComponent extends Component {
* @return void * @return void
*/ */
public function requireGet() { public function requireGet() {
$args = func_get_args(); $this->_requireMethod('Get', func_get_args());
$this->_requireMethod('Get', $args);
} }
/** /**
@ -266,8 +264,7 @@ class SecurityComponent extends Component {
* @return void * @return void
*/ */
public function requirePut() { public function requirePut() {
$args = func_get_args(); $this->_requireMethod('Put', func_get_args());
$this->_requireMethod('Put', $args);
} }
/** /**
@ -276,8 +273,7 @@ class SecurityComponent extends Component {
* @return void * @return void
*/ */
public function requireDelete() { public function requireDelete() {
$args = func_get_args(); $this->_requireMethod('Delete', func_get_args());
$this->_requireMethod('Delete', $args);
} }
/** /**
@ -287,8 +283,7 @@ class SecurityComponent extends Component {
* @link http://book.cakephp.org/2.0/en/core-libraries/components/security-component.html#SecurityComponent::requireSecure * @link http://book.cakephp.org/2.0/en/core-libraries/components/security-component.html#SecurityComponent::requireSecure
*/ */
public function requireSecure() { public function requireSecure() {
$args = func_get_args(); $this->_requireMethod('Secure', func_get_args());
$this->_requireMethod('Secure', $args);
} }
/** /**
@ -298,8 +293,7 @@ class SecurityComponent extends Component {
* @link http://book.cakephp.org/2.0/en/core-libraries/components/security-component.html#SecurityComponent::requireAuth * @link http://book.cakephp.org/2.0/en/core-libraries/components/security-component.html#SecurityComponent::requireAuth
*/ */
public function requireAuth() { public function requireAuth() {
$args = func_get_args(); $this->_requireMethod('Auth', func_get_args());
$this->_requireMethod('Auth', $args);
} }
/** /**
@ -316,9 +310,8 @@ class SecurityComponent extends Component {
public function blackHole(Controller $controller, $error = '') { public function blackHole(Controller $controller, $error = '') {
if ($this->blackHoleCallback == null) { if ($this->blackHoleCallback == null) {
throw new BadRequestException(__d('cake_dev', 'The request has been black-holed')); 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 @@ class SecurityComponent extends Component {
* @throws BadRequestException When a the blackholeCallback is not callable. * @throws BadRequestException When a the blackholeCallback is not callable.
*/ */
protected function _callback(Controller $controller, $method, $params = array()) { 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')); throw new BadRequestException(__d('cake_dev', 'The request has been black-holed'));
} }
return call_user_func_array(array(&$controller, $method), empty($params) ? null : $params);
} }
} }