Merge branch '3.3' into 3.4

* 3.3:
  fix merge
  fix merge
  fix merge
  Fix 7.2 compat layer
  Fix PHP 7.2 support
  [HttpFoundation] Add missing session.lazy_write config option
  [HttpFoundation] Combine Cache-Control headers
  [Form] fix parsing invalid floating point numbers
  Escape command usage when displaying it in the text descriptor
  Use for=ID on radio/checkbox label.

Author: nicolas-grekas

.travis.yml

@@ -25,9 +25,10 @@ matrix:
           group: edge
         - php: 5.5
         - php: 5.6
+        - php: 7.0
         - php: 7.1
           env: deps=high
-        - php: 7.0
+        - php: 7.2
           env: deps=low
     fast_finish: true
 

src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig

@@ -50,10 +50,14 @@
 {% endblock %}
 
 {% block checkbox_label -%}
+    {%- set label_attr = label_attr|merge({'for': id}) -%}
+
     {{- block('checkbox_radio_label') -}}
 {%- endblock checkbox_label %}
 
 {% block radio_label -%}
+    {%- set label_attr = label_attr|merge({'for': id}) -%}
+
     {{- block('checkbox_radio_label') -}}
 {%- endblock radio_label %}
 

src/Symfony/Bridge/Twig/Tests/AppVariableTest.php

@@ -45,6 +45,9 @@ public function testEnvironment()
         $this->assertEquals('dev', $this->appVariable->getEnvironment());
     }
 
+    /**
+     * @runInSeparateProcess
+     */
     public function testGetSession()
     {
         $session = $this->getMockBuilder(Session::class)->disableOriginalConstructor()->getMock();
@@ -166,6 +169,9 @@ public function testGetFlashesWithNoRequest()
         $this->assertEquals(array(), $this->appVariable->getFlashes());
     }
 
+    /**
+     * @runInSeparateProcess
+     */
     public function testGetFlashesWithNoSessionStarted()
     {
         $session = $this->getMockBuilder(Session::class)->disableOriginalConstructor()->getMock();
@@ -177,6 +183,9 @@ public function testGetFlashesWithNoSessionStarted()
         $this->assertEquals(array(), $this->appVariable->getFlashes());
     }
 
+    /**
+     * @runInSeparateProcess
+     */
     public function testGetFlashes()
     {
         $flashMessages = $this->setFlashMessages();

src/Symfony/Bridge/Twig/composer.json

@@ -24,6 +24,7 @@
         "symfony/asset": "~2.8|~3.0|~4.0",
         "symfony/finder": "~2.8|~3.0|~4.0",
         "symfony/form": "~3.4|~4.0",
+        "symfony/http-foundation": "^3.3.11|~4.0",
         "symfony/http-kernel": "~3.2|~4.0",
         "symfony/polyfill-intl-icu": "~1.0",
         "symfony/routing": "~2.8|~3.0|~4.0",

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);
         $configCacheFactory = new ConfigCacheFactory(true);
 
         foreach ($metaFiles as $file) {

src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php

@@ -373,6 +373,9 @@ public function testRedirectToRoute()
         $this->assertSame(302, $response->getStatusCode());
     }
 
+    /**
+     * @runInSeparateProcess
+     */
     public function testAddFlash()
     {
         $flashBag = new FlashBag();

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Article.php

@@ -2,7 +2,9 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Validation;
 
-class Article implements NotExistingInterface
-{
-    public $category;
+if (!function_exists('__phpunit_run_isolated_test')) {
+    class Article implements NotExistingInterface
+    {
+        public $category;
+    }
 }

src/Symfony/Bundle/FrameworkBundle/composer.json

@@ -23,7 +23,7 @@
         "symfony/dependency-injection": "~3.4|~4.0",
         "symfony/config": "~3.4|~4.0",
         "symfony/event-dispatcher": "^3.3.1|~4.0",
-        "symfony/http-foundation": "~3.3|~4.0",
+        "symfony/http-foundation": "^3.3.11|~4.0",
         "symfony/http-kernel": "~3.4|~4.0",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/filesystem": "~2.8|~3.0|~4.0",

src/Symfony/Component/Config/Tests/Fixtures/BadParent.php

@@ -2,6 +2,8 @@
 
 namespace Symfony\Component\Config\Tests\Fixtures;
 
-class BadParent extends MissingParent
-{
+if (!function_exists('__phpunit_run_isolated_test')) {
+    class BadParent extends MissingParent
+    {
+    }
 }

src/Symfony/Component/Console/Descriptor/TextDescriptor.php

@@ -143,7 +143,7 @@ protected function describeCommand(Command $command, array $options = array())
         $this->writeText('<comment>Usage:</comment>', $options);
         foreach (array_merge(array($command->getSynopsis(true)), $command->getAliases(), $command->getUsages()) as $usage) {
             $this->writeText("\n");
-            $this->writeText('  '.$usage, $options);
+            $this->writeText('  '.OutputFormatter::escape($usage), $options);
         }
         $this->writeText("\n");