symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
Lines changed: 3 additions & 2 deletions b/‎src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
Lines changed: 3 additions & 2 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
Lines changed: 9 additions & 5 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
Lines changed: 9 additions & 5 deletions
@@ -462,10 +462,11 @@ private function createTypeNotFoundMessage(TypedReference $reference, $label)
 
             $message = sprintf('has type "%s" but this class %s.', $type, $parentMsg ? sprintf('is missing a parent class (%s)', $parentMsg) : 'was not found');
         } else {
+            $alternatives = $this->createTypeAlternatives($reference);
             $message = $this->container->has($type) ? 'this service is abstract' : 'no such service exists';
-            $message = sprintf('references %s "%s" but %s.%s', $r->isInterface() ? 'interface' : 'class', $type, $message, $this->createTypeAlternatives($reference));
+            $message = sprintf('references %s "%s" but %s.%s', $r->isInterface() ? 'interface' : 'class', $type, $message, $alternatives);
 
-            if ($r->isInterface()) {
+            if ($r->isInterface() && !$alternatives) {
                 $message .= ' Did you create a class that implements this interface?';
             }
         }
 
@@ -17,6 +17,7 @@
 use Symfony\Component\DependencyInjection\Compiler\AutowirePass;
 use Symfony\Component\DependencyInjection\Compiler\ResolveClassPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Exception\AutowiringFailedException;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
@@ -684,10 +685,6 @@ public function testIgnoreServiceWithClassNotExisting()
         $this->assertTrue($container->hasDefinition('bar'));
     }
 
-    /**
-     * @expectedException \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
-     * @expectedExceptionMessage Cannot autowire service "setter_injection_collision": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\SetterInjectionCollision::setMultipleInstancesForOneArg()" references interface "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" but no such service exists. You should maybe alias this interface to one of these existing services: "c1", "c2".
-     */
     public function testSetterInjectionCollisionThrowsException()
     {
         $container = new ContainerBuilder();
@@ -700,7 +697,14 @@ public function testSetterInjectionCollisionThrowsException()
         (new AutowireRequiredMethodsPass())->process($container);
 
         $pass = new AutowirePass();
-        $pass->process($container);
+
+        try {
+            $pass->process($container);
+        } catch (AutowiringFailedException $e) {
+        }
+
+        $this->assertNotNull($e);
+        $this->assertSame('Cannot autowire service "setter_injection_collision": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\SetterInjectionCollision::setMultipleInstancesForOneArg()" references interface "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" but no such service exists. You should maybe alias this interface to one of these existing services: "c1", "c2".', $e->getMessage());
     }
 
     /**
Original file line number	Diff line number	Diff line change
`@@ -462,10 +462,11 @@ private function createTypeNotFoundMessage(TypedReference $reference, $label)`
`462`	`462`
`463`	`463`	`$message = sprintf('has type "%s" but this class %s.', $type, $parentMsg ? sprintf('is missing a parent class (%s)', $parentMsg) : 'was not found');`
`464`	`464`	`} else {`
	`465`	`+ $alternatives = $this->createTypeAlternatives($reference);`
`465`	`466`	`$message = $this->container->has($type) ? 'this service is abstract' : 'no such service exists';`
`466`		`- $message = sprintf('references %s "%s" but %s.%s', $r->isInterface() ? 'interface' : 'class', $type, $message, $this->createTypeAlternatives($reference));`
	`467`	`+ $message = sprintf('references %s "%s" but %s.%s', $r->isInterface() ? 'interface' : 'class', $type, $message, $alternatives);`
`467`	`468`
`468`		`- if ($r->isInterface()) {`
	`469`	`+ if ($r->isInterface() && !$alternatives) {`
`469`	`470`	`$message .= ' Did you create a class that implements this interface?';`
`470`	`471`	`}`
`471`	`472`	`}`