Merge branch '2.8' into 3.0

* 2.8:
  [2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param
  prevent calling get() for service_container service
  call get() after the container was compiled
  Fixed readme of OptionsResolver
  top-level anonymous services must be public
  [DependencyInjection] Suggest ExpressionLanguage in composer.json
  added a conflict between Monolog bridge 2.8 and HTTP Kernel 3.0+

Author: fabpot

src/Symfony/Bridge/Monolog/composer.json

@@ -24,6 +24,9 @@
         "symfony/console": "~2.8|~3.0",
         "symfony/event-dispatcher": "~2.8|~3.0"
     },
+    "conflict": {
+        "symfony/http-kernel": ">=3.0"
+    },
     "suggest": {
         "symfony/http-kernel": "For using the debugging handlers together with the response life cycle of the HTTP kernel.",
         "symfony/console": "For the possibility to show log messages in console commands depending on verbosity settings. You need version ~2.3 of the console for it.",

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');
 

src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php

@@ -256,6 +256,10 @@ protected function resolveServiceDefinition(ContainerBuilder $builder, $serviceI
             return $builder->getAlias($serviceId);
         }
 
+        if ('service_container' === $serviceId) {
+            return $builder;
+        }
+
         // the service has been injected in some special way, just return the service
         return $builder->get($serviceId);
     }

src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php

@@ -100,6 +100,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());
     }
 

src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php

@@ -292,6 +292,10 @@ private function processAnonymousServices(\DOMDocument $xml, $file)
                 if ($services = $this->getChildren($node, 'service')) {
                     $definitions[$id] = array($services[0], $file, false);
                     $services[0]->setAttribute('id', $id);
+
+                    // anonymous services are always private
+                    // we could not use the constant false here, because of XML parsing
+                    $services[0]->setAttribute('public', 'false');
                 }
             }
         }
@@ -309,10 +313,6 @@ private function processAnonymousServices(\DOMDocument $xml, $file)
         // resolve definitions
         krsort($definitions);
         foreach ($definitions as $id => list($domElement, $file, $wild)) {
-            // anonymous services are always private
-            // we could not use the constant false here, because of XML parsing
-            $domElement->setAttribute('public', 'false');
-
             if (null !== $definition = $this->parseDefinition($domElement, $file)) {
                 $this->container->setDefinition($id, $definition);
             }

src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php

@@ -200,7 +200,7 @@ public function testLoadAnonymousServices()
             $service = $container->getDefinition($id);
         }
         $this->assertEquals('BizClass', $service->getClass(), '->load() uses the same configuration as for the anonymous ones');
-        $this->assertFalse($service->isPublic());
+        $this->assertTrue($service->isPublic());
 
         // anonymous services are shared when using decoration definitions
         $container->compile();

src/Symfony/Component/DependencyInjection/composer.json

@@ -26,6 +26,7 @@
     "suggest": {
         "symfony/yaml": "",
         "symfony/config": "",
+        "symfony/expression-language": "For using expressions in service container configuration",
         "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them"
     },
     "autoload": {

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.
 

src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php

@@ -26,7 +26,7 @@ class AnonymousToken extends AbstractToken
      * Constructor.
      *
      * @param string          $secret A secret used to make sure the token is created by the app and not by a malicious client
-     * @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($secret, $user, array $roles = array())

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