Allow to get alternatives when ServiceNotFoundException occurs.

Koc · Koc · commit c47ffc399f1a · 2017-08-17T13:38:34.000+03:00
diff --git a/src/Symfony/Component/DependencyInjection/Exception/ServiceNotFoundException.php b/src/Symfony/Component/DependencyInjection/Exception/ServiceNotFoundException.php
@@ -22,6 +22,7 @@ class ServiceNotFoundException extends InvalidArgumentException implements NotFo
 {
     private $id;
     private $sourceId;
+    private $alternatives;
 
     public function __construct($id, $sourceId = null, \Exception $previous = null, array $alternatives = array())
     {
@@ -44,6 +45,7 @@ public function __construct($id, $sourceId = null, \Exception $previous = null,
 
         $this->id = $id;
         $this->sourceId = $sourceId;
+        $this->alternatives = $alternatives;
     }
 
     public function getId()
@@ -55,4 +57,9 @@ public function getSourceId()
     {
         return $this->sourceId;
     }
+
+    public function getAlternatives()
+    {
+        return $this->alternatives;
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ServiceLocatorTest.php b/src/Symfony/Component/DependencyInjection/Tests/ServiceLocatorTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\DependencyInjection\ServiceLocator;
 
 class ServiceLocatorTest extends TestCase
@@ -58,7 +59,7 @@ public function testGetDoesNotMemoize()
 
     /**
      * @expectedException        \Psr\Container\NotFoundExceptionInterface
-     * @expectedExceptionMessage You have requested a non-existent service "dummy"
+     * @expectedExceptionMessage You have requested a non-existent service "dummy". Did you mean one of these: "foo", "bar"?
      */
     public function testGetThrowsOnUndefinedService()
     {
@@ -67,7 +68,13 @@ public function testGetThrowsOnUndefinedService()
             'bar' => function () { return 'baz'; },
         ));
 
-        $locator->get('dummy');
+        try {
+            $locator->get('dummy');
+        } catch (ServiceNotFoundException $e) {
+            $this->assertSame(['foo', 'bar'], $e->getAlternatives());
+
+            throw $e;
+        }
     }
 
     public function testInvoke()

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ class ServiceNotFoundException extends InvalidArgumentException implements NotFo`
`22`	`22`	`{`
`23`	`23`	`private $id;`
`24`	`24`	`private $sourceId;`
	`25`	`+ private $alternatives;`
`25`	`26`
`26`	`27`	`public function __construct($id, $sourceId = null, \Exception $previous = null, array $alternatives = array())`
`27`	`28`	`{`
`@@ -44,6 +45,7 @@ public function __construct($id, $sourceId = null, \Exception $previous = null,`
`44`	`45`
`45`	`46`	`$this->id = $id;`
`46`	`47`	`$this->sourceId = $sourceId;`
	`48`	`+ $this->alternatives = $alternatives;`
`47`	`49`	`}`
`48`	`50`
`49`	`51`	`public function getId()`
`@@ -55,4 +57,9 @@ public function getSourceId()`
`55`	`57`	`{`
`56`	`58`	`return $this->sourceId;`
`57`	`59`	`}`
	`60`	`+`
	`61`	`+ public function getAlternatives()`
	`62`	`+ {`
	`63`	`+ return $this->alternatives;`
	`64`	`+ }`
`58`	`65`	`}`