Merge branch '2.8' into 3.4

* 2.8: Fixed typo Fix ini_get() for boolean values
Fix ini_get() for boolean values
2026-04-28 03:23:12 +02:00 · 2018-10-31 10:06:03 +01:00 · 2018-10-30 17:24:01 +01:00 · 2018-10-02 14:28:39 +02:00 · 2018-10-01 23:42:26 -03:00
2 changed files with 3 additions and 3 deletions
@@ -56,7 +56,7 @@ class ClassCollectionLoader
            $classes = array_diff($classes, $declared);

            // the cache is different depending on which classes are already declared
-            $name = $name.'-'.substr(hash('sha256', implode('|', $classes)), 0, 5);
+            $name .= '-'.substr(hash('sha256', implode('|', $classes)), 0, 5);
        }

        $classes = array_unique($classes);
@@ -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 @@ class ApcClassLoaderTest extends TestCase

    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();
        }
    }
Author	SHA1	Message	Date
Nicolas Grekas	5605edec7b	Merge branch '2.8' into 3.4 * 2.8: Fixed typo Fix ini_get() for boolean values	2018-10-31 10:06:03 +01:00
François-Xavier de Guillebon	5694f145b1	Fix ini_get() for boolean values	2018-10-30 17:24:01 +01:00
Nicolas Grekas	f31333bdff	Merge branch '2.8' into 3.4 * 2.8: [php_cs] disable fopen_flags [CS] Remove unused variables passed to closures [CS] Remove empty comment [CS] Enforces null type hint on last position in phpDocs [CS] Use combined assignment operators when possible Fix a typo in error messages [Console] Add missing null to input values allowed types [PHPUnitBridge] Fix microtime() format bumped Symfony version to 2.8.47 update CONTRIBUTORS for 2.8.46 updated VERSION for 2.8.46 updated CHANGELOG for 2.8.46	2018-10-02 14:28:39 +02:00
Gabriel Caruso	11b1f30ef9	[CS] Use combined assignment operators when possible	2018-10-01 23:42:26 -03:00