minor symfony#24003 [Cache] Use zend.detect_unicode instead of zend.multibyte (nicolas-grekas)

This PR was merged into the 3.3 branch.

Discussion
----------

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

| Q             | A
| ------------- | ---
| Branch?       | 3.3
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | symfony#22972, symfony#23985
| License       | MIT
| Doc PR        | -

Verified.

Commits
-------

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

Author: nicolas-grekas

src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php

@@ -38,7 +38,7 @@ public function __construct($file, AdapterInterface $fallbackPool)
     {
         $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();

src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php

@@ -35,6 +35,6 @@ public function __construct($namespace = '', $defaultLifetime = 0, $directory =
 
         $e = new \Exception();
         $this->includeHandler = function () use ($e) { throw $e; };
-        $this->zendMultiByte = ini_get('zend.multibyte');
+        $this->zendDetectUnicode = ini_get('zend.detect_unicode');
     }
 }

src/Symfony/Component/Cache/Simple/PhpArrayCache.php

@@ -34,7 +34,7 @@ public function __construct($file, CacheInterface $fallbackPool)
     {
         $this->file = $file;
         $this->fallbackPool = $fallbackPool;
-        $this->zendMultiByte = ini_get('zend.multibyte');
+        $this->zendDetectUnicode = ini_get('zend.detect_unicode');
     }
 
     /**

src/Symfony/Component/Cache/Simple/PhpFilesCache.php

@@ -35,6 +35,6 @@ public function __construct($namespace = '', $defaultLifetime = 0, $directory =
 
         $e = new \Exception();
         $this->includeHandler = function () use ($e) { throw $e; };
-        $this->zendMultiByte = ini_get('zend.multibyte');
+        $this->zendDetectUnicode = ini_get('zend.detect_unicode');
     }
 }

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 @@ public function clear()
      */
     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);
             }
         }
     }

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 @@ protected function doFetch(array $ids)
         $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 @@ protected function doFetch(array $ids)
             }
         } finally {
             restore_error_handler();
-            if ($this->zendMultiByte) {
-                ini_set('zend.multibyte', $zmb);
+            if ($this->zendDetectUnicode) {
+                ini_set('zend.detect_unicode', $zmb);
             }
         }