bug #21794 [DI] Fix ServiceLocatorArgument::setValues() for non-reference values (chalasr)

nicolas-grekas · nicolas-grekas · commit 7f012b685ab2 · 2017-02-28T13:08:10.000+01:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [DI] Fix ServiceLocatorArgument::setValues() for non-reference values | Q | A | ------------- | --- | Branch? | master | Fixed tickets | #21625 (comment) | Tests pass? | yes | License | MIT `ResolveInvalidReferencesPass` [calls `setValues()`](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php#L91) with resolved invalid reference (null), the `Reference` type check should occurs at construction only. Commits ------- 256b836 [DI] Fix ServiceLocatorArgument::setValues() for non-reference values
diff --git a/src/Symfony/Component/DependencyInjection/Argument/ServiceLocatorArgument.php b/src/Symfony/Component/DependencyInjection/Argument/ServiceLocatorArgument.php
@@ -39,7 +39,7 @@ public function getValues()
     public function setValues(array $values)
     {
         foreach ($values as $v) {
-            if (!$v instanceof Reference) {
+            if (!$v instanceof Reference && null !== $v) {
                 throw new InvalidArgumentException('Values of a ServiceLocatorArgument must be Reference objects.');
             }
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Argument/ServiceLocatorArgumentTest.php b/src/Symfony/Component/DependencyInjection/Tests/Argument/ServiceLocatorArgumentTest.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Argument;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
+use Symfony\Component\DependencyInjection\Reference;
+
+class ServiceLocatorArgumentTest extends TestCase
+{
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Values of a ServiceLocatorArgument must be Reference objects.
+     */
+    public function testThrowsOnNonReferenceValues()
+    {
+        new ServiceLocatorArgument(array('foo' => 'bar'));
+    }
+
+    public function testAcceptsReferencesOrNulls()
+    {
+        $locator = new ServiceLocatorArgument($values = array('foo' => new Reference('bar'), 'bar' => null));
+
+        $this->assertSame($values, $locator->getValues());
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function getValues()`
`39`	`39`	`public function setValues(array $values)`
`40`	`40`	`{`
`41`	`41`	`foreach ($values as $v) {`
`42`		`- if (!$v instanceof Reference) {`
	`42`	`+ if (!$v instanceof Reference && null !== $v) {`
`43`	`43`	`throw new InvalidArgumentException('Values of a ServiceLocatorArgument must be Reference objects.');`
`44`	`44`	`}`
`45`	`45`	`}`