Fix ini_get() for boolean values

deguif · deguif · commit 04f5cea889ac · 2018-10-31T10:30:08.000+01:00
diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -63,7 +63,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
     if (file_exists("phpunit-$PHPUNIT_VERSION")) {
         passthru(sprintf('\\' === DIRECTORY_SEPARATOR ? '(del /S /F /Q %s & rmdir %1$s) >nul': 'rm -rf %s', "phpunit-$PHPUNIT_VERSION"));
     }
-    if (extension_loaded('openssl') && ini_get('allow_url_fopen') && !isset($_SERVER['http_proxy']) && !isset($_SERVER['https_proxy'])) {
+    if (extension_loaded('openssl') && filter_var(ini_get('allow_url_fopen'), FILTER_VALIDATE_BOOLEAN) && !isset($_SERVER['http_proxy']) && !isset($_SERVER['https_proxy'])) {
         $remoteZip = "https://github.com/sebastianbergmann/phpunit/archive/$PHPUNIT_VERSION.zip";
         $remoteZipStream = @fopen($remoteZip, 'rb');
         if (!$remoteZipStream) {
@@ -214,7 +214,7 @@ if ($components) {
             // STATUS_STACK_BUFFER_OVERRUN (-1073740791/0xC0000409)
             // STATUS_ACCESS_VIOLATION (-1073741819/0xC0000005)
             // STATUS_HEAP_CORRUPTION (-1073740940/0xC0000374)
-            if ($procStatus && ('\\' !== DIRECTORY_SEPARATOR || !extension_loaded('apcu') || !ini_get('apc.enable_cli') || !in_array($procStatus, array(-1073740791, -1073741819, -1073740940)))) {
+            if ($procStatus && ('\\' !== DIRECTORY_SEPARATOR || !extension_loaded('apcu') || !filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN) || !in_array($procStatus, array(-1073740791, -1073741819, -1073740940)))) {
                 $exit = $procStatus;
                 echo "\033[41mKO\033[0m $component\n\n";
             } else {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php
@@ -84,8 +84,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
             array('Architecture', (PHP_INT_SIZE * 8).' bits'),
             array('Intl locale', class_exists('Locale', false) && \Locale::getDefault() ? \Locale::getDefault() : 'n/a'),
             array('Timezone', date_default_timezone_get().' (<comment>'.(new \DateTime())->format(\DateTime::W3C).'</>)'),
-            array('OPcache', \extension_loaded('Zend OPcache') && ini_get('opcache.enable') ? 'true' : 'false'),
-            array('APCu', \extension_loaded('apcu') && ini_get('apc.enabled') ? 'true' : 'false'),
+            array('OPcache', \extension_loaded('Zend OPcache') && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'),
+            array('APCu', \extension_loaded('apcu') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'),
             array('Xdebug', \extension_loaded('xdebug') ? 'true' : 'false'),
         );
 
diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
@@ -117,7 +117,7 @@ public static function createSystemCache($namespace, $defaultLifetime, $version,
         }
 
         $apcu = new ApcuAdapter($namespace, (int) $defaultLifetime / 5, $version);
-        if ('cli' === \PHP_SAPI && !ini_get('apc.enable_cli')) {
+        if ('cli' === \PHP_SAPI && !filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN)) {
             $apcu->setLogger(new NullLogger());
         } elseif (null !== $logger) {
             $apcu->setLogger($logger);
diff --git a/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
@@ -68,7 +68,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 && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN)) || \defined('HHVM_VERSION')) {
             if (!$fallbackPool instanceof AdapterInterface) {
                 $fallbackPool = new ProxyAdapter($fallbackPool);
             }
diff --git a/src/Symfony/Component/Cache/Simple/PhpArrayCache.php b/src/Symfony/Component/Cache/Simple/PhpArrayCache.php
@@ -51,7 +51,7 @@ public function __construct($file, CacheInterface $fallbackPool)
     public static function create($file, CacheInterface $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 && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN)) || \defined('HHVM_VERSION')) {
             return new static($file, $fallbackPool);
         }
 
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/ApcuAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/ApcuAdapterTest.php
@@ -24,10 +24,10 @@ class ApcuAdapterTest extends AdapterTestCase
 
     public function createCachePool($defaultLifetime = 0)
     {
-        if (!\function_exists('apcu_fetch') || !ini_get('apc.enabled')) {
+        if (!\function_exists('apcu_fetch') || !filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN)) {
             $this->markTestSkipped('APCu extension is required.');
         }
-        if ('cli' === \PHP_SAPI && !ini_get('apc.enable_cli')) {
+        if ('cli' === \PHP_SAPI && !filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN)) {
             if ('testWithCliSapi' !== $this->getName()) {
                 $this->markTestSkipped('apc.enable_cli=1 is required.');
             }
diff --git a/src/Symfony/Component/Cache/Tests/Simple/ApcuCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/ApcuCacheTest.php
@@ -23,7 +23,7 @@ class ApcuCacheTest extends CacheTestCase
 
     public function createSimpleCache($defaultLifetime = 0)
     {
-        if (!\function_exists('apcu_fetch') || !ini_get('apc.enabled') || ('cli' === \PHP_SAPI && !ini_get('apc.enable_cli'))) {
+        if (!\function_exists('apcu_fetch') || !filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) || ('cli' === \PHP_SAPI && !filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN))) {
             $this->markTestSkipped('APCu extension is required.');
         }
         if ('\\' === \DIRECTORY_SEPARATOR) {
diff --git a/src/Symfony/Component/Cache/Traits/ApcuTrait.php b/src/Symfony/Component/Cache/Traits/ApcuTrait.php
@@ -23,7 +23,7 @@ trait ApcuTrait
 {
     public static function isSupported()
     {
-        return \function_exists('apcu_fetch') && ini_get('apc.enabled');
+        return \function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN);
     }
 
     private function init($namespace, $defaultLifetime, $version)
@@ -75,7 +75,7 @@ protected function doHave($id)
      */
     protected function doClear($namespace)
     {
-        return isset($namespace[0]) && class_exists('APCuIterator', false) && ('cli' !== \PHP_SAPI || ini_get('apc.enable_cli'))
+        return isset($namespace[0]) && class_exists('APCuIterator', false) && ('cli' !== \PHP_SAPI || filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN))
             ? apcu_delete(new \APCuIterator(sprintf('/^%s/', preg_quote($namespace, '/')), APC_ITER_KEY))
             : apcu_clear_cache();
     }
diff --git a/src/Symfony/Component/Cache/Traits/PhpFilesTrait.php b/src/Symfony/Component/Cache/Traits/PhpFilesTrait.php
@@ -30,7 +30,7 @@ trait PhpFilesTrait
 
     public static function isSupported()
     {
-        return \function_exists('opcache_invalidate') && ini_get('opcache.enable');
+        return \function_exists('opcache_invalidate') && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN);
     }
 
     /**
@@ -40,7 +40,7 @@ public function prune()
     {
         $time = time();
         $pruned = true;
-        $allowCompile = 'cli' !== \PHP_SAPI || ini_get('opcache.enable_cli');
+        $allowCompile = 'cli' !== \PHP_SAPI || filter_var(ini_get('opcache.enable_cli'), FILTER_VALIDATE_BOOLEAN);
 
         set_error_handler($this->includeHandler);
         try {
@@ -119,7 +119,7 @@ protected function doSave(array $values, $lifetime)
     {
         $ok = true;
         $data = array($lifetime ? time() + $lifetime : PHP_INT_MAX, '');
-        $allowCompile = 'cli' !== \PHP_SAPI || ini_get('opcache.enable_cli');
+        $allowCompile = 'cli' !== \PHP_SAPI || filter_var(ini_get('opcache.enable_cli'), FILTER_VALIDATE_BOOLEAN);
 
         foreach ($values as $key => $value) {
             if (null === $value || \is_object($value)) {
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -910,7 +910,7 @@ public static function createCache($namespace, $defaultLifetime, $version, Logge
         }
 
         $apcu = new ApcuAdapter($namespace, $defaultLifetime / 5, $version);
-        if ('cli' === \PHP_SAPI && !ini_get('apc.enable_cli')) {
+        if ('cli' === \PHP_SAPI && !filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN)) {
             $apcu->setLogger(new NullLogger());
         } elseif (null !== $logger) {
             $apcu->setLogger($logger);

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public static function createSystemCache($namespace, $defaultLifetime, $version,`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`$apcu = new ApcuAdapter($namespace, (int) $defaultLifetime / 5, $version);`
`120`		`- if ('cli' === \PHP_SAPI && !ini_get('apc.enable_cli')) {`
	`120`	`+ if ('cli' === \PHP_SAPI && !filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN)) {`
`121`	`121`	`$apcu->setLogger(new NullLogger());`
`122`	`122`	`} elseif (null !== $logger) {`
`123`	`123`	`$apcu->setLogger($logger);`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ function ($key, $value, $isHit) {`
`68`	`68`	`public static function create($file, CacheItemPoolInterface $fallbackPool)`
`69`	`69`	`{`
`70`	`70`	`// Shared memory is available in PHP 7.0+ with OPCache enabled and in HHVM`
`71`		`- if ((\PHP_VERSION_ID >= 70000 && ini_get('opcache.enable')) \|\| \defined('HHVM_VERSION')) {`
	`71`	`+ if ((\PHP_VERSION_ID >= 70000 && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN)) \|\| \defined('HHVM_VERSION')) {`
`72`	`72`	`if (!$fallbackPool instanceof AdapterInterface) {`
`73`	`73`	`$fallbackPool = new ProxyAdapter($fallbackPool);`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function __construct($file, CacheInterface $fallbackPool)`
`51`	`51`	`public static function create($file, CacheInterface $fallbackPool)`
`52`	`52`	`{`
`53`	`53`	`// Shared memory is available in PHP 7.0+ with OPCache enabled and in HHVM`
`54`		`- if ((\PHP_VERSION_ID >= 70000 && ini_get('opcache.enable')) \|\| \defined('HHVM_VERSION')) {`
	`54`	`+ if ((\PHP_VERSION_ID >= 70000 && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN)) \|\| \defined('HHVM_VERSION')) {`
`55`	`55`	`return new static($file, $fallbackPool);`
`56`	`56`	`}`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,10 @@ class ApcuAdapterTest extends AdapterTestCase`
`24`	`24`
`25`	`25`	`public function createCachePool($defaultLifetime = 0)`
`26`	`26`	`{`
`27`		`- if (!\function_exists('apcu_fetch') \|\| !ini_get('apc.enabled')) {`
	`27`	`+ if (!\function_exists('apcu_fetch') \|\| !filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN)) {`
`28`	`28`	`$this->markTestSkipped('APCu extension is required.');`
`29`	`29`	`}`
`30`		`- if ('cli' === \PHP_SAPI && !ini_get('apc.enable_cli')) {`
	`30`	`+ if ('cli' === \PHP_SAPI && !filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN)) {`
`31`	`31`	`if ('testWithCliSapi' !== $this->getName()) {`
`32`	`32`	`$this->markTestSkipped('apc.enable_cli=1 is required.');`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class ApcuCacheTest extends CacheTestCase`
`23`	`23`
`24`	`24`	`public function createSimpleCache($defaultLifetime = 0)`
`25`	`25`	`{`
`26`		`- if (!\function_exists('apcu_fetch') \|\| !ini_get('apc.enabled') \|\| ('cli' === \PHP_SAPI && !ini_get('apc.enable_cli'))) {`
	`26`	`+ if (!\function_exists('apcu_fetch') \|\| !filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) \|\| ('cli' === \PHP_SAPI && !filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN))) {`
`27`	`27`	`$this->markTestSkipped('APCu extension is required.');`
`28`	`28`	`}`
`29`	`29`	`if ('\\' === \DIRECTORY_SEPARATOR) {`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ trait ApcuTrait`
`23`	`23`	`{`
`24`	`24`	`public static function isSupported()`
`25`	`25`	`{`
`26`		`- return \function_exists('apcu_fetch') && ini_get('apc.enabled');`
	`26`	`+ return \function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`private function init($namespace, $defaultLifetime, $version)`
`@@ -75,7 +75,7 @@ protected function doHave($id)`
`75`	`75`	`*/`
`76`	`76`	`protected function doClear($namespace)`
`77`	`77`	`{`
`78`		`- return isset($namespace[0]) && class_exists('APCuIterator', false) && ('cli' !== \PHP_SAPI \|\| ini_get('apc.enable_cli'))`
	`78`	`+ return isset($namespace[0]) && class_exists('APCuIterator', false) && ('cli' !== \PHP_SAPI \|\| filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN))`
`79`	`79`	`? apcu_delete(new \APCuIterator(sprintf('/^%s/', preg_quote($namespace, '/')), APC_ITER_KEY))`
`80`	`80`	`: apcu_clear_cache();`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ trait PhpFilesTrait`
`30`	`30`
`31`	`31`	`public static function isSupported()`
`32`	`32`	`{`
`33`		`- return \function_exists('opcache_invalidate') && ini_get('opcache.enable');`
	`33`	`+ return \function_exists('opcache_invalidate') && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`/**`
`@@ -40,7 +40,7 @@ public function prune()`
`40`	`40`	`{`
`41`	`41`	`$time = time();`
`42`	`42`	`$pruned = true;`
`43`		`- $allowCompile = 'cli' !== \PHP_SAPI \|\| ini_get('opcache.enable_cli');`
	`43`	`+ $allowCompile = 'cli' !== \PHP_SAPI \|\| filter_var(ini_get('opcache.enable_cli'), FILTER_VALIDATE_BOOLEAN);`
`44`	`44`
`45`	`45`	`set_error_handler($this->includeHandler);`
`46`	`46`	`try {`
`@@ -119,7 +119,7 @@ protected function doSave(array $values, $lifetime)`
`119`	`119`	`{`
`120`	`120`	`$ok = true;`
`121`	`121`	`$data = array($lifetime ? time() + $lifetime : PHP_INT_MAX, '');`
`122`		`- $allowCompile = 'cli' !== \PHP_SAPI \|\| ini_get('opcache.enable_cli');`
	`122`	`+ $allowCompile = 'cli' !== \PHP_SAPI \|\| filter_var(ini_get('opcache.enable_cli'), FILTER_VALIDATE_BOOLEAN);`
`123`	`123`
`124`	`124`	`foreach ($values as $key => $value) {`
`125`	`125`	`if (null === $value \|\| \is_object($value)) {`
Original file line number	Diff line number	Diff line change
`@@ -910,7 +910,7 @@ public static function createCache($namespace, $defaultLifetime, $version, Logge`
`910`	`910`	`}`
`911`	`911`
`912`	`912`	`$apcu = new ApcuAdapter($namespace, $defaultLifetime / 5, $version);`
`913`		`- if ('cli' === \PHP_SAPI && !ini_get('apc.enable_cli')) {`
	`913`	`+ if ('cli' === \PHP_SAPI && !filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN)) {`
`914`	`914`	`$apcu->setLogger(new NullLogger());`
`915`	`915`	`} elseif (null !== $logger) {`
`916`	`916`	`$apcu->setLogger($logger);`