bug #23711 Fix support for PHP 7.2 (Simperfit, nicolas-grekas)

fabpot · fabpot · commit 5fd0fe66314f · 2017-10-09T21:00:26.000-07:00
This PR was merged into the 2.7 branch. Discussion ---------- Fix support for PHP 7.2 | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | no | Fixed tickets | #23671 | License | MIT | Doc PR | - There are still the deprecation problem with phpunit since it use `each()`. There are 3 tests linked to session that I don't know how to fix / what to do, do you have any idea @nicolas-grekas ? Commits ------- fdf285b Fix 7.2 compat layer e229dd0 Fix PHP 7.2 support
diff --git a/.travis.yml b/.travis.yml
@@ -25,8 +25,9 @@ matrix:
         - php: 5.5
         - php: 5.6
         - php: 7.0
-          env: deps=high
         - php: 7.1
+          env: deps=high
+        - php: 7.2
           env: deps=low
     fast_finish: true
 
diff --git a/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php b/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
@@ -44,6 +44,9 @@ public function testEnvironment()
         $this->assertEquals('dev', $this->appVariable->getEnvironment());
     }
 
+    /**
+     * @runInSeparateProcess
+     */
     public function testGetSession()
     {
         $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -23,6 +23,7 @@
         "symfony/asset": "~2.7",
         "symfony/finder": "~2.3",
         "symfony/form": "~2.7.30|^2.8.23",
+        "symfony/http-foundation": "~2.7.36|^2.8.29",
         "symfony/http-kernel": "~2.3",
         "symfony/intl": "~2.3",
         "symfony/routing": "~2.2",
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
@@ -55,7 +55,7 @@ public function testCacheIsFreshAfterCacheClearedWithWarmup()
         $finder = new Finder();
         $metaFiles = $finder->files()->in($this->kernel->getCacheDir())->name('*.php.meta');
         // simply check that cache is warmed up
-        $this->assertGreaterThanOrEqual(1, count($metaFiles));
+        $this->assertNotEmpty($metaFiles);
         foreach ($metaFiles as $file) {
             $configCache = new ConfigCache(substr($file, 0, -5), true);
             $this->assertTrue(
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php
@@ -143,6 +143,9 @@ public function testRedirectToRoute()
         $this->assertSame(302, $response->getStatusCode());
     }
 
+    /**
+     * @runInSeparateProcess
+     */
     public function testAddFlash()
     {
         $flashBag = new FlashBag();
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -23,7 +23,7 @@
         "symfony/config": "~2.4",
         "symfony/event-dispatcher": "~2.5",
         "symfony/finder": "^2.0.5",
-        "symfony/http-foundation": "~2.7",
+        "symfony/http-foundation": "~2.7.36|^2.8.29",
         "symfony/http-kernel": "~2.7.29|^2.8.22",
         "symfony/filesystem": "~2.3",
         "symfony/routing": "~2.7.24|^2.8.17",
diff --git a/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
@@ -79,7 +79,9 @@ public function testNotice()
             $this->assertEquals(E_NOTICE, $exception->getSeverity());
             $this->assertEquals(__FILE__, $exception->getFile());
             $this->assertRegExp('/^Notice: Undefined variable: (foo|bar)/', $exception->getMessage());
-            $this->assertArrayHasKey('foobar', $exception->getContext());
+            if (\PHP_VERSION_ID < 70200) {
+                $this->assertArrayHasKey('foobar', $exception->getContext());
+            }
 
             $trace = $exception->getTrace();
             $this->assertEquals(__FILE__, $trace[0]['file']);
diff --git a/src/Symfony/Component/Debug/Tests/Fixtures/Throwing.php b/src/Symfony/Component/Debug/Tests/Fixtures/Throwing.php
@@ -1,3 +1,5 @@
 <?php
 
-throw new \Exception('boo');
+if (!function_exists('__phpunit_run_isolated_test')) {
+    throw new \Exception('boo');
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
@@ -421,6 +421,9 @@ public function testExtensionInPhar()
         if (extension_loaded('suhosin') && false === strpos(ini_get('suhosin.executor.include.whitelist'), 'phar')) {
             $this->markTestSkipped('To run this test, add "phar" to the "suhosin.executor.include.whitelist" settings in your php.ini file.');
         }
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('HHVM makes this test conflict with those run in separate processes.');
+        }
 
         require_once self::$fixturesPath.'/includes/ProjectWithXsdExtensionInPhar.phar';
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/LegacyDefaultCsrfProviderTest.php b/src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/LegacyDefaultCsrfProviderTest.php
@@ -23,12 +23,6 @@ class LegacyDefaultCsrfProviderTest extends TestCase
 {
     protected $provider;
 
-    public static function setUpBeforeClass()
-    {
-        ini_set('session.save_handler', 'files');
-        ini_set('session.save_path', sys_get_temp_dir());
-    }
-
     protected function setUp()
     {
         $this->provider = new DefaultCsrfProvider('SECRET');
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -102,8 +102,11 @@ class NativeSessionStorage implements SessionStorageInterface
      */
     public function __construct(array $options = array(), $handler = null, MetadataBag $metaBag = null)
     {
-        session_cache_limiter(''); // disable by default because it's managed by HeaderBag (if used)
-        ini_set('session.use_cookies', 1);
+        $options += array(
+            // disable by default because it's managed by HeaderBag (if used)
+            'cache_limiter' => '',
+            'use_cookies' => 1,
+        );
 
         if (\PHP_VERSION_ID >= 50400) {
             session_register_shutdown();
@@ -209,6 +212,10 @@ public function regenerate($destroy = false, $lifetime = null)
             return false;
         }
 
+        if (headers_sent()) {
+            return false;
+        }
+
         if (null !== $lifetime) {
             ini_set('session.cookie_lifetime', $lifetime);
         }
@@ -333,6 +340,10 @@ public function isStarted()
      */
     public function setOptions(array $options)
     {
+        if (headers_sent()) {
+            return;
+        }
+
         $validOptions = array_flip(array(
             'cache_limiter', 'cookie_domain', 'cookie_httponly',
             'cookie_lifetime', 'cookie_path', 'cookie_secure',
@@ -384,6 +395,10 @@ public function setSaveHandler($saveHandler = null)
             throw new \InvalidArgumentException('Must be instance of AbstractProxy or NativeSessionHandler; implement \SessionHandlerInterface; or be null.');
         }
 
+        if (headers_sent($file, $line)) {
+            throw new \RuntimeException(sprintf('Failed to set the session handler because headers have already been sent by "%s" at line %d.', $file, $line));
+        }
+
         // Wrap $saveHandler in proxy and prevent double wrapping of proxy
         if (!$saveHandler instanceof AbstractProxy && $saveHandler instanceof \SessionHandlerInterface) {
             $saveHandler = new SessionHandlerProxy($saveHandler);
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
@@ -269,6 +269,9 @@ public function testSessionDestroy()
         $this->assertSame('', $data, 'Destroyed session returns empty string');
     }
 
+    /**
+     * @runInSeparateProcess
+     */
     public function testSessionGC()
     {
         $previousLifeTime = ini_set('session.gc_maxlifetime', 1000);
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
@@ -38,8 +38,7 @@ public function testDefaultLocaleWithoutSession()
     public function testLocaleFromRequestAttribute()
     {
         $request = Request::create('/');
-        session_name('foo');
-        $request->cookies->set('foo', 'value');
+        $request->cookies->set(session_name(), 'value');
 
         $request->attributes->set('_locale', 'es');
         $listener = new LocaleListener('fr', null, $this->requestStack);
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
@@ -62,8 +62,7 @@ public function testDoesNotDeleteCookieIfUsingSessionLifetime()
     {
         $this->sessionHasBeenStarted();
 
-        $params = session_get_cookie_params();
-        session_set_cookie_params(0, $params['path'], $params['domain'], $params['secure'], $params['httponly']);
+        @ini_set('session.cookie_lifetime', 0);
 
         $response = $this->filterResponse(new Request(), HttpKernelInterface::MASTER_REQUEST);
         $cookies = $response->headers->getCookies();
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=5.3.9",
         "symfony/event-dispatcher": "^2.6.7",
-        "symfony/http-foundation": "~2.7.20|^2.8.13",
+        "symfony/http-foundation": "~2.7.36|^2.8.29",
         "symfony/debug": "^2.6.2",
         "psr/log": "~1.0"
     },
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/validresource.php b/src/Symfony/Component/Routing/Tests/Fixtures/validresource.php
@@ -1,5 +1,8 @@
 <?php
 
+if (function_exists('__phpunit_run_isolated_test')) {
+    return;
+}
 /** @var $loader \Symfony\Component\Routing\Loader\PhpFileLoader */
 /** @var \Symfony\Component\Routing\RouteCollection $collection */
 $collection = $loader->import('validpattern.php');
diff --git a/src/Symfony/Component/Security/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php b/src/Symfony/Component/Security/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php
@@ -29,14 +29,6 @@ class NativeSessionTokenStorageTest extends TestCase
      */
     private $storage;
 
-    public static function setUpBeforeClass()
-    {
-        ini_set('session.save_handler', 'files');
-        ini_set('session.save_path', sys_get_temp_dir());
-
-        parent::setUpBeforeClass();
-    }
-
     protected function setUp()
     {
         $_SESSION = array();

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,9 @@ public function testEnvironment()`
`44`	`44`	`$this->assertEquals('dev', $this->appVariable->getEnvironment());`
`45`	`45`	`}`
`46`	`46`
	`47`	`+ /**`
	`48`	`+ * @runInSeparateProcess`
	`49`	`+ */`
`47`	`50`	`public function testGetSession()`
`48`	`51`	`{`
`49`	`52`	`$request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();`
Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,9 @@ public function testRedirectToRoute()`
`143`	`143`	`$this->assertSame(302, $response->getStatusCode());`
`144`	`144`	`}`
`145`	`145`
	`146`	`+ /**`
	`147`	`+ * @runInSeparateProcess`
	`148`	`+ */`
`146`	`149`	`public function testAddFlash()`
`147`	`150`	`{`
`148`	`151`	`$flashBag = new FlashBag();`
Original file line number	Diff line number	Diff line change
`@@ -421,6 +421,9 @@ public function testExtensionInPhar()`
`421`	`421`	`if (extension_loaded('suhosin') && false === strpos(ini_get('suhosin.executor.include.whitelist'), 'phar')) {`
`422`	`422`	`$this->markTestSkipped('To run this test, add "phar" to the "suhosin.executor.include.whitelist" settings in your php.ini file.');`
`423`	`423`	`}`
	`424`	`+ if (defined('HHVM_VERSION')) {`
	`425`	`+ $this->markTestSkipped('HHVM makes this test conflict with those run in separate processes.');`
	`426`	`+ }`
`424`	`427`
`425`	`428`	`require_once self::$fixturesPath.'/includes/ProjectWithXsdExtensionInPhar.phar';`
`426`	`429`
Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,6 @@ class LegacyDefaultCsrfProviderTest extends TestCase`
`23`	`23`	`{`
`24`	`24`	`protected $provider;`
`25`	`25`
`26`		`- public static function setUpBeforeClass()`
`27`		`- {`
`28`		`- ini_set('session.save_handler', 'files');`
`29`		`- ini_set('session.save_path', sys_get_temp_dir());`
`30`		`- }`
`31`		`-`
`32`	`26`	`protected function setUp()`
`33`	`27`	`{`
`34`	`28`	`$this->provider = new DefaultCsrfProvider('SECRET');`