Merge branch '4.0'

* 4.0:
  [2.7] Fix issues found by PHPStan
  [Command] Fix upgrade guide example
  Add php_unit_dedicate_assert to PHPCS
  [WebProfilerBundle] Let fetch() cast URL to string
  improve FormType::getType exception message details
  [Intl] Update ICU data to 60.2
  [Console] fix a bug when you are passing a default value and passing -n would ouput the index
  [FrameworkBundle] fix merge of 3.3 into 3.4
  bumped Symfony version to 4.0.3
  updated VERSION for 4.0.2
  updated CHANGELOG for 4.0.2
  bumped Symfony version to 3.4.3
  updated VERSION for 3.4.2
  updated CHANGELOG for 3.4.2

Author: nicolas-grekas

Templating/Helper/CodeHelper.php

@@ -116,7 +116,7 @@ public function fileExcerpt($file, $line)
     {
         if (is_readable($file)) {
             if (extension_loaded('fileinfo')) {
-                $finfo = new \Finfo();
+                $finfo = new \finfo();
 
                 // Check if the file is an application/octet-stream (eg. Phar file) because highlight_file cannot parse these files
                 if ('application/octet-stream' === $finfo->file($file, FILEINFO_MIME_TYPE)) {

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -141,13 +141,6 @@ public function testEsiDisabled()
         $container = $this->createContainerFromFile('esi_disabled');
 
         $this->assertFalse($container->hasDefinition('fragment.renderer.esi'), 'The ESI fragment renderer is not registered');
-    }
-
-    public function testEsiInactive()
-    {
-        $container = $this->createContainerFromFile('default_config');
-
-        $this->assertFalse($container->hasDefinition('fragment.renderer.esi'));
         $this->assertFalse($container->hasDefinition('esi'));
     }
 
@@ -164,6 +157,7 @@ public function testSsiDisabled()
         $container = $this->createContainerFromFile('ssi_disabled');
 
         $this->assertFalse($container->hasDefinition('fragment.renderer.ssi'), 'The SSI fragment renderer is not registered');
+        $this->assertFalse($container->hasDefinition('ssi'));
     }
 
     public function testEsiAndSsiWithoutFragments()
@@ -175,14 +169,6 @@ public function testEsiAndSsiWithoutFragments()
         $this->assertTrue($container->hasDefinition('fragment.renderer.ssi'), 'The SSI fragment renderer is registered');
     }
 
-    public function testSsiInactive()
-    {
-        $container = $this->createContainerFromFile('default_config');
-
-        $this->assertFalse($container->hasDefinition('fragment.renderer.ssi'));
-        $this->assertFalse($container->hasDefinition('ssi'));
-    }
-
     public function testEnabledProfiler()
     {
         $container = $this->createContainerFromFile('profiler');