Merge branch '3.0'

* 3.0:
  #17676 - making the proxy instantiation compatible with ProxyManager 2.x by detecting proxy features
  #17676 - making the proxy instantiation compatible with ProxyManager 2.x by detecting proxy features
  Fix bug when using an private aliased factory service
  [Form] fix tests added by #17798 by removing `choices_as_values`
  [Form] fix FQCN in tests added by #17798
  [DependencyInjection] Remove unused parameter of private property
  bug #17798 [Form] allow `choice_label` option to be `false`
  [Form] fix tests added by #17760 with FQCN
  ChoiceFormField of type "select" could be "disabled"
  Update contributing docs
  [Console] Fix escaping of trailing backslashes
  Fix constraint validator alias being required
  [DependencyInjection] Simplified code in AutowirePass
  [ci] clone with depth=1 to kill push-forced PRs
  Add check on If-Range header

Author: fabpot

Compiler/AutowirePass.php

@@ -148,45 +148,17 @@ private function populateAvailableType($id, Definition $definition)
             $this->types[$type] = $id;
         }
 
-        // Cannot use reflection if the class isn't set
-        if (!$definition->getClass()) {
+        if (!$reflectionClass = $this->getReflectionClass($id, $definition)) {
             return;
         }
 
-        if ($reflectionClass = $this->getReflectionClass($id, $definition)) {
-            $this->extractInterfaces($id, $reflectionClass);
-            $this->extractAncestors($id, $reflectionClass);
-        }
-    }
-
-    /**
-     * Extracts the list of all interfaces implemented by a class.
-     *
-     * @param string           $id
-     * @param \ReflectionClass $reflectionClass
-     */
-    private function extractInterfaces($id, \ReflectionClass $reflectionClass)
-    {
-        foreach ($reflectionClass->getInterfaces() as $interfaceName => $reflectionInterface) {
-            $this->set($interfaceName, $id);
-
-            $this->extractInterfaces($id, $reflectionInterface);
+        foreach ($reflectionClass->getInterfaces() as $reflectionInterface) {
+            $this->set($reflectionInterface->name, $id);
         }
-    }
-
-    /**
-     * Extracts all inherited types of a class.
-     *
-     * @param string           $id
-     * @param \ReflectionClass $reflectionClass
-     */
-    private function extractAncestors($id, \ReflectionClass $reflectionClass)
-    {
-        $this->set($reflectionClass->name, $id);
 
-        if ($reflectionParentClass = $reflectionClass->getParentClass()) {
-            $this->extractAncestors($id, $reflectionParentClass);
-        }
+        do {
+            $this->set($reflectionClass->name, $id);
+        } while ($reflectionClass = $reflectionClass->getParentClass());
     }
 
     /**
@@ -272,6 +244,7 @@ private function getReflectionClass($id, Definition $definition)
             return $this->reflectionClasses[$id];
         }
 
+        // Cannot use reflection if the class isn't set
         if (!$class = $definition->getClass()) {
             return;
         }

Dumper/PhpDumper.php

@@ -315,7 +315,7 @@ private function addServiceInlinedDefinitions($id, $definition)
                     throw new ServiceCircularReferenceException($id, array($id));
                 }
 
-                $code .= $this->addNewInstance($id, $sDefinition, '$'.$name, ' = ');
+                $code .= $this->addNewInstance($sDefinition, '$'.$name, ' = ');
 
                 if (!$this->hasReference($id, $sDefinition->getMethodCalls(), true) && !$this->hasReference($id, $sDefinition->getProperties(), true)) {
                     $code .= $this->addServiceMethodCalls(null, $sDefinition, $name);
@@ -389,7 +389,7 @@ private function addServiceInstance($id, $definition)
             $instantiation .= ' = ';
         }
 
-        $code = $this->addNewInstance($id, $definition, $return, $instantiation);
+        $code = $this->addNewInstance($definition, $return, $instantiation);
 
         if (!$simple) {
             $code .= "\n";
@@ -676,7 +676,7 @@ private function addServices()
         return $publicServices.$privateServices;
     }
 
-    private function addNewInstance($id, Definition $definition, $return, $instantiation)
+    private function addNewInstance(Definition $definition, $return, $instantiation)
     {
         $class = $this->dumpValue($definition->getClass());
 

Tests/Compiler/AutowirePassTest.php

@@ -61,9 +61,10 @@ public function testProcessAutowireInterface()
         $pass = new AutowirePass();
         $pass->process($container);
 
-        $this->assertCount(2, $container->getDefinition('g')->getArguments());
+        $this->assertCount(3, $container->getDefinition('g')->getArguments());
         $this->assertEquals('f', (string) $container->getDefinition('g')->getArgument(0));
         $this->assertEquals('f', (string) $container->getDefinition('g')->getArgument(1));
+        $this->assertEquals('f', (string) $container->getDefinition('g')->getArgument(2));
     }
 
     public function testCompleteExistingDefinition()
@@ -332,13 +333,21 @@ interface EInterface extends DInterface
 {
 }
 
-class F implements EInterface
+interface IInterface
+{
+}
+
+class I implements IInterface
+{
+}
+
+class F extends I implements EInterface
 {
 }
 
 class G
 {
-    public function __construct(DInterface $d, EInterface $e)
+    public function __construct(DInterface $d, EInterface $e, IInterface $i)
     {
     }
 }

Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php

@@ -16,6 +16,8 @@
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 
+require_once __DIR__.'/../Fixtures/includes/foo.php';
+
 class ReplaceAliasByActualDefinitionPassTest extends \PHPUnit_Framework_TestCase
 {
     public function testProcess()
@@ -46,6 +48,26 @@ public function testProcess()
         $this->assertSame('b_alias', (string) $resolvedFactory[0]);
     }
 
+    /**
+     * @group legacy
+     */
+    public function testPrivateAliasesInFactory()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('a', 'FooClass');
+        $container->register('b', 'FooClass')
+            ->setFactoryService('a')
+            ->setFactoryMethod('getInstance');
+
+        $container->register('c', 'stdClass')->setPublic(false);
+        $container->setAlias('c_alias', 'c');
+
+        $this->process($container);
+
+        $this->assertInstanceOf('FooClass', $container->get('b'));
+    }
+
     /**
      * @expectedException \InvalidArgumentException
      */