Merge branch '4.1' into 4.2

nicolas-grekas · nicolas-grekas · commit 82617b90e502 · 2019-01-25T15:52:33.000+01:00
* 4.1:
  fix merge
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Profiler/TemplateManagerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Profiler/TemplateManagerTest.php
@@ -74,23 +74,6 @@ public function testGetNameValidTemplate()
         $this->assertEquals('FooBundle:Collector:foo.html.twig', $this->templateManager->getName(new ProfileDummy(), 'foo'));
     }
 
-    /**
-     * template should be loaded for 'foo' because other collectors are
-     * missing in profile or in profiler.
-     */
-    public function testGetTemplates()
-    {
-        $this->profiler->expects($this->any())
-            ->method('has')
-            ->withAnyParameters()
-            ->will($this->returnCallback([$this, 'profileHasCollectorCallback']));
-
-        $result = $this->templateManager->getTemplates(new ProfileDummy());
-        $this->assertArrayHasKey('foo', $result);
-        $this->assertArrayNotHasKey('bar', $result);
-        $this->assertArrayNotHasKey('baz', $result);
-    }
-
     public function profilerHasCallback($panel)
     {
         switch ($panel) {
