Merge branch '2.8' into 3.4

nicolas-grekas · nicolas-grekas · commit 63c74f7c2920 · 2018-10-31T10:06:03.000+01:00
* 2.8:
  Fixed typo
  Fix ini_get() for boolean values
diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md
@@ -681,7 +681,7 @@ UPGRADE FROM 2.x to 3.0
    As a value for the option you must provide the fully-qualified class name (FQCN)
    now as well.
 
- * The `FormIntegrationTestCase` and `FormPerformanceTestCase` classes were moved form the `Symfony\Component\Form\Tests` namespace to the `Symfony\Component\Form\Test` namespace.
+ * The `FormIntegrationTestCase` and `FormPerformanceTestCase` classes were moved from the `Symfony\Component\Form\Tests` namespace to the `Symfony\Component\Form\Test` namespace.
 
  * The constants `ROUND_HALFEVEN`, `ROUND_HALFUP` and `ROUND_HALFDOWN` in class
    `NumberToLocalizedStringTransformer` were renamed to `ROUND_HALF_EVEN`,
diff --git a/src/Symfony/Component/ClassLoader/Tests/ApcClassLoaderTest.php b/src/Symfony/Component/ClassLoader/Tests/ApcClassLoaderTest.php
@@ -22,7 +22,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();
@@ -31,7 +31,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
@@ -137,7 +137,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/Debug/Debug.php b/src/Symfony/Component/Debug/Debug.php
@@ -45,7 +45,7 @@ public static function enable($errorReportingLevel = E_ALL, $displayErrors = tru
         if (!\in_array(\PHP_SAPI, array('cli', 'phpdbg'), true)) {
             ini_set('display_errors', 0);
             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
             ini_set('display_errors', 1);
         }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
@@ -68,8 +68,8 @@ public function collect(Request $request, Response $response, \Exception $except
             'php_intl_locale' => class_exists('Locale', false) && \Locale::getDefault() ? \Locale::getDefault() : 'n/a',
             'php_timezone' => date_default_timezone_get(),
             'xdebug_enabled' => \extension_loaded('xdebug'),
-            'apcu_enabled' => \extension_loaded('apcu') && ini_get('apc.enabled'),
-            'zend_opcache_enabled' => \extension_loaded('Zend OPcache') && ini_get('opcache.enable'),
+            'apcu_enabled' => \extension_loaded('apcu') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN),
+            '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
@@ -39,8 +39,8 @@ public function testCollect()
         $this->assertSame(Kernel::VERSION, $c->getSymfonyVersion());
         $this->assertNull($c->getToken());
         $this->assertSame(\extension_loaded('xdebug'), $c->hasXDebug());
-        $this->assertSame(\extension_loaded('Zend OPcache') && ini_get('opcache.enable'), $c->hasZendOpcache());
-        $this->assertSame(\extension_loaded('apcu') && ini_get('apc.enabled'), $c->hasApcu());
+        $this->assertSame(\extension_loaded('Zend OPcache') && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN)), $c->hasZendOpcache());
+        $this->assertSame(\extension_loaded('apcu') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN)), $c->hasApcu());
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class ApcClassLoaderTest 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('The apc extension is not enabled.');`
`27`	`27`	`} else {`
`28`	`28`	`apcu_clear_cache();`
`@@ -31,7 +31,7 @@ protected function setUp()`
`31`	`31`
`32`	`32`	`protected function tearDown()`
`33`	`33`	`{`
`34`		`- if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) {`
	`34`	`+ if (filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) && filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN)) {`
`35`	`35`	`apcu_clear_cache();`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ public function write($content, array $metadata = null)`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`
`140`		`- if (\function_exists('opcache_invalidate') && ini_get('opcache.enable')) {`
	`140`	`+ if (\function_exists('opcache_invalidate') && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN)) {`
`141`	`141`	`@opcache_invalidate($this->file, true);`
`142`	`142`	`}`
`143`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public static function enable($errorReportingLevel = E_ALL, $displayErrors = tru`
`45`	`45`	`if (!\in_array(\PHP_SAPI, array('cli', 'phpdbg'), true)) {`
`46`	`46`	`ini_set('display_errors', 0);`
`47`	`47`	`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'))) {`
`49`	`49`	`// CLI - display errors only if they're not already logged to STDERR`
`50`	`50`	`ini_set('display_errors', 1);`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@ public function testCollect()`
`39`	`39`	`$this->assertSame(Kernel::VERSION, $c->getSymfonyVersion());`
`40`	`40`	`$this->assertNull($c->getToken());`
`41`	`41`	`$this->assertSame(\extension_loaded('xdebug'), $c->hasXDebug());`
`42`		`- $this->assertSame(\extension_loaded('Zend OPcache') && ini_get('opcache.enable'), $c->hasZendOpcache());`
`43`		`- $this->assertSame(\extension_loaded('apcu') && ini_get('apc.enabled'), $c->hasApcu());`
	`42`	`+ $this->assertSame(\extension_loaded('Zend OPcache') && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN)), $c->hasZendOpcache());`
	`43`	`+ $this->assertSame(\extension_loaded('apcu') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN)), $c->hasApcu());`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`