Skip to content

Extracting the argument resolving from the ControllerResolver #18187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

Extracting the argument resolving from the ControllerResolver #18187

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c0331a0
Extracting arg resolving from ControllerResolver
Mar 16, 2016
a57d6ae
FrameworkBundle now requires http-kernel 3.1 or higher
Mar 16, 2016
4c997f5
Fixed the authors
Mar 16, 2016
70c6341
Fixed a failing test due to partial mocking
Mar 16, 2016
b3ed1f0
Updated changelog/upgrade files
Mar 24, 2016
750dae9
Improved the BC layer
Mar 31, 2016
c20eb4b
Fixed the BC layer in HttpKernel
Mar 31, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fixed the BC layer in HttpKernel
  • Loading branch information
Iltar van der Berg committed Mar 31, 2016
commit c20eb4bf521c3c7ec8f1f658b8f20852c4d688c9
9 changes: 4 additions & 5 deletions src/Symfony/Component/HttpKernel/HttpKernel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,13 @@ public function __construct(EventDispatcherInterface $dispatcher, ControllerReso
$this->dispatcher = $dispatcher;
$this->resolver = $resolver;
$this->requestStack = $requestStack ?: new RequestStack();
$this->argumentResolver = $argumentResolver;

if (null === $argumentResolver) {
if (null === $this->argumentResolver) {
@trigger_error(sprintf('As of 3.1 an %s is used to resolve arguments. In 4.0 the $argumentResolver becomes mandatory and the %s can no longer be used to resolve arguments.', ArgumentResolverInterface::class, ControllerResolverInterface::class), E_USER_DEPRECATED);
// fallback in case of deprecations
$argumentResolver = $resolver instanceof ArgumentResolverInterface ? $resolver : new ArgumentResolver();
$this->argumentResolver = $resolver;
}

$this->argumentResolver = $argumentResolver;

}

/**
Expand Down