Fix ini_get() for boolean values

deguif · deguif · commit 7bb0e4ed7681 · 2018-10-30T16:56:21.000+01:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.');
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class ApcClassLoaderTest extends TestCase`
`19`	`19`	`{`
`20`	`20`	`protected function setUp()`
`21`	`21`	`{`
`22`		`- if (!(ini_get('apc.enabled') && ini_get('apc.enable_cli'))) {`
	`22`	`+ if (!(filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) && filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN))) {`
`23`	`23`	`$this->markTestSkipped('The apc extension is not enabled.');`
`24`	`24`	`} else {`
`25`	`25`	`apcu_clear_cache();`
`@@ -28,7 +28,7 @@ protected function setUp()`
`28`	`28`
`29`	`29`	`protected function tearDown()`
`30`	`30`	`{`
`31`		`- if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) {`
	`31`	`+ if (filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) && filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN)) {`
`32`	`32`	`apcu_clear_cache();`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class LegacyApcUniversalClassLoaderTest extends TestCase`
`21`	`21`	`{`
`22`	`22`	`protected function setUp()`
`23`	`23`	`{`
`24`		`- if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) {`
	`24`	`+ if (filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) && filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN)) {`
`25`	`25`	`apcu_clear_cache();`
`26`	`26`	`} else {`
`27`	`27`	`$this->markTestSkipped('APC is not enabled.');`
`@@ -30,7 +30,7 @@ protected function setUp()`
`30`	`30`
`31`	`31`	`protected function tearDown()`
`32`	`32`	`{`
`33`		`- if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) {`
	`33`	`+ if (filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) && filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN)) {`
`34`	`34`	`apcu_clear_cache();`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ public function write($content, array $metadata = null)`
`151`	`151`	`}`
`152`	`152`	`}`
`153`	`153`
`154`		`- if (\function_exists('opcache_invalidate') && ini_get('opcache.enable')) {`
	`154`	`+ if (\function_exists('opcache_invalidate') && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN)) {`
`155`	`155`	`@opcache_invalidate($this->file, true);`
`156`	`156`	`}`
`157`	`157`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class LegacyApcCacheTest extends TestCase`
`22`	`22`	`{`
`23`	`23`	`protected function setUp()`
`24`	`24`	`{`
`25`		`- if (!ini_get('apc.enabled') \|\| !ini_get('apc.enable_cli')) {`
	`25`	`+ if (!filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) \|\| !filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN)) {`
`26`	`26`	`$this->markTestSkipped('APC is not enabled.');`
`27`	`27`	`}`
`28`	`28`	`}`