Skip to content
Permalink
Browse files

Unify variables.

  • Loading branch information...
dereuromark committed Sep 17, 2014
1 parent 7af1654 commit 7c8560aaf8919f7e661e165827eeb0f06c9070a4
@@ -122,17 +122,17 @@ class CookieComponent extends Component {
/**
* Constructor
*
* @param ComponentRegistry $collection A ComponentRegistry for this component
* @param ComponentRegistry $registry A ComponentRegistry for this component
* @param array $config Array of config.
*/
public function __construct(ComponentRegistry $collection, array $config = array()) {
parent::__construct($collection, $config);
public function __construct(ComponentRegistry $registry, array $config = array()) {
parent::__construct($registry, $config);
if (!$this->_config['key']) {
$this->config('key', Security::salt());
}
$controller = $collection->getController();
$controller = $registry->getController();
if ($controller && isset($controller->request)) {
$this->_request = $controller->request;
} else {
@@ -47,12 +47,12 @@ class FlashComponent extends Component {
/**
* Constructor
*
* @param ComponentRegistry $collection A ComponentRegistry for this component
* @param ComponentRegistry $registry A ComponentRegistry for this component
* @param array $config Array of config.
*/
public function __construct(ComponentRegistry $collection, array $config = []) {
parent::__construct($collection, $config);
$this->_session = $collection->getController()->request->session();
public function __construct(ComponentRegistry $registry, array $config = []) {
parent::__construct($registry, $config);
$this->_session = $registry->getController()->request->session();
}
/**
@@ -114,14 +114,14 @@ class RequestHandlerComponent extends Component {
/**
* Constructor. Parses the accepted content types accepted by the client using HTTP_ACCEPT
*
* @param ComponentRegistry $collection ComponentRegistry object.
* @param ComponentRegistry $registry ComponentRegistry object.
* @param array $config Array of config.
*/
public function __construct(ComponentRegistry $collection, array $config = array()) {
parent::__construct($collection, $config);
public function __construct(ComponentRegistry $registry, array $config = array()) {
parent::__construct($registry, $config);
$this->addInputType('xml', array(array($this, 'convertXml')));
$Controller = $collection->getController();
$Controller = $registry->getController();
$this->request = $Controller->request;
$this->response = $Controller->response;
}
@@ -40,12 +40,12 @@ class SessionComponent extends Component {
/**
* Constructor. Parses the accepted content types accepted by the client using HTTP_ACCEPT
*
* @param ComponentRegistry $collection ComponentRegistry object.
* @param ComponentRegistry $registry ComponentRegistry object.
* @param array $config Array of config.
*/
public function __construct(ComponentRegistry $collection, array $config = array()) {
parent::__construct($collection, $config);
$this->_session = $collection->getController()->request->session();
public function __construct(ComponentRegistry $registry, array $config = array()) {
parent::__construct($registry, $config);
$this->_session = $registry->getController()->request->session();
}
/**

0 comments on commit 7c8560a

Please sign in to comment.
You can’t perform that action at this time.