diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ini_get() for boolean values

Browse Source
This commit is contained in:
François-Xavier de Guillebon 2018-10-29 20:09:12 +01:00
parent 9075d2e64e
commit a1538696c3
No known key found for this signature in database
GPG Key ID: 4C7866C1D8FE86CE
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/ClassLoader/Tests/ApcClassLoaderTest.php
View File

@ -19,7 +19,7 @@ class ApcClassLoaderTest extends TestCase
{ {
protected function setUp() 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.'); $this->markTestSkipped('The apc extension is not enabled.');
} else { } else {
apcu_clear_cache(); apcu_clear_cache();
@ -28,7 +28,7 @@ class ApcClassLoaderTest extends TestCase
protected function tearDown() 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(); apcu_clear_cache();
} }
} }

4
src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php
View File

@ -21,7 +21,7 @@ class LegacyApcUniversalClassLoaderTest extends TestCase
{ {
protected function setUp() 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(); apcu_clear_cache();
} else { } else {
$this->markTestSkipped('APC is not enabled.'); $this->markTestSkipped('APC is not enabled.');
@ -30,7 +30,7 @@ class LegacyApcUniversalClassLoaderTest extends TestCase
protected function tearDown() 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(); apcu_clear_cache();
} }
} }

2
src/Symfony/Component/Config/ResourceCheckerConfigCache.php
View File

@ -151,7 +151,7 @@ class ResourceCheckerConfigCache implements ConfigCacheInterface
} }
} }
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); @opcache_invalidate($this->file, true);
} }
} }

2
src/Symfony/Component/Debug/Debug.php
View File

@ -45,7 +45,7 @@ class Debug
if (!\in_array(\PHP_SAPI, array('cli', 'phpdbg'), true)) { if (!\in_array(\PHP_SAPI, array('cli', 'phpdbg'), true)) {
ini_set('display_errors', 0); ini_set('display_errors', 0);
ExceptionHandler::register(); ExceptionHandler::register();
} elseif ($displayErrors && (!ini_get('log_errors') || ini_get('error_log'))) { } elseif ($displayErrors && (!filter_var(ini_get('log_errors'), FILTER_VALIDATE_BOOLEAN) || ini_get('error_log'))) {
// CLI - display errors only if they're not already logged to STDERR // CLI - display errors only if they're not already logged to STDERR
ini_set('display_errors', 1); ini_set('display_errors', 1);
} }

8
src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
View File

@ -63,10 +63,10 @@ class ConfigDataCollector extends DataCollector
'php_version' => PHP_VERSION, 'php_version' => PHP_VERSION,
'xdebug_enabled' => \extension_loaded('xdebug'), 'xdebug_enabled' => \extension_loaded('xdebug'),
'eaccel_enabled' => \extension_loaded('eaccelerator') && ini_get('eaccelerator.enable'), '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'), 'xcache_enabled' => \extension_loaded('xcache') && filter_var(ini_get('xcache.cacher'), FILTER_VALIDATE_BOOLEAN),
'wincache_enabled' => \extension_loaded('wincache') && ini_get('wincache.ocenabled'), 'wincache_enabled' => \extension_loaded('wincache') && filter_var(ini_get('wincache.ocenabled'), FILTER_VALIDATE_BOOLEAN),
'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(), 'bundles' => array(),
'sapi_name' => \PHP_SAPI, 'sapi_name' => \PHP_SAPI,
); );

8
src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php
View File

@ -45,13 +45,13 @@ class ConfigDataCollectorTest extends TestCase
// if else clause because we don't know it // if else clause because we don't know it
if (((\extension_loaded('eaccelerator') && ini_get('eaccelerator.enable')) 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')) (\extension_loaded('xcache') && filter_var(ini_get('xcache.cacher'), FILTER_VALIDATE_BOOLEAN))
|| ||
(\extension_loaded('wincache') && ini_get('wincache.ocenabled')))) { (\extension_loaded('wincache') && filter_var(ini_get('wincache.ocenabled'), FILTER_VALIDATE_BOOLEAN)))) {
$this->assertTrue($c->hasAccelerator()); $this->assertTrue($c->hasAccelerator());
} else { } else {
$this->assertFalse($c->hasAccelerator()); $this->assertFalse($c->hasAccelerator());

2
src/Symfony/Component/Validator/Tests/Mapping/Cache/LegacyApcCacheTest.php
View File

@ -22,7 +22,7 @@ class LegacyApcCacheTest extends TestCase
{ {
protected function setUp() 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.'); $this->markTestSkipped('APC is not enabled.');
} }
} }