Fix ini_get() for boolean values

deguif · deguif · commit 5694f145b1f7 · 2018-10-30T17:24:01.000+01:00
diff --git a/Tests/ApcClassLoaderTest.php b/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/Tests/LegacyApcUniversalClassLoaderTest.php b/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();
         }
     }

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`	`}`