Merge branch '2.3' into 2.7

fabpot · fabpot · commit 4d84d1a47084 · 2016-05-09T13:11:52.000-05:00
* 2.3:
  [2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param
  call get() after the container was compiled
  Fixed readme of OptionsResolver
diff --git a/Tests/DependencyInjection/WebProfilerExtensionTest.php b/Tests/DependencyInjection/WebProfilerExtensionTest.php
@@ -103,6 +103,8 @@ 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
`@@ -103,6 +103,8 @@ public function testToolbarConfig($toolbarEnabled, $interceptRedirects, $listene`
`103`	`103`	`$this->assertSame($listenerEnabled, $this->container->get('web_profiler.debug_toolbar')->isEnabled());`
`104`	`104`	`}`
`105`	`105`
	`106`	`+ $this->assertSame($enabled, $this->container->get('web_profiler.debug_toolbar')->isEnabled());`
	`107`	`+`
`106`	`108`	`$this->assertSaneContainer($this->getDumpedContainer());`
`107`	`109`	`}`
`108`	`110`