8000 bug #29020 Fix ini_get() for boolean values (deguif) · symfony/symfony@5a2969c · GitHub
[go: up one dir, main page]
Skip to content

Commit 5a2969c

Browse files
fabpotfabpot
committed
bug #29020 Fix ini_get() for boolean values (deguif)
This PR was merged into the 2.8 branch. Discussion ---------- Fix ini_get() for boolean values | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Currently setting `false` or `off`, ... value to configure some PHP ini directives will make this evaluated to `true` as this is equal to a non empty string. Commits ------- a153869 Fix ini_get() for boolean values
2 parents 2dfb039 + a153869 commit 5a2969c

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

‎src/Symfony/Component/ClassLoader/Tests/ApcClassLoaderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class ApcClassLoaderTest extends TestCase
1919
{
2020
protected function setUp()
2121
{
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))) {
2323
$this->markTestSkipped('The apc extension is not enabled.');
2424
} else {
2525
apcu_clear_cache();
@@ -28,7 +28,7 @@ protected function setUp()
2828

2929
protected function tearDown()
3030
{
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)) {
3232
apcu_clear_cache();
3333
}
3434
}

‎src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class LegacyApcUniversalClassLoaderTest extends TestCase
2121
{
2222
protected function setUp()
2323
{
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)) {
2525
apcu_clear_cache();
2626
} else {
2727
$this->markTestSkipped('APC is not enabled.');
@@ -30,7 +30,7 @@ protected function setUp()
3030

3131
protected function tearDown()
3232
{
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)) {
3434
apcu_clear_cache();
3535
}
3636
}

‎src/Symfony/Component/Config/ResourceCheckerConfigCache.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public function write($content, array $metadata = null)
151151
}
152152
}
153153

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)) {
155155
@opcache_invalidate($this->file, true);
156156
}
157157
}

‎src/Symfony/Component/Debug/Debug.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public static function enable($errorReportingLevel = null, $displayErrors = true
4545
if (!\in_array(\PHP_SAPI, array('cli', 'phpdbg'), true)) {
4646
ini_set('display_errors', 0);
4747
ExceptionHandler::register();
48-
} elseif ($displayErrors && (!ini_get('log_errors') || ini_get('error_log'))) {
48+
} elseif ($displayErrors && (!filter_var(ini_get('log_errors'), FILTER_VALIDATE_BOOLEAN) || ini_get('error_log'))) {
4949
// CLI - display errors only if they're not already logged to STDERR
5050
ini_set('display_errors', 1);
5151
}

‎src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ public function collect(Request $request, Response $response, \Exception $except
6363
'php_version' => PHP_VERSION,
6464
'xdebug_enabled' => \extension_loaded('xdebug'),
6565
'eaccel_enabled' => \extension_loaded('eaccelerator') && ini_get('eaccelerator.enable'),
66-
'apc_enabled' => \extension_loaded('apc') && ini_get('apc.enabled'),
67-
'xcache_enabled' => \extension_loaded('xcache') && ini_get('xcache.cacher'),
68-
'wincache_enabled' => \extension_loaded('wincache') && ini_get('wincache.ocenabled'),
69-
'zend_opcache_enabled' => \extension_loaded('Zend OPcache') && ini_get('opcache.enable'),
66+
'apc_enabled' => \extension_loaded('apc') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN),
67+
'xcache_enabled' => \extension_loaded('xcache') && filter_var(ini_get('xcache.cacher'), FILTER_VALIDATE_BOOLEAN),
68+
'wincache_enabled' => \extension_loaded('wincache') && filter_var(ini_get('wincache.ocenabled'), FILTER_VALIDATE_BOOLEAN),
69+
'zend_opcache_enabled' => \extension_loaded('Zend OPcache') && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN),
7070
'bundles' => array(),
7171
'sapi_name' => \PHP_SAPI,
7272
);

‎src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ public function testCollect()
4545
// if else clause because we don't know it
4646
if (((\extension_loaded('eaccelerator') && ini_get('eaccelerator.enable'))
4747
||
48-
(\extension_loaded('apc') && ini_get('apc.enabled'))
48+
(\extension_loaded('apc') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN))
4949
||
50-
(\extension_loaded('Zend OPcache') && ini_get('opcache.enable'))
50+
(\extension_loaded('Zend OPcache') && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN))
5151
||
52-
(\extension_loaded('xcache') && ini_get('xcache.cacher'))
52+
(\extension_loaded('xcache') && filter_var(ini_get('xcache.cacher'), FILTER_VALIDATE_BOOLEAN))
5353
||
54-
(\extension_loaded('wincache') && ini_get('wincache.ocenabled')))) {
54+
(\extension_loaded('wincache') && filter_var(ini_get('wincache.ocenabled'), FILTER_VALIDATE_BOOLEAN)))) {
5555
$this->assertTrue($c->hasAccelerator());
5656
} else {
5757
$this->assertFalse($c->hasAccelerator());

‎src/Symfony/Component/Validator/Tests/Mapping/Cache/LegacyApcCacheTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class LegacyApcCacheTest extends TestCase
2222
{
2323
protected function setUp()
2424
{
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)) {
2626
$this->markTestSkipped('APC is not enabled.');
2727
}
2828
}

0 commit comments

Comments
 (0)
0