Skip to content

Commit a1d66c6

Browse files
wouterjwouterj
committed
Review
1 parent 434f92f commit a1d66c6

File tree

5 files changed

+21
-14
lines changed

5 files changed

+21
-14
lines changed

‎src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
<services>
5353

54-
<service id="security.argument_resolver.user" class="Symfony\Bundle\SecurityBundle\ArgumentResolver\UserArgumentResolver">
54+
<service id="security.argument_resolver.user"Controller class="Symfony\Bundle\SecurityBundle\ArgumentResolver\UserArgumentResolver">
5555
<tag name="kernel.argument_resolver" />
5656
</service>
5757

‎src/Symfony/Component/HttpKernel/Controller/ArgumentResolverManager.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,15 @@ class ArgumentResolverManager
2525
/**
2626
* @var ArgumentResolverInterface[]
2727
*/
28-
private $resolvers = array();
28+
private $resolvers;
29+
30+
/**
31+
* @param ArgumentResolverInterface[] $resolvers
32+
*/
33+
public function __construct(array $resolvers = array())
34+
{
35+
$this->resolvers = $resolvers;
36+
}
2937

3038
/**
3139
* Adds an argument resolver.

‎src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ class ControllerResolver implements ControllerResolverInterface
3333

3434
/**
3535
* @var ArgumentResolverManager
36-
* @internal
3736
*/
3837
private $argumentResolverManager;
3938

@@ -120,7 +119,7 @@ public function getArguments(Request $request, $controller)
120119

121120
$reflector = new \ReflectionMethod($this, 'doGetArguments');
122121
if ($reflector->getDeclaringClass()->getName() !== __CLASS__) {
123-
trigger_error('The ControllerResolverInterface::doGetArguments() method is deprecated since version 2.7 and will be removed in 3.0. Use the ArgumentResolverManager and custom ArgumentResolverInterface implementations instead.', E_USER_DEPRECATED);
122+
@trigger_error('The ControllerResolverInterface::doGetArguments() method is deprecated since version 2.8 and will be removed in 3.0. Use the ArgumentResolverManager and custom ArgumentResolverInterface implementations instead.', E_USER_DEPRECATED);
124123
}
125124

126125
return $this->doGetArguments($request, $controller, $r->getParameters());
@@ -173,9 +172,10 @@ protected function instantiateController($class)
173172
private function getArgumentResolverManager()
174173
{
175174
if (null === $this->argumentResolverManager) {
176-
$this->argumentResolverManager = new ArgumentResolverManager();
177-
$this->argumentResolverManager->add(new RequestArgumentResolver());
178-
$this->argumentResolverManager->add(new RequestAttributesArgumentResolver());
175+
$this->argumentResolverManager = new ArgumentResolverManager(array(
176+
new RequestArgumentResolver(),
177+
new RequestAttributesArgumentResolver(),
178+
));
179179
}
180180

181181
return $this->argumentResolverManager;

‎src/Symfony/Component/HttpKernel/HttpKernel.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,10 @@ public function __construct(EventDispatcherInterface $dispatcher, ControllerReso
5959
$this->requestStack = $requestStack ?: new RequestStack();
6060

6161
if (null === $argumentResolverManager) {
62-
$argumentResolverManager = new ArgumentResolverManager();
63-
$argumentResolverManager->add(new RequestArgumentResolver());
64-
$argumentResolverManager->add(new RequestAttributesArgumentResolver());
62+
$argumentResolverManager = new ArgumentResolverManager(array(
63+
new RequestArgumentResolver(),
64+
new RequestAttributesArgumentResolver(),
65+
));
6566
}
6667

6768
if (method_exists($resolver, 'setArgumentResolverManager')) {
@@ -157,7 +158,7 @@ private function handleRaw(Request $request, $type = self::MASTER_REQUEST)
157158
// controller arguments
158159
$reflector = new \ReflectionMethod($this->resolver, 'getArguments');
159160
if ($reflector->getDeclaringClass()->getName() !== 'Symfony\Component\HttpKernel\Controller\ControllerResolver') {
160-
trigger_error('['.$reflector->getDeclaringClass()->getName().'] The ControllerResolverInterface::getArguments() method is deprecated since version 2.8 and will be removed in 3.0. Use the ArgumentResolverManager and custom ArgumentResolverInterface implementations instead.', E_USER_DEPRECATED);
161+
@trigger_error('The ControllerResolverInterface::getArguments() method is deprecated since version 2.8 and will be removed in 3.0. Use the ArgumentResolverManager and custom ArgumentResolverInterface implementations instead.', E_USER_DEPRECATED);
161162
}
162163

163164
$arguments = $this->resolver->getArguments($request, $controller);

‎src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverManagerTest.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ public function setUp()
2525
$this->resolver1 = $this->getMock('Symfony\Component\HttpKernel\Controller\ArgumentResolver\ArgumentResolverInterface');
2626
$this->resolver2 = $this->getMock('Symfony\Component\HttpKernel\Controller\ArgumentResolver\ArgumentResolverInterface');
2727

28-
$this->manager = new ArgumentResolverManager();
29-
$this->manager->add($this->resolver1);
30-
$this->manager->add($this->resolver2);
28+
$this->manager = new ArgumentResolverManager(array($this->resolver1, $this->resolver2));
3129

3230
$this->request = $this->getMock('Symfony\Component\HttpFoundation\Request');
3331
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy