Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit cc2246e916cc · 2020-01-09T13:15:56.000+01:00
* 3.4:
  Relax transient test
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
@@ -329,7 +329,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,10 @@ protected function configureContainer(ContainerBuilder $containerBuilder, Loader
             'toolbar' => true,
             'intercept_redirects' => false,
         ]);
+
+        $containerBuilder->loadFromExtension('twig', [
+            'strict_variables' => true,
+        ]);
     }
 
     public function getCacheDir()
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Profiler/TemplateManagerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Profiler/TemplateManagerTest.php
@@ -105,10 +105,6 @@ protected function mockTwigEnvironment()
     {
         $this->twigEnvironment = $this->getMockBuilder('Twig\Environment')->disableOriginalConstructor()->getMock();
 
-        $this->twigEnvironment->expects($this->any())
-            ->method('loadTemplate')
-            ->willReturn('loadedTemplate');
-
         if (Environment::MAJOR_VERSION > 1) {
             $loader = $this->createMock(LoaderInterface::class);
             $loader

Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ public function testSearchActionWithoutToken()`
`329`	`329`	`$token = $client->getResponse()->headers->get('x-debug-token');`
`330`	`330`	`$client->request('GET', '/_profiler/search?ip=&method=GET&status_code=&url=&token=&start=&end=&limit=10');`
`331`	`331`
`332`		`- $this->assertStringContainsString('1 results found', $client->getResponse()->getContent());`
	`332`	`+ $this->assertStringContainsString('results found', $client->getResponse()->getContent());`
`333`	`333`	`$this->assertStringContainsString(sprintf('<a href="/_profiler/%s">%s</a>', $token, $token), $client->getResponse()-> 10000 getContent());`
`334`	`334`	`}`
`335`	`335`