8000 [HttpKernel] fix argument's error messages in ServiceValueResolver by nicolas-grekas · Pull Request #27687 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[HttpKernel] fix argument's error messages in ServiceValueResolver #27687

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

Merged
merged 1 commit into from
Jun 24, 2018
Merged

[HttpKernel] fix argument's error messages in ServiceValueResolver #27687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/ServiceValueResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public function resolve(Request $request, ArgumentMetadata $argument)
yield $this->container->get($controller)->get($argument->getName());
} catch (RuntimeException $e) {
$what = sprintf('argument $%s of "%s()"', $argument->getName(), $controller);
$message = preg_replace('/service "service_locator\.[^"]++"/', $what, $e->getMessage());
$message = preg_replace('/service "\.service_locator\.[^"]++"/', $what, $e->getMessage());

if ($e->getMessage() === $message) {
$message = sprintf('Cannot resolve %s: %s', $what, $message);
Expand Down
28 changes: 28 additions & 0 deletions ...mfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/ServiceValueResolverTest.php
View file D8FA
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@
namespace Symfony\Component\HttpKernel\Tests\Controller\ArgumentResolver;

use PHPUnit\Framework\TestCase;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\ServiceLocator;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Controller\ArgumentResolver\ServiceValueResolver;
use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
use Symfony\Component\HttpKernel\DependencyInjection\RegisterControllerArgumentLocatorsPass;

class ServiceValueResolverTest extends TestCase
{
Expand Down Expand Up @@ -85,6 +87,25 @@ public function testControllerNameIsAnArray()
$this->assertYieldEquals(array(new DummyService()), $resolver->resolve($request, $argument));
}

/**
* @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
* @expectedExceptionMessage Cannot autowire argument $dummy of "Symfony\Component\HttpKernel\Tests\Controller\ArgumentResolver\DummyController::index()": it references class "Symfony\Component\HttpKernel\Tests\Controller\ArgumentResolver\DummyService" but no such service exists.
*/
public function testErrorIsTruncated()
{
$container = new ContainerBuilder();
$container->addCompilerPass(new RegisterControllerArgumentLocatorsPass());

$container->register('argument_resolver.service', ServiceValueResolver::class)->addArgument(null)->setPublic(true);
$container->register(DummyController::class)->addTag('controller.service_arguments')->setPublic(true);

$container->compile();

$request = $this->requestWithAttributes(array('_controller' => array(DummyController::class, 'index')));
$argument = new ArgumentMetadata('dummy', DummyService::class, false, false, null);
$container->get('argument_resolver.service')->resolve($request, $argument)->current();
}

private function requestWithAttributes(array $attributes)
{
$request = Request::create('/');
Expand All @@ -110,3 +131,10 @@ private function assertYieldEquals(array $expected, \Generator $generator)
class DummyService
{
}

class DummyController
{
public function index(DummyService $dummy)
{
}
}
0