Fix @fabpot and @stof comments.

symfony · dunglas · Aug 24, 2015 · Aug 25, 2015 · Aug 25, 2015 · Aug 25, 2015
commit 3b7f5538643a5b25e8e5c4060a50826fc34d59f9
@@ -59,18 +59,19 @@ public function process(ContainerBuilder $container)
      */
     private function completeDefinition($id, Definition $definition)
     {
-        if (!($reflectionClass = $this->getReflectionClass($id, $definition))) {
+        if (!$reflectionClass = $this->getReflectionClass($id, $definition)) {
             return;
         }
+
         $this->container->addClassResource($reflectionClass);
 
-        if (!($constructor = $reflectionClass->getConstructor())) {
+        if (!$constructor = $reflectionClass->getConstructor()) {
             return;
         }
 
         $arguments = $definition->getArguments();
         foreach ($constructor->getParameters() as $index => $parameter) {
-            if (!($typeHint = $parameter->getClass())) {
+            if (!$typeHint = $parameter->getClass()) {
                 continue;
             }
 
@@ -243,6 +244,10 @@ private function getReflectionClass($id, Definition $definition)
 
         $class = $this->container->getParameterBag()->resolveValue($class);
 
-        return $this->reflectionClasses[$id] = new \ReflectionClass($class);
+        try {
+            return $this->reflectionClasses[$id] = new \ReflectionClass($class);
+        } catch (\ReflectionException $reflectionException) {
+            // return null
+        }
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -828,7 +828,7 @@ public function getConfigurator()
      *
      * @return Definition The current instance
      */
-    public function setTypes(array $types)
+    public function setAutowiringTypes(array $types)
     {
         $this->autowiringTypes = array();
 

diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -304,16 +304,20 @@ private function parseDefinition($id, $service, $file)
         }
 
         if (isset($service['autowiring_types'])) {
-            if (!is_array($service['autowiring_types'])) {
-                throw new InvalidArgumentException(sprintf('Parameter "autowiring_types" must be an array for service "%s" in %s. Check your YAML syntax.', $id, $file));
-            }
-
-            foreach ($service['autowiring_types'] as $autowiringType) {
-                if (!is_string($autowiringType)) {
-                    throw new InvalidArgumentException(sprintf('A "autowiring_types" attribute must be of type string for service "%s" in %s. Check your YAML syntax.', $id, $file));
+            if (is_string($service['autowiring_types'])) {
+                $definition->addAutowiringType($service['autowiring_types']);
+            } else {
+                if (!is_array($service['autowiring_types'])) {
+                    throw new InvalidArgumentException(sprintf('Parameter "autowiring_types" must be a string or an array for service "%s" in %s. Check your YAML syntax.', $id, $file));
                 }
 
-                $definition->addAutowiringType($autowiringType);
+                foreach ($service['autowiring_types'] as $autowiringType) {
+                    if (!is_string($autowiringType)) {
+                        throw new InvalidArgumentException(sprintf('A "autowiring_types" attribute must be of type string for service "%s" in %s. Check your YAML syntax.', $id, $file));
+                    }
+
+                    $definition->addAutowiringType($autowiringType);
+                }
             }
         }
 

diff --git a/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php b/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
@@ -408,7 +408,7 @@ public function testTypes()
         $def = new Definition('stdClass');
 
         $this->assertEquals(array(), $def->getAutowiringTypes());
-        $this->assertSame($def, $def->setTypes(array('Foo')));
+        $this->assertSame($def, $def->setAutowiringTypes(array('Foo')));
         $this->assertEquals(array('Foo'), $def->getAutowiringTypes());
         $this->assertSame($def, $def->addAutowiringType('Bar'));
         $this->assertTrue($def->hasAutowiringType('Bar'));

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/bad_types1.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/bad_types1.yml
@@ -2,4 +2,4 @@ services:
     foo_service:
         class:            FooClass
         # types is not an array
-        autowiring_types: string
+        autowiring_types: 1
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services22.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services22.yml
@@ -2,3 +2,7 @@ services:
     foo_service:
         class:            FooClass
         autowiring_types: [ Foo, Bar ]
+
+    baz_service:
+        class:            Baz
+        autowiring_types: Foo
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
@@ -308,6 +308,7 @@ public function testTypes()
         $loader->load('services22.yml');
 
         $this->assertEquals(array('Foo', 'Bar'), $container->getDefinition('foo_service')->getAutowiringTypes());
+        $this->assertEquals(array('Foo'), $container->getDefinition('baz_service')->getAutowiringTypes());
     }
 
     public function testAutowire()