Merge branch '3.4' into 4.3

* 3.4:
  Improve some URLs
  Fix test compatibility with 4.x components
  [Cache] cs fix

Author: nicolas-grekas

DependencyInjection/FrameworkExtension.php

@@ -225,7 +225,7 @@ public function load(array $configs, ContainerBuilder $container)
 
         if ($this->isConfigEnabled($container, $config['session'])) {
             if (!\extension_loaded('session')) {
-                throw new LogicException('Session support cannot be enabled as the session extension is not installed. See https://www.php.net/session.installation for instructions.');
+                throw new LogicException('Session support cannot be enabled as the session extension is not installed. See https://php.net/session.installation for instructions.');
             }
 
             $this->sessionConfigEnabled = true;

Templating/Helper/CodeHelper.php

@@ -131,7 +131,7 @@ public function fileExcerpt($file, $line)
             }
 
             // highlight_file could throw warnings
-            // see https://bugs.php.net/bug.php?id=25725
+            // see https://bugs.php.net/25725
             $code = @highlight_file($file, true);
             // remove main code/span tags
             $code = preg_replace('#^<code.*?>\s*<span.*?>(.*)</span>\s*</code>#s', '\\1', $code);

Tests/Controller/ControllerTraitTest.php

@@ -426,10 +426,10 @@ public function testGenerateUrl()
     public function testRedirect()
     {
         $controller = $this->createController();
-        $response = $controller->redirect('http://dunglas.fr', 301);
+        $response = $controller->redirect('https://dunglas.fr', 301);
 
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\RedirectResponse', $response);
-        $this->assertSame('http://dunglas.fr', $response->getTargetUrl());
+        $this->assertSame('https://dunglas.fr', $response->getTargetUrl());
         $this->assertSame(301, $response->getStatusCode());
     }