Merge branch '4.3' into 4.4

* 4.3: fix deps Relax transient test
symfony · Jan 9, 2020 · f06e5cc · f06e5cc
2 parents 2a3de1a + 4ee84b3
commit f06e5cc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
@@ -104,7 +104,6 @@ public function testPanelActionWithValidPanelAndToken()
         $crawler = $client->request('GET', '/_profiler/latest?panel=router');
 
         $this->assertSame('_', $crawler->filter('.metrics .metric .value')->eq(0)->text());
-        $this->assertSame('12', $crawler->filter('.metrics .metric .value')->eq(1)->text());
     }
 
     public function testToolbarActionWithProfilerDisabled()
@@ -337,7 +336,7 @@ public function testSearchActionWithoutToken()
         $token = $client->getResponse()->headers->get('x-debug-token');
         $client->request('GET', '/_profiler/search?ip=&method=GET&status_code=&url=&token=&start=&end=&limit=10');
 
-        $this->assertStringContainsString('1 results found', $client->getResponse()->getContent());
+        $this->assertStringContainsString('results found', $client->getResponse()->getContent());
         $this->assertStringContainsString(sprintf('<a href="/_profiler/%s">%s</a>', $token, $token), $client->getResponse()->getContent());
     }
 

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Functional/WebProfilerBundleKernel.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Functional/WebProfilerBundleKernel.php
@@ -21,18 +21,6 @@ public function __construct()
         parent::__construct('test', false);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        if (null === $this->name) {
-            $this->name = parent::getName().substr(md5(__CLASS__), -16);
-        }
-
-        return $this->name;
-    }
-
     public function registerBundles()
     {
         return [
@@ -61,6 +49,11 @@ protected function configureContainer(ContainerBuilder $containerBuilder, Loader
             'toolbar' => true,
             'intercept_redirects' => false,
         ]);
+
+        $containerBuilder->loadFromExtension('twig', [
+            'strict_variables' => true,
+            'exception_controller' => null,
+        ]);
     }
 
     public function getCacheDir()

diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json
@@ -20,13 +20,13 @@
         "symfony/config": "^4.2|^5.0",
         "symfony/framework-bundle": "^4.4|^5.0",
         "symfony/http-kernel": "^4.4",
-        "symfony/routing": "^3.4.7|^4.0|^5.0",
+        "symfony/routing": "^4.3|^5.0",
         "symfony/twig-bundle": "^4.2|^5.0",
         "twig/twig": "^1.41|^2.10|^3.0"
     },
     "require-dev": {
-        "symfony/browser-kit": "^3.4|^4.0|^5.0",
-        "symfony/console": "^3.4|^4.0|^5.0",
+        "symfony/browser-kit": "^4.3|^5.0",
+        "symfony/console": "^4.3|^5.0",
         "symfony/css-selector": "^3.4|^4.0|^5.0",
         "symfony/dependency-injection": "^3.4|^4.0|^5.0",
         "symfony/stopwatch": "^3.4|^4.0|^5.0"