Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions ArgumentValidator.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\ExpressionLanguage;
use Symfony\Component\DependencyInjection\Parameter;
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\ExpressionLanguage\Expression;
use Symfony\Component\ExpressionLanguage\SyntaxError;
Expand Down Expand Up @@ -41,6 +42,10 @@ public function validate(\ReflectionParameter $parameter, $argument)

private function validateArrayArgument($argument)
{
if ($argument instanceof Parameter) {
$argument = $this->containerBuilder->getParameter($argument);
}

if (!is_array($argument)) {
throw new TypeHintMismatchException(sprintf(
'Argument of type "%s" should have been an array',
Expand Down
5 changes: 5 additions & 0 deletions ResultingClassResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\Parameter;

class ResultingClassResolver implements ResultingClassResolverInterface
{
Expand All @@ -18,6 +19,10 @@ public function resolve(Definition $definition)
{
$class = $definition->getClass();

if ($class instanceof Parameter) {
$class = $this->containerBuilder->getParameter($class);
}

return $this->resolvePlaceholders($class);
}

Expand Down
6 changes: 5 additions & 1 deletion Tests/ResultingClassResolverTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use Matthias\SymfonyServiceDefinitionValidator\ResultingClassResolver;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\Parameter;

class ResultingClassResolverTest extends \PHPUnit_Framework_TestCase
{
Expand All @@ -21,13 +22,16 @@ public function testResolvesClassOfDefinition()
{
$containerBuilder = new ContainerBuilder();
$containerBuilder->setParameter('definition.class', 'stdClass');
$containerBuilder->setParameter('definition2.class', 'stdClass');

$resolver = new ResultingClassResolver($containerBuilder);

$definition = new Definition('%definition.class%');

$resolvedClass = $resolver->resolve($definition);
$this->assertSame('stdClass', $resolvedClass);

$definition2 = new Definition(new Parameter('definition2.class'));
$resolvedClass = $resolver->resolve($definition2);
$this->assertSame('stdClass', $resolvedClass);
}
}