Skip to content

Commit

Permalink
Fixing CS errors
Browse files Browse the repository at this point in the history
  • Loading branch information
lorenzo committed May 18, 2014
1 parent da864ac commit b0c296e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/Network/Request.php
Expand Up @@ -164,7 +164,7 @@ public static function createFromGlobals() {
'environment' => $_SERVER + $_ENV,
'base' => $base,
'webroot' => $webroot,
'session' => new Session()
'session' => null
);
$config['url'] = static::_url($config);
return new static($config);
Expand Down
4 changes: 2 additions & 2 deletions src/Network/Session.php
Expand Up @@ -305,7 +305,7 @@ public function start() {
if (!session_start()) {
throw new \RuntimeException('Could not start the session');
}

$this->_started = true;

if ($this->_timedOut()) {
Expand Down Expand Up @@ -497,7 +497,7 @@ protected function _hasSession() {
* @return void
*/
public function renew() {
if (!$this->_hasSession() || php_sapi_name() === 'cli') {
if (!$this->_hasSession() || php_sapi_name() === 'cli') {
return;
}

Expand Down
4 changes: 3 additions & 1 deletion src/Network/Session/CacheSession.php
Expand Up @@ -38,7 +38,9 @@ class CacheSession implements SessionHandlerInterface {
*
* @param array $config The configuration to use for this engine
* It requires the key 'config' which is the name of the Cache config to use for
* storign the session
* storing the session
*
* @throws \InvalidArgumentException if the 'config' jey is not provided
*/
public function __construct(array $config = []) {
if (empty($config['config'])) {
Expand Down
3 changes: 1 addition & 2 deletions tests/TestCase/View/Helper/SessionHelperTest.php
Expand Up @@ -43,7 +43,6 @@ public function setUp() {
$this->View->request = new Request(['session' => $session]);
$this->Session = new SessionHelper($this->View);


$session->write(array(
'test' => 'info',
'Message' => array(
Expand All @@ -62,7 +61,7 @@ public function setUp() {
'message' => 'This is a test of the emergency broadcasting system',
),
'classy' => array(
'type' => 'success',
'type' => 'success',
'params' => array('class' => 'positive'),
'message' => 'Recorded'
)
Expand Down

0 comments on commit b0c296e

Please sign in to comment.