Merge branch '2.3' into 2.7

fabpot · fabpot · commit b9b68f7af83e · 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/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/ContainerBuilderTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/ContainerBuilderTest.php
@@ -33,6 +33,8 @@ public function testCreateProxyServiceWithRuntimeInstantiator()
         $builder->register('foo1', 'ProxyManagerBridgeFooClass')->setFile(__DIR__.'/Fixtures/includes/foo.php');
         $builder->getDefinition('foo1')->setLazy(true);
 
+        $builder->compile();
+
         /* @var $foo1 \ProxyManager\Proxy\LazyLoadingInterface|\ProxyManager\Proxy\ValueHolderInterface */
         $foo1 = $builder->get('foo1');
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php b/src/Symfony/Bundle/WebProfilerBundle/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());
     }
 
diff --git a/src/Symfony/Component/OptionsResolver/README.md b/src/Symfony/Component/OptionsResolver/README.md
@@ -1,7 +1,7 @@
 OptionsResolver Component
 =========================
 
-The OptionsResolver component is `array_replace on steroids. It allows you to
+The OptionsResolver component is `array_replace` on steroids. It allows you to
 create an options system with required options, defaults, validation (type,
 value), normalization and more.
 
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php
@@ -26,7 +26,7 @@ class AnonymousToken extends AbstractToken
      * Constructor.
      *
      * @param string          $key   The key shared with the authentication provider
-     * @param string          $user  The user
+     * @param string|object   $user  The user can be a UserInterface instance, or an object implementing a __toString method or the username as a regular string.
      * @param RoleInterface[] $roles An array of roles
      */
     public function __construct($key, $user, array $roles = array())
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php
@@ -26,7 +26,7 @@ class PreAuthenticatedToken extends AbstractToken
     /**
      * Constructor.
      *
-     * @param string|object            $user        The user
+     * @param string|object            $user        The user can be a UserInterface instance, or an object implementing a __toString method or the username as a regular string.
      * @param mixed                    $credentials The user credentials
      * @param string                   $providerKey The provider key
      * @param RoleInterface[]|string[] $roles       An array of roles

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`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class AnonymousToken extends AbstractToken`
`26`	`26`	`* Constructor.`
`27`	`27`	`*`
`28`	`28`	`* @param string $key The key shared with the authentication provider`
`29`		`- * @param string $user The user`
	`29`	`+ * @param string\|object $user The user can be a UserInterface instance, or an object implementing a __toString method or the username as a regular string.`
`30`	`30`	`* @param RoleInterface[] $roles An array of roles`
`31`	`31`	`*/`
`32`	`32`	`public function __construct($key, $user, array $roles = array())`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class PreAuthenticatedToken extends AbstractToken`
`26`	`26`	`/**`
`27`	`27`	`* Constructor.`
`28`	`28`	`*`
`29`		`- * @param string\|object $user The user`
	`29`	`+ * @param string\|object $user The user can be a UserInterface instance, or an object implementing a __toString method or the username as a regular string.`
`30`	`30`	`* @param mixed $credentials The user credentials`
`31`	`31`	`* @param string $providerKey The provider key`
`32`	`32`	`* @param RoleInterface[]\|string[] $roles An array of roles`