symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/DependencyInjection/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/ServiceLocator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/ServiceLocator.php
+18-2Lines changed: 18 additions & 2 deletions b/‎src/Symfony/Component/DependencyInjection/ServiceLocator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/ServiceLocator.php
+18-2Lines changed: 18 additions & 2 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/ServiceLocatorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/ServiceLocatorTest.php
+15Lines changed: 15 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/ServiceLocatorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/ServiceLocatorTest.php
+15Lines changed: 15 additions & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/composer.json
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/composer.json
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/DependencyInjection/composer.json
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/composer.json
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Contracts/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Contracts/CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Contracts/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Contracts/CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Contracts/Service/ServiceProviderInterface.php
Copy file name to clipboard
+37Lines changed: 37 additions & 0 deletions b/‎src/Symfony/Contracts/Service/ServiceProviderInterface.php
Copy file name to clipboard
+37Lines changed: 37 additions & 0 deletions
@@ -22,6 +22,7 @@ CHANGELOG
  * added `%env(key:...)%` processor to fetch a specific key from an array
  * deprecated `ServiceSubscriberInterface`, use the same interface from the `Symfony\Contracts\Service` namespace instead
  * deprecated `ResettableContainerInterface`, use `Symfony\Contracts\Service\ResetInterface` instead
+ * `ServiceLocator` implements `ServiceProviderInterface`
 
 4.1.0
 -----
 
@@ -12,26 +12,27 @@
 namespace Symfony\Component\DependencyInjection;
 
 use Psr\Container\ContainerExceptionInterface;
-use Psr\Container\ContainerInterface as PsrContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Contracts\Service\ServiceLocatorTrait;
+use Symfony\Contracts\Service\ServiceProviderInterface;
 use Symfony\Contracts\Service\ServiceSubscriberInterface;
 
 /**
  * @author Robin Chalas <robin.chalas@gmail.com>
  * @author Nicolas Grekas <p@tchwork.com>
  */
-class ServiceLocator implements PsrContainerInterface
+class ServiceLocator implements ServiceProviderInterface
 {
     use ServiceLocatorTrait {
         get as private doGet;
     }
 
     private $externalId;
     private $container;
+    private $providedTypes;
 
     public function get($id)
     {
@@ -140,4 +141,19 @@ private function formatAlternatives(array $alternatives = null, $separator = 'an
 
         return sprintf($format, $alternatives ? implode('", "', $alternatives) : $last, $alternatives ? sprintf(' %s "%s"', $separator, $last) : '');
     }
+
+    public function getProvidedServices(): array
+    {
+        if (null === $this->providedTypes) {
+            $this->providedTypes = array();
+
+            foreach ($this->factories as $name => $factory) {
+                $type = (new \ReflectionFunction($factory))->getReturnType();
+
+                $this->providedTypes[$name] = $type ? ($type->allowsNull() ? '?' : '').$type->getName() : '?';
+            }
+        }
+
+        return $this->providedTypes;
+    }
 }
@@ -86,6 +86,21 @@ public function testInvoke()
         $this->assertSame('baz', $locator('bar'));
         $this->assertNull($locator('dummy'), '->__invoke() should return null on invalid service');
     }
+
+    public function testProvidesServicesInformation()
+    {
+        $locator = new ServiceLocator(array(
+            'foo' => function () { return 'bar'; },
+            'bar' => function (): string { return 'baz'; },
+            'baz' => function (): ?string { return 'zaz'; },
+        ));
+
+        $this->assertSame($locator->getProvidedServices(), array(
+            'foo' => '?',
+            'bar' => 'string',
+            'baz' => '?string',
+        ));
+    }
 }
 
 class SomeServiceSubscriber implements ServiceSubscriberInterface
 
@@ -18,7 +18,7 @@
     "require": {
         "php": "^7.1.3",
         "psr/container": "^1.0",
-        "symfony/contracts": "^1.0"
+        "symfony/contracts": "^1.1"
     },
     "require-dev": {
         "symfony/yaml": "~3.4|~4.0",
 
@@ -5,6 +5,7 @@ CHANGELOG
 -----
 
  * added `HttpClient` namespace with contracts for implementing flexible HTTP clients
+ * added `ServiceProviderInterface`
 
 1.0.0
 -----
 
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Contracts\Service;
+
+use Psr\Container\ContainerInterface;
+
+/**
+ * A ServiceProviderInterface exposes identifiers and types of services provided by a container.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ * @author Mateusz Sip <mateusz.sip@gmail.com>
+ */
+interface ServiceProviderInterface extends ContainerInterface
+{
+    /**
+     * Returns an associative array of service types keyed by names provided by this object.
+     *
+     * Examples:
+     *
+     *  * array('logger' => 'Psr\Log\LoggerInterface') means the object provides service implementing Psr\Log\LoggerInterface
+     *    under "logger" name
+     *  * array('foo' => '?') means that object provides service of unknown type under 'foo' name
+     *  * array('bar' => '?Bar\Baz') means that object provides service implementing Bar\Baz or null under 'bar' name
+     *
+     * @return string[] The provided service types, keyed by service names
+     */
+    public function getProvidedServices(): array;
+}