adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Forcing bool return"

Browse source 
This reverts commit fac95baee7.
This commit is contained in:
Larry E. Masters 2015-12-14 19:31:08 -06:00
parent 572ca1458b
commit 577e1b089f
6 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/Cache/Cache.php
View file

@ -278,7 +278,7 @@ class Cache {
* @return void
*/
public static function gc($config = 'default', $expires = null) {
return (bool)static::$_engines[$config]->gc($expires);
static::$_engines[$config]->gc($expires);
}
/**
@ -452,7 +452,7 @@ class Cache {
$success = static::$_engines[$config]->delete($settings['prefix'] . $key);
static::set(null, $config);
return (bool)$success;
return $success;
}
/**

2
lib/Cake/Model/Datasource/CakeSession.php
View file

@ -143,7 +143,7 @@ class CakeSession {
public static function init($base = null) {
static::$time = time();
if (env('HTTP_USER_AGENT') && !static::$_userAgent) {
if (env('HTTP_USER_AGENT')) {
static::$_userAgent = md5(env('HTTP_USER_AGENT') . Configure::read('Security.salt'));
}

2
lib/Cake/Model/Datasource/Session/CacheSession.php
View file

@ -83,7 +83,7 @@ class CacheSession implements CakeSessionHandlerInterface {
* @return bool Success
*/
public function gc($expires = null) {
return (bool)Cache::gc(Configure::read('Session.handler.config'), $expires);
return Cache::gc(Configure::read('Session.handler.config'), $expires);
}
}

8
lib/Cake/Model/Datasource/Session/DatabaseSession.php
View file

@ -123,9 +123,9 @@ class DatabaseSession implements CakeSessionHandlerInterface {
'counterCache' => false
);
try {
return (bool)$this->_model->save($record, $options);
return $this->_model->save($record, $options);
} catch (PDOException $e) {
return (bool)$this->_model->save($record, $options);
return $this->_model->save($record, $options);
}
}
@ -136,7 +136,7 @@ class DatabaseSession implements CakeSessionHandlerInterface {
* @return bool True for successful delete, false otherwise.
*/
public function destroy($id) {
return (bool)$this->_model->delete($id);
return $this->_model->delete($id);
}
/**
@ -151,7 +151,7 @@ class DatabaseSession implements CakeSessionHandlerInterface {
} else {
$expires = time() - $expires;
}
return (bool)$this->_model->deleteAll(array($this->_model->alias . ".expires <" => $expires), false, false);
return $this->_model->deleteAll(array($this->_model->alias . ".expires <" => $expires), false, false);
}
}

4
lib/Cake/Test/test_app/Model/Datasource/Session/TestAppLibSession.php
View file

@ -12,7 +12,6 @@ class TestAppLibSession implements CakeSessionHandlerInterface {
}
public function close() {
return true;
}
public function read($id) {
@ -22,12 +21,9 @@ class TestAppLibSession implements CakeSessionHandlerInterface {
}
public function destroy($id) {
return true;
}
public function gc($expires = null) {
return true;
}
}

3
lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Datasource/Session/TestPluginSession.php
View file

@ -12,7 +12,6 @@ class TestPluginSession implements CakeSessionHandlerInterface {
}
public function close() {
return true;
}
public function read($id) {
@ -22,11 +21,9 @@ class TestPluginSession implements CakeSessionHandlerInterface {
}
public function destroy($id) {
return true;
}
public function gc($expires = null) {
return true;
}
}