Skip to content

Commit

Permalink
Merge pull request Sylius#7370 from pamil/parameters-resolver
Browse files Browse the repository at this point in the history 
Improve ParametersParser
  • Loading branch information
@michalmarcinkowski
michalmarcinkowski committed Jan 31, 2017
2 parents b703c99 + fe8c96d commit 6d004bc
Show file tree
Hide file tree
Showing 2 changed files with 86 additions and 144 deletions.
8 changes: 8 additions & 0 deletions src/Sylius/Bundle/ResourceBundle/Controller/ParametersParser.php
View file
Expand Up @@ -85,6 +85,14 @@ private function parseRequestValueExpression($expression, Request $request)
$expression = preg_replace_callback('/(\$\w+)/', function ($matches) use ($request) {
$variable = $request->get(substr($matches[1], 1));

if (is_array($variable) || is_object($variable)) {
throw new \InvalidArgumentException(sprintf(
'Cannot use %s ($%s) as parameter in expression.',
gettype($variable),
$matches[1]
));
}

return is_string($variable) ? sprintf('"%s"', $variable) : $variable;
}, $expression);

Expand Down
222 changes: 78 additions & 144 deletions src/Sylius/Bundle/ResourceBundle/spec/Controller/ParametersParserSpec.php
View file
Expand Up @@ -12,9 +12,8 @@
namespace spec\Sylius\Bundle\ResourceBundle\Controller;

use PhpSpec\ObjectBehavior;
use Sylius\Bundle\ResourceBundle\Controller\ParametersParser;
use Sylius\Bundle\ResourceBundle\Controller\ParametersParserInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\DependencyInjection\Container;
use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
use Symfony\Component\HttpFoundation\Request;

Expand All @@ -25,165 +24,100 @@
*/
final class ParametersParserSpec extends ObjectBehavior
{
function let(ContainerInterface $container, ExpressionLanguage $expression)
function let()
{
$this->beConstructedWith($container, $expression);
$this->beConstructedWith(new Container(), new ExpressionLanguage());
}

function it_implements_parameters_parser_interface()
{
$this->shouldImplement(ParametersParserInterface::class);
}

function it_should_parse_parameters(Request $request)
function it_parses_string_parameters()
{
$request->get('criteria')->willReturn('New criteria');
$request->get('sorting')->willReturn('New sorting');

$this->parseRequestValues(
[
'criteria' => '$criteria',
'sortable' => '$sorting',
],
$request
)->shouldReturn(
[
'criteria' => 'New criteria',
'sortable' => 'New sorting',
]
);
$request = new Request();
$request->request->set('string', 'Lorem ipsum');

$this
->parseRequestValues(['nested' => ['string' => '$string']], $request)
->shouldReturn(['nested' => ['string' => 'Lorem ipsum']])
;
}

function it_parses_boolean_parameters()
{
$request = new Request();
$request->request->set('boolean', true);

$this
->parseRequestValues(['nested' => ['boolean' => '$boolean']], $request)
->shouldReturn(['nested' => ['boolean' => true]])
;
}

function it_parses_array_parameters()
{
$request = new Request();
$request->request->set('array', ['foo' => 'bar']);

$this
->parseRequestValues(['nested' => ['array' => '$array']], $request)
->shouldReturn(['nested' => ['array' => ['foo' => 'bar']]])
;
}

function it_parses_expressions()
{
$request = new Request();

$this
->parseRequestValues(['nested' => ['boolean' => 'expr:"foo" in ["foo", "bar"]']], $request)
->shouldReturn(['nested' => ['boolean' => true]])
;
}

function it_should_parse_complex_parameters(Request $request)
function it_parses_expressions_with_string_parameters()
{
$request->get('enable')->willReturn(true);
$request->get('sorting')->willReturn('New sorting');

$this->parseRequestValues(
[
'criteria' => [
'enable' => '$enable',
],
'sortable' => '$sorting',
],
$request
)->shouldReturn(
[
'criteria' => [
'enable' => true,
],
'sortable' => 'New sorting',
]
);
$request = new Request();
$request->request->set('string', 'lorem ipsum');

$this
->parseRequestValues(['expression' => 'expr:$string === "lorem ipsum"'], $request)
->shouldReturn(['expression' => true])
;
}

function it_should_parse_expression_with_parameters(
ContainerInterface $container,
ExpressionLanguage $expression,
Request $request
) {
$request->get('foo')->willReturn('bar');
$request->get('baz')->willReturn(1);

$expression->evaluate('service("demo_service")', ['container' => $container])->willReturn('demo_object');

$this->parseRequestValues(
[
'factory' => [
'method' => 'createByParameter',
'arguments' => [
'expr:service("demo_service")',
],
],
],
$request
)->shouldReturn(
[
'factory' => [
'method' => 'createByParameter',
'arguments' => [
'demo_object',
],
],
]
);

$expression
->evaluate('service("demo_service")->getWith("bar")', ['container' => $container])
->willReturn('demo_object->getWith("bar")')
;

$this->parseRequestValues(
[
'factory' => [
'method' => 'createByParameter',
'arguments' => [
'expr:service("demo_service")->getWith($foo)',
],
],
],
$request
)->shouldReturn(
[
'factory' => [
'method' => 'createByParameter',
'arguments' => [
'demo_object->getWith("bar")',
],
],
]
);

$expression
->evaluate('service("demo_service")->getWith("bar", 1)', ['container' => $container])
->willReturn('demo_object->getWith("bar", 1)')
function it_parses_expressions_with_scalar_parameters()
{
$request = new Request();
$request->request->set('number', 6);

$this
->parseRequestValues(['expression' => 'expr:$number === 6'], $request)
->shouldReturn(['expression' => true])
;
}

function it_throws_an_exception_if_array_parameter_is_injected_into_expression()
{
$request = new Request();
$request->request->set('array', ['foo', 'bar']);

$this->parseRequestValues(
[
'factory' => [
'method' => 'createByParameter',
'arguments' => [
'expr:service("demo_service")->getWith($foo, $baz)',
],
],
],
$request
)->shouldReturn(
[
'factory' => [
'method' => 'createByParameter',
'arguments' => [
'demo_object->getWith("bar", 1)',
],
],
]
);

$expression
->evaluate('service("demo_service")->getWith("bar")->andGet(1)', ['container' => $container])
->willReturn('demo_object->getWith("bar")->andGet(1)')
$this
->shouldThrow(\InvalidArgumentException::class)
->during('parseRequestValues', [['expression' => 'expr:"foo" in $array'], $request])
;
}

$this->parseRequestValues(
[
'factory' => [
'method' => 'createByParameter',
'arguments' => [
'expr:service("demo_service")->getWith($foo)->andGet($baz)',
],
],
],
$request
)->shouldReturn(
[
'factory' => [
'method' => 'createByParameter',
'arguments' => [
'demo_object->getWith("bar")->andGet(1)',
],
],
]
);
function it_throws_an_exception_if_object_parameter_is_injected_into_expression()
{
$request = new Request();
$request->request->set('object', new \stdClass());

$this
->shouldThrow(\InvalidArgumentException::class)
->during('parseRequestValues', [['expression' => 'expr:$object.callMethod()'], $request])
;
}
}

0 comments on commit 6d004bc

Please sign in to comment.