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

Rename serializer to serialize

Browse source
This commit is contained in:
Kamisama 2013-09-19 18:40:41 -04:00
parent 0a704cc288
commit 7c83f7140f
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/Cake/Cache/Engine/MemcachedEngine.php
View file

@ -84,7 +84,7 @@ class MemcachedEngine extends CacheEngine {
'persistent' => false, 'persistent' => false,
'login' => null, 'login' => null,
'password' => null, 'password' => null,
'serializer' => 'php' 'serialize' => 'php'
); );
parent::init($settings); parent::init($settings);
@ -132,14 +132,14 @@ class MemcachedEngine extends CacheEngine {
protected function _setOptions() { protected function _setOptions() {
$this->_Memcached->setOption(Memcached::OPT_LIBKETAMA_COMPATIBLE, true); $this->_Memcached->setOption(Memcached::OPT_LIBKETAMA_COMPATIBLE, true);
if (!array_key_exists($this->settings['serializer'], self::$serializer)) { if (!array_key_exists($this->settings['serialize'], self::$serializer)) {
throw new CacheException( throw new CacheException(
__d('cake_dev', '%s is not a valid serializer engine for Memcached', $this->settings['serializer']) __d('cake_dev', '%s is not a valid serializer engine for Memcached', $this->settings['serialize'])
); );
} }
$serializer = self::$serializer['php']; $serializer = self::$serializer['php'];
switch($this->settings['serializer']) { switch($this->settings['serialize']) {
case 'igbinary': case 'igbinary':
if (Memcached::HAVE_IGBINARY) { if (Memcached::HAVE_IGBINARY) {
$serializer = self::$serializer['igbinary']; $serializer = self::$serializer['igbinary'];

14
lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php
View file

@ -103,7 +103,7 @@ class MemcachedEngineTest extends CakeTestCase {
'login' => null, 'login' => null,
'password' => null, 'password' => null,
'groups' => array(), 'groups' => array(),
'serializer' => 'php' 'serialize' => 'php'
); );
$this->assertEquals($expecting, $settings); $this->assertEquals($expecting, $settings);
} }
@ -144,7 +144,7 @@ class MemcachedEngineTest extends CakeTestCase {
'engine' => 'Memcached', 'engine' => 'Memcached',
'servers' => array('127.0.0.1:11211'), 'servers' => array('127.0.0.1:11211'),
'persistent' => false, 'persistent' => false,
'serializer' => 'invalid_serializer' 'serialize' => 'invalid_serializer'
); );
$this->setExpectedException( $this->setExpectedException(
@ -164,7 +164,7 @@ class MemcachedEngineTest extends CakeTestCase {
'engine' => 'Memcached', 'engine' => 'Memcached',
'servers' => array('127.0.0.1:11211'), 'servers' => array('127.0.0.1:11211'),
'persistent' => false, 'persistent' => false,
'serializer' => 'php' 'serialize' => 'php'
); );
$Memcached->init($settings); $Memcached->init($settings);
@ -187,7 +187,7 @@ class MemcachedEngineTest extends CakeTestCase {
'engine' => 'Memcached', 'engine' => 'Memcached',
'servers' => array('127.0.0.1:11211'), 'servers' => array('127.0.0.1:11211'),
'persistent' => false, 'persistent' => false,
'serializer' => 'json' 'serialize' => 'json'
); );
$Memcached->init($settings); $Memcached->init($settings);
@ -210,7 +210,7 @@ class MemcachedEngineTest extends CakeTestCase {
'engine' => 'Memcached', 'engine' => 'Memcached',
'servers' => array('127.0.0.1:11211'), 'servers' => array('127.0.0.1:11211'),
'persistent' => false, 'persistent' => false,
'serializer' => 'igbinary' 'serialize' => 'igbinary'
); );
$Memcached->init($settings); $Memcached->init($settings);
@ -233,7 +233,7 @@ class MemcachedEngineTest extends CakeTestCase {
'engine' => 'Memcached', 'engine' => 'Memcached',
'servers' => array('127.0.0.1:11211'), 'servers' => array('127.0.0.1:11211'),
'persistent' => false, 'persistent' => false,
'serializer' => 'json' 'serialize' => 'json'
); );
$this->setExpectedException( $this->setExpectedException(
@ -258,7 +258,7 @@ class MemcachedEngineTest extends CakeTestCase {
'engine' => 'Memcached', 'engine' => 'Memcached',
'servers' => array('127.0.0.1:11211'), 'servers' => array('127.0.0.1:11211'),
'persistent' => false, 'persistent' => false,
'serializer' => 'igbinary' 'serialize' => 'igbinary'
); );
$this->setExpectedException( $this->setExpectedException(