8000 Merge branch '2.7' into 2.8 · symfony/symfony@766393d · GitHub
[go: up one dir, main page]
Skip to content

Commit 766393d

Browse files
fabpotfabpot
committed
Merge branch '2.7' into 2.8
* 2.7: [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 [DependencyInjection] Suggest ExpressionLanguage in composer.json
2 parents 8ca614d + b9b68f7 commit 766393d

File tree

7 files changed

+12
-3
lines changed

7 files changed

+12
-3
lines changed

‎src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/ContainerBuilderTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ public function testCreateProxyServiceWithRuntimeInstantiator()
3333
$builder->register('foo1', 'ProxyManagerBridgeFooClass')->setFile(__DIR__.'/Fixtures/includes/foo.php');
3434
$builder->getDefinition('foo1')->setLazy(true);
3535

36+
$builder->compile();
37+
3638
/* @var $foo1 \ProxyManager\Proxy\LazyLoadingInterface|\ProxyManager\Proxy\ValueHolderInterface */
3739
$foo1 = $builder->get('foo1');
3840

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,10 @@ protected function resolveServiceDefinition(ContainerBuilder $builder, $serviceI
274274
return $builder->getAlias($serviceId);
275275
}
276276

277+
if ('service_container' === $serviceId) {
278+
return $builder;
279+
}
280+
277281
// the service has been injected in some special way, just return the service
278282
return $builder->get($serviceId);
279283
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ public function testToolbarConfig($toolbarEnabled, $interceptRedirects, $listene
100100
$this->assertSame($listenerEnabled, $this->container->get('web_profiler.debug_toolbar')->isEnabled());
101101
}
102102

103+
$this->assertSame($enabled, $this->container->get('web_profiler.debug_toolbar')->isEnabled());
104+
103105
$this->assertSaneContainer($this->getDumpedContainer());
104106
}
105107

‎src/Symfony/Component/DependencyInjection/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"suggest": {
3030
"symfony/yaml": "",
3131
"symfony/config": "",
32+
"symfony/expression-language": "For using expressions in service container configuration",
3233
"symfony/proxy-manager-bridge": "Generate service proxies to lazy load them"
3334
},
3435
"autoload": {

‎src/Symfony/Component/OptionsResolver/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
OptionsResolver Component
22
=========================
33

4-
The OptionsResolver component is `array_replace on steroids. It allows you to
4+
The OptionsResolver component is `array_replace` on steroids. It allows you to
55
create an options system with required options, defaults, validation (type,
66
value), normalization and more.
77

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class AnonymousToken extends AbstractToken
2626
* Constructor.
2727
*
2828
* @param string $secret A secret used to make sure the token is created by the app and not by a malicious client
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.
3030
* @param RoleInterface[] $roles An array of roles
3131
*/
3232
public function __construct($secret, $user, array $roles = array())

‎src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class PreAuthenticatedToken extends AbstractToken
2626
/**
2727
* Constructor.
2828
*
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.
3030
* @param mixed $credentials The user credentials
3131
* @param string $providerKey The provider key
3232
* @param RoleInterface[]|string[] $roles An array of roles

0 commit comments

Comments
 (0)
0