Skip to content

Added an ArgumentResolver with clean extension point #18308

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 5 commits into from
Apr 3, 2016
Merged

Added an ArgumentResolver with clean extension point #18308

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
360fc5f
Extracting arg resolving from ControllerResolver
Mar 16, 2016
cfcf764
Added an ArgumentResolver with clean extension point
Mar 25, 2016
cee5106
cs fixes
HeahDude Apr 1, 2016
f29bf4c
Refactor ArgumentResolverTest
HeahDude Apr 1, 2016
1bf80c9
Improved DX for the ArgumentResolver
Apr 1, 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
Next Next commit
Refactor ArgumentResolverTest
  • Loading branch information
@HeahDude
HeahDude authored and Iltar van der Berg committed Apr 1, 2016
commit f29bf4cd4a58e46827a1076056b502ad28398f77
128 changes: 79 additions & 49 deletions src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@

class ArgumentResolverTest extends \PHPUnit_Framework_TestCase
{
public function testGetArguments()
/** @var ArgumentResolver */
private static $resolver;

public static function setUpBeforeClass()
{
$factory = new ArgumentMetadataFactory();
$argumentValueResolvers = array(
Expand All @@ -33,85 +36,121 @@ public function testGetArguments()
new DefaultArgumentValueResolver(),
);

$resolver = new ArgumentResolver($factory, $argumentValueResolvers);
self::$resolver = new ArgumentResolver($factory, $argumentValueResolvers);
}

public function testGetArguments()
{
$request = Request::create('/');
$controller = array(new self(), 'testGetArguments');
$this->assertEquals(array(), $resolver->getArguments($request, $controller), '->getArguments() returns an empty array if the method takes no arguments');
$request->attributes->set('foo', 'foo');
$controller = array(new self(), 'controllerWithFoo');

$this->assertEquals(array('foo'), self::$resolver->getArguments($request, $controller), '->getArguments() returns an array of arguments for the controller method');
}

public function testGetArgumentsReturnsEmptyArrayWhenNoArguments()
{
$request = Request::create('/');
$request->attributes->set('foo', 'foo');
$controller = array(new self(), 'controllerMethod1');
$this->assertEquals(array('foo'), $resolver->getArguments($request, $controller), '->getArguments() returns an array of arguments for the controller method');
$controller = array(new self(), 'controllerWithoutArguments');

$this->assertEquals(array(), self::$resolver->getArguments($request, $controller), '->getArguments() returns an empty array if the method takes no arguments');
}

public function testGetArgumentsUsesDefaultValue()
{
$request = Request::create('/');
$request->attributes->set('foo', 'foo');
$controller = array(new self(), 'controllerMethod2');
$this->assertEquals(array('foo', null), $resolver->getArguments($request, $controller), '->getArguments() uses default values if present');
$controller = array(new self(), 'controllerWithFooAndDefaultBar');

$this->assertEquals(array('foo', null), self::$resolver->getArguments($request, $controller), '->getArguments() uses default values if present');
}

public function testGetArgumentsOverrideDefaultValueByRequestAttribute()
{
$request = Request::create('/');
$request->attributes->set('foo', 'foo');
$request->attributes->set('bar', 'bar');
$this->assertEquals(array('foo', 'bar'), $resolver->getArguments($request, $controller), '->getArguments() overrides default values if provided in the request attributes');
$controller = array(new self(), 'controllerWithFooAndDefaultBar');

$this->assertEquals(array('foo', 'bar'), self::$resolver->getArguments($request, $controller), '->getArguments() overrides default values if provided in the request attributes');
}

public function testGetArgumentsFromClosure()
{
$request = Request::create('/');
$request->attributes->set('foo', 'foo');
$controller = function ($foo) {};
$this->assertEquals(array('foo'), $resolver->getArguments($request, $controller));

$this->assertEquals(array('foo'), self::$resolver->getArguments($request, $controller));
}

public function testGetArgumentsUsesDefaultValueFromClosure()
{
$request = Request::create('/');
$request->attributes->set('foo', 'foo');
$controller = function ($foo, $bar = 'bar') {};
$this->assertEquals(array('foo', 'bar'), $resolver->getArguments($request, $controller));

$this->assertEquals(array('foo', 'bar'), self::$resolver->getArguments($request, $controller));
}

public function testGetArgumentsFromInvokableObject()
{
$request = Request::create('/');
$request->attributes->set('foo', 'foo');
$controller = new self();
$this->assertEquals(array('foo', null), $resolver->getArguments($request, $controller));

$this->assertEquals(array('foo', null), self::$resolver->getArguments($request, $controller));

// Test default bar overridden by request attribute
$request->attributes->set('bar', 'bar');
$this->assertEquals(array('foo', 'bar'), $resolver->getArguments($request, $controller));

$this->assertEquals(array('foo', 'bar'), self::$resolver->getArguments($request, $controller));
}

public function testGetArgumentsFromFunctionName()
{
$request = Request::create('/');
$request->attributes->set('foo', 'foo');
$request->attributes->set('foobar', 'foobar');
$controller = 'Symfony\Component\HttpKernel\Tests\Controller\argument_resolver_controller_function';
$this->assertEquals(array('foo', 'foobar'), $resolver->getArguments($request, $controller));
$controller = __NAMESPACE__.'\controller_function';

$this->assertEquals(array('foo', 'foobar'), self::$resolver->getArguments($request, $controller));
}

public function testGetArgumentsFailsOnUnresolvedValue()
{
$request = Request::create('/');
$request->attributes->set('foo', 'foo');
$request->attributes->set('foobar', 'foobar');
$controller = array(new self(), 'controllerMethod3');
$controller = array(new self(), 'controllerWithFooBarFoobar');

try {
$resolver->getArguments($request, $controller);
self::$resolver->getArguments($request, $controller);
$this->fail('->getArguments() throws a \RuntimeException exception if it cannot determine the argument value');
} catch (\Exception $e) {
$this->assertInstanceOf('\RuntimeException', $e, '->getArguments() throws a \RuntimeException exception if it cannot determine the argument value');
}
}

public function testGetArgumentsInjectsRequest()
{
$request = Request::create('/');
$controller = array(new self(), 'controllerMethod5');
$this->assertEquals(array($request), $resolver->getArguments($request, $controller), '->getArguments() injects the request');
$controller = array(new self(), 'controllerWithRequest');

$this->assertEquals(array($request), self::$resolver->getArguments($request, $controller), '->getArguments() injects the request');
}

/**
* @requires PHP 5.6
*/
public function testGetVariadicArguments()
{
$factory = new ArgumentMetadataFactory();
$argumentValueResolvers = array(
new ArgumentFromAttributeResolver(),
new VariadicArgumentValueResolver(),
new RequestResolver(),
new DefaultArgumentValueResolver(),
);

$resolver = new ArgumentResolver($factory, $argumentValueResolvers);

$request = Request::create('/');
$request->attributes->set('foo', 'foo');
$request->attributes->set('bar', array('foo', 'bar'));
$controller = array(new VariadicController(), 'action');
$this->assertEquals(array('foo', 'foo', 'bar'), $resolver->getArguments($request, $controller));

$this->assertEquals(array('foo', 'foo', 'bar'), self::$resolver->getArguments($request, $controller));
}

/**
Expand All @@ -120,21 +159,12 @@ public function testGetVariadicArguments()
*/
public function testGetVariadicArgumentsWithoutArrayInRequest()
{
$factory = new ArgumentMetadataFactory();
$argumentValueResolvers = array(
new ArgumentFromAttributeResolver(),
new VariadicArgumentValueResolver(),
new RequestResolver(),
new DefaultArgumentValueResolver(),
);

$resolver = new ArgumentResolver($factory, $argumentValueResolvers);

$request = Request::create('/');
$request->attributes->set('foo', 'foo');
$request->attributes->set('bar', 'foo');
$controller = array(new VariadicController(), 'action');
$resolver->getArguments($request, $controller);

self::$resolver->getArguments($request, $controller);
}

/**
Expand All @@ -153,35 +183,35 @@ public function testGetArgumentWithoutArray()
$request = Request::create('/');
$request->attributes->set('foo', 'foo');
$request->attributes->set('bar', 'foo');
$controller = array($this, 'controllerMethod2');
$controller = array($this, 'controllerWithFooAndDefaultBar');
$resolver->getArguments($request, $controller);
}

public function __invoke($foo, $bar = null)
{
}

public function controllerMethod1($foo)
public function controllerWithFoo($foo)
{
}

protected function controllerMethod2($foo, $bar = null)
public function controllerWithoutArguments()
{
}

protected function controllerMethod3($foo, $bar, $foobar)
protected function controllerWithFooAndDefaultBar($foo, $bar = null)
{
}

protected static function controllerMethod4()
protected function controllerWithFooBarFoobar($foo, $bar, $foobar)
{
}

protected function controllerMethod5(Request $request)
protected function controllerWithRequest(Request $request)
{
}
}

function argument_resolver_controller_function($foo, $foobar)
function controller_function($foo, $foobar)
{
}
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