symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+4Lines changed: 4 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
+16Lines changed: 16 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
+16Lines changed: 16 additions & 0 deletions
@@ -83,6 +83,10 @@ public function process(ContainerBuilder $container)
      */
     private function completeDefinition($id, Definition $definition)
     {
+        if ($definition->getFactory() || $definition->getFactoryClass(false) || $definition->getFactoryService(false)) {
+            throw new RuntimeException(sprintf('Service "%s" can use either autowiring or a factory, not both.', $id));
+        }
+
         if (!$reflectionClass = $this->getReflectionClass($id, $definition)) {
             return;
         }
 
@@ -486,6 +486,22 @@ public function provideAutodiscoveredAutowiringOrder()
             array('CannotBeAutowiredReverseOrder'),
         );
     }
+
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
+     * @expectedExceptionMessage Service "a" can use either autowiring or a factory, not both.
+     */
+    public function testWithFactory()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('a', __NAMESPACE__.'\A')
+            ->setFactory('foo')
+            ->setAutowired(true);
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+    }
 }
 
 class Foo
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,10 @@ public function process(ContainerBuilder $container)`
`83`	`83`	`*/`
`84`	`84`	`private function completeDefinition($id, Definition $definition)`
`85`	`85`	`{`
	`86`	`+ if ($definition->getFactory() \|\| $definition->getFactoryClass(false) \|\| $definition->getFactoryService(false)) {`
	`87`	`+ throw new RuntimeException(sprintf('Service "%s" can use either autowiring or a factory, not both.', $id));`
	`88`	`+ }`
	`89`	`+`
`86`	`90`	`if (!$reflectionClass = $this->getReflectionClass($id, $definition)) {`
`87`	`91`	`return;`
`88`	`92`	`}`