Merge branch '2.8' into 3.2

nicolas-grekas · nicolas-grekas · commit e851c2459cf2 · 2017-06-02T11:43:35.000+02:00
* 2.8:
  Fix optional cache warmers are always instantiated whereas they should be lazy-loaded
  add some \ on PHP_VERSION_ID for 2.8
  [PropertyInfo][DoctrineBridge] The bigint Doctrine's type must be converted to string
diff --git a/Adapter/PhpArrayAdapter.php b/Adapter/PhpArrayAdapter.php
@@ -65,7 +65,7 @@ function ($key, $value, $isHit) {
     public static function create($file, CacheItemPoolInterface $fallbackPool)
     {
         // Shared memory is available in PHP 7.0+ with OPCache enabled and in HHVM
-        if ((PHP_VERSION_ID >= 70000 && ini_get('opcache.enable')) || defined('HHVM_VERSION')) {
+        if ((\PHP_VERSION_ID >= 70000 && ini_get('opcache.enable')) || defined('HHVM_VERSION')) {
             if (!$fallbackPool instanceof AdapterInterface) {
                 $fallbackPool = new ProxyAdapter($fallbackPool);
             }

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ function ($key, $value, $isHit) {`
`65`	`65`	`public static function create($file, CacheItemPoolInterface $fallbackPool)`
`66`	`66`	`{`
`67`	`67`	`// Shared memory is available in PHP 7.0+ with OPCache enabled and in HHVM`
`68`		`- if ((PHP_VERSION_ID >= 70000 && ini_get('opcache.enable')) \|\| defined('HHVM_VERSION')) {`
	`68`	`+ if ((\PHP_VERSION_ID >= 70000 && ini_get('opcache.enable')) \|\| defined('HHVM_VERSION')) {`
`69`	`69`	`if (!$fallbackPool instanceof AdapterInterface) {`
`70`	`70`	`$fallbackPool = new ProxyAdapter($fallbackPool);`
`71`	`71`	`}`