diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Cache] Use zend.detect_unicode instead of zend.multibyte

Browse Source
This commit is contained in:
Nicolas Grekas 2017-08-28 10:20:24 +02:00
parent 726c567d14
commit e600cd8647
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
View File

@ -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();

2
src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php
View File

@ -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');
}
}

2
src/Symfony/Component/Cache/Simple/PhpArrayCache.php
View File

@ -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');
}
/**

2
src/Symfony/Component/Cache/Simple/PhpFilesCache.php
View File

@ -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');
}
}

10
src/Symfony/Component/Cache/Traits/PhpArrayTrait.php
View File

@ -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);
}
}
}

10
src/Symfony/Component/Cache/Traits/PhpFilesTrait.php
View File

@ -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);
}
}