diff --git a/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php index 889a97f80a..7e9686a018 100644 --- a/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php @@ -38,7 +38,7 @@ class PhpArrayAdapter implements AdapterInterface { $this->file = $file; $this->fallbackPool = $fallbackPool; - $this->zendMultiByte = ini_get('zend.multibyte'); + $this->zendDetectUnicode = ini_get('zend.detect_unicode'); $this->createCacheItem = \Closure::bind( function ($key, $value, $isHit) { $item = new CacheItem(); diff --git a/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php index 75ac9092df..96846e69ba 100644 --- a/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php @@ -35,6 +35,6 @@ class PhpFilesAdapter extends AbstractAdapter $e = new \Exception(); $this->includeHandler = function () use ($e) { throw $e; }; - $this->zendMultiByte = ini_get('zend.multibyte'); + $this->zendDetectUnicode = ini_get('zend.detect_unicode'); } } diff --git a/src/Symfony/Component/Cache/Simple/PhpArrayCache.php b/src/Symfony/Component/Cache/Simple/PhpArrayCache.php index d4c3926548..92180e6316 100644 --- a/src/Symfony/Component/Cache/Simple/PhpArrayCache.php +++ b/src/Symfony/Component/Cache/Simple/PhpArrayCache.php @@ -34,7 +34,7 @@ class PhpArrayCache implements CacheInterface { $this->file = $file; $this->fallbackPool = $fallbackPool; - $this->zendMultiByte = ini_get('zend.multibyte'); + $this->zendDetectUnicode = ini_get('zend.detect_unicode'); } /** diff --git a/src/Symfony/Component/Cache/Simple/PhpFilesCache.php b/src/Symfony/Component/Cache/Simple/PhpFilesCache.php index 02273ada7a..dd92a8a03b 100644 --- a/src/Symfony/Component/Cache/Simple/PhpFilesCache.php +++ b/src/Symfony/Component/Cache/Simple/PhpFilesCache.php @@ -35,6 +35,6 @@ class PhpFilesCache extends AbstractCache $e = new \Exception(); $this->includeHandler = function () use ($e) { throw $e; }; - $this->zendMultiByte = ini_get('zend.multibyte'); + $this->zendDetectUnicode = ini_get('zend.detect_unicode'); } } diff --git a/src/Symfony/Component/Cache/Traits/PhpArrayTrait.php b/src/Symfony/Component/Cache/Traits/PhpArrayTrait.php index b57e4e0b98..ccc48886d0 100644 --- a/src/Symfony/Component/Cache/Traits/PhpArrayTrait.php +++ b/src/Symfony/Component/Cache/Traits/PhpArrayTrait.php @@ -25,7 +25,7 @@ trait PhpArrayTrait private $file; private $values; private $fallbackPool; - private $zendMultiByte; + private $zendDetectUnicode; /** * Store an array of cached values. @@ -127,14 +127,14 @@ EOF; */ private function initialize() { - if ($this->zendMultiByte) { - $zmb = ini_set('zend.multibyte', 0); + if ($this->zendDetectUnicode) { + $zmb = ini_set('zend.detect_unicode', 0); } try { $this->values = file_exists($this->file) ? (include $this->file ?: array()) : array(); } finally { - if ($this->zendMultiByte) { - ini_set('zend.multibyte', $zmb); + if ($this->zendDetectUnicode) { + ini_set('zend.detect_unicode', $zmb); } } } diff --git a/src/Symfony/Component/Cache/Traits/PhpFilesTrait.php b/src/Symfony/Component/Cache/Traits/PhpFilesTrait.php index d9d976a023..d40a947bad 100644 --- a/src/Symfony/Component/Cache/Traits/PhpFilesTrait.php +++ b/src/Symfony/Component/Cache/Traits/PhpFilesTrait.php @@ -25,7 +25,7 @@ trait PhpFilesTrait use FilesystemCommonTrait; private $includeHandler; - private $zendMultiByte; + private $zendDetectUnicode; public static function isSupported() { @@ -40,8 +40,8 @@ trait PhpFilesTrait $values = array(); $now = time(); - if ($this->zendMultiByte) { - $zmb = ini_set('zend.multibyte', 0); + if ($this->zendDetectUnicode) { + $zmb = ini_set('zend.detect_unicode', 0); } set_error_handler($this->includeHandler); try { @@ -58,8 +58,8 @@ trait PhpFilesTrait } } finally { restore_error_handler(); - if ($this->zendMultiByte) { - ini_set('zend.multibyte', $zmb); + if ($this->zendDetectUnicode) { + ini_set('zend.detect_unicode', $zmb); } }