[FrameworkBundle] Add default pool & system adapter

Author: nicolas-grekas

Compiler/ResolveDefinitionTemplatesPass.php

@@ -15,7 +15,6 @@
 use Symfony\Component\DependencyInjection\DefinitionDecorator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
-use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 
 /**
  * This replaces all DefinitionDecorator instances with their equivalent fully
@@ -97,12 +96,11 @@ private function resolveArguments(ContainerBuilder $container, array $arguments,
      */
     private function resolveDefinition(ContainerBuilder $container, DefinitionDecorator $definition)
     {
-        try {
-            $parentDef = $container->findDefinition($parent = $definition->getParent());
-        } catch (ServiceNotFoundException $e) {
+        if (!$container->has($parent = $definition->getParent())) {
             throw new RuntimeException(sprintf('The parent definition "%s" defined for definition "%s" does not exist.', $parent, $this->currentId));
         }
 
+        $parentDef = $container->findDefinition($parent);
         if ($parentDef instanceof DefinitionDecorator) {
             $id = $this->currentId;
             $this->currentId = $parent;

Tests/Compiler/ResolveDefinitionTemplatesPassTest.php

@@ -309,6 +309,20 @@ public function testProcessMergeAutowiringTypes()
         $this->assertEquals(array('Foo', 'Bar'), $def->getAutowiringTypes());
     }
 
+    public function testProcessResolvesAliases()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'ParentClass');
+        $container->setAlias('parent_alias', 'parent');
+        $container->setDefinition('child', new DefinitionDecorator('parent_alias'));
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertSame('ParentClass', $def->getClass());
+    }
+
     protected function process(ContainerBuilder $container)
     {
         $pass = new ResolveDefinitionTemplatesPass();