From 54ec334ae01d8d9cc2cfd103d7aa645bc37096c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20de=20Guillebon?= Date: Mon, 29 Oct 2018 20:09:12 +0100 Subject: [PATCH] Fix ini_get() for boolean values --- .../Component/ClassLoader/Tests/ApcClassLoaderTest.php | 4 ++-- .../ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php | 4 ++-- src/Symfony/Component/Config/ResourceCheckerConfigCache.php | 2 +- .../HttpKernel/DataCollector/ConfigDataCollector.php | 4 ++-- .../Tests/DataCollector/ConfigDataCollectorTest.php | 4 ++-- .../Validator/Tests/Mapping/Cache/LegacyApcCacheTest.php | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Symfony/Component/ClassLoader/Tests/ApcClassLoaderTest.php b/src/Symfony/Component/ClassLoader/Tests/ApcClassLoaderTest.php index a0350b4f48e6e..9373fb8a89fbb 100644 --- a/src/Symfony/Component/ClassLoader/Tests/ApcClassLoaderTest.php +++ b/src/Symfony/Component/ClassLoader/Tests/ApcClassLoaderTest.php @@ -19,7 +19,7 @@ class ApcClassLoaderTest extends TestCase { protected function setUp() { - if (!(ini_get('apc.enabled') && ini_get('apc.enable_cli'))) { + if (!(\filter_var(ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN) && \filter_var(ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN))) { $this->markTestSkipped('The apc extension is not enabled.'); } else { apcu_clear_cache(); @@ -28,7 +28,7 @@ protected function setUp() protected function tearDown() { - if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) { + if (\filter_var(ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN) && \filter_var(ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN)) { apcu_clear_cache(); } } diff --git a/src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php b/src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php index 6e100cf609f62..62a01b05e62c2 100644 --- a/src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php +++ b/src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php @@ -21,7 +21,7 @@ class LegacyApcUniversalClassLoaderTest extends TestCase { protected function setUp() { - if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) { + if (\filter_var(ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN) && \filter_var(ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN)) { apcu_clear_cache(); } else { $this->markTestSkipped('APC is not enabled.'); @@ -30,7 +30,7 @@ protected function setUp() protected function tearDown() { - if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) { + if (\filter_var(ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN) && \filter_var(ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN)) { apcu_clear_cache(); } } diff --git a/src/Symfony/Component/Config/ResourceCheckerConfigCache.php b/src/Symfony/Component/Config/ResourceCheckerConfigCache.php index 52ae833d44182..e74d19288d229 100644 --- a/src/Symfony/Component/Config/ResourceCheckerConfigCache.php +++ b/src/Symfony/Component/Config/ResourceCheckerConfigCache.php @@ -151,7 +151,7 @@ public function write($content, array $metadata = null) } } - if (\function_exists('opcache_invalidate') && ini_get('opcache.enable')) { + if (\function_exists('opcache_invalidate') && \filter_var(ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN)) { @opcache_invalidate($this->file, true); } } diff --git a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php index 8d8ea1a3e33f6..e3c811f86f390 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php @@ -63,10 +63,10 @@ public function collect(Request $request, Response $response, \Exception $except 'php_version' => PHP_VERSION, 'xdebug_enabled' => \extension_loaded('xdebug'), 'eaccel_enabled' => \extension_loaded('eaccelerator') && ini_get('eaccelerator.enable'), - 'apc_enabled' => \extension_loaded('apc') && ini_get('apc.enabled'), + 'apc_enabled' => \extension_loaded('apc') && \filter_var(ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN), 'xcache_enabled' => \extension_loaded('xcache') && ini_get('xcache.cacher'), 'wincache_enabled' => \extension_loaded('wincache') && ini_get('wincache.ocenabled'), - 'zend_opcache_enabled' => \extension_loaded('Zend OPcache') && ini_get('opcache.enable'), + 'zend_opcache_enabled' => \extension_loaded('Zend OPcache') && \filter_var(ini_get('opcache.enable', \FILTER_VALIDATE_BOOLEAN)), 'bundles' => array(), 'sapi_name' => \PHP_SAPI, ); diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php index 0ac4d3cfbc7e8..f68e7d363dd2b 100644 --- a/src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php @@ -45,9 +45,9 @@ public function testCollect() // if else clause because we don't know it if (((\extension_loaded('eaccelerator') && ini_get('eaccelerator.enable')) || - (\extension_loaded('apc') && ini_get('apc.enabled')) + (\extension_loaded('apc') && \filter_var(ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN)) || - (\extension_loaded('Zend OPcache') && ini_get('opcache.enable')) + (\extension_loaded('Zend OPcache') && \filter_var(ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN)) || (\extension_loaded('xcache') && ini_get('xcache.cacher')) || diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Cache/LegacyApcCacheTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Cache/LegacyApcCacheTest.php index 8e6e1bf7b448e..1c8f6f5592011 100644 --- a/src/Symfony/Component/Validator/Tests/Mapping/Cache/LegacyApcCacheTest.php +++ b/src/Symfony/Component/Validator/Tests/Mapping/Cache/LegacyApcCacheTest.php @@ -22,7 +22,7 @@ class LegacyApcCacheTest extends TestCase { protected function setUp() { - if (!ini_get('apc.enabled') || !ini_get('apc.enable_cli')) { + if (!\filter_var(ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN) || !\filter_var(ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN)) { $this->markTestSkipped('APC is not enabled.'); } }