Merge branch '2.7' into 2.8

fabpot · fabpot · commit 7eb9df9d78f8 · 2016-05-09T14:39:10.000-05:00
* 2.7:
  fixed bad merge
diff --git a/Tests/DependencyInjection/WebProfilerExtensionTest.php b/Tests/DependencyInjection/WebProfilerExtensionTest.php
@@ -100,8 +100,6 @@ public function testToolbarConfig($toolbarEnabled, $interceptRedirects, $listene
             $this->assertSame($listenerEnabled, $this->container->get('web_profiler.debug_toolbar')->isEnabled());
         }
 
-        $this->assertSame($enabled, $this->container->get('web_profiler.debug_toolbar')->isEnabled());
-
         $this->assertSaneContainer($this->getDumpedContainer());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -100,8 +100,6 @@ public function testToolbarConfig($toolbarEnabled, $interceptRedirects, $listene`
`100`	`100`	`$this->assertSame($listenerEnabled, $this->container->get('web_profiler.debug_toolbar')->isEnabled());`
`101`	`101`	`}`
`102`	`102`
`103`		`- $this->assertSame($enabled, $this->container->get('web_profiler.debug_toolbar')->isEnabled());`
`104`		`-`
`105`	`103`	`$this->assertSaneContainer($this->getDumpedContainer());`
`106`	`104`	`}`
`107`	`105`