add more return type declare

Author: inhere

src/CallableResolver.php

@@ -44,7 +44,7 @@ public function __construct(ContainerInterface $container)
      * @throws RuntimeException if the callable does not exist
      * @throws RuntimeException if the callable is not resolvable
      */
-    public function resolve($toResolve)
+    public function resolve($toResolve): callable
     {
         if (\is_callable($toResolve)) {
             return $toResolve;
@@ -79,7 +79,7 @@ public function resolve($toResolve)
      * @throws \InvalidArgumentException
      * @throws \RuntimeException if the callable does not exist
      */
-    private function resolveCallable($class, $method = '__invoke')
+    private function resolveCallable($class, $method = '__invoke'): callable
     {
         if ($cb = $this->container->getIfExist($class)) {
             return [$cb, $method];

src/CallableResolverAwareTrait.php

@@ -31,7 +31,7 @@ trait CallableResolverAwareTrait
      * @throws \Psr\Container\ContainerExceptionInterface
      * @throws \RuntimeException If the string cannot be resolved as a callable
      */
-    protected function resolveCallable($callable)
+    protected function resolveCallable($callable): callable
     {
         if (!$this->container instanceof ContainerInterface) {
             return $callable;

src/Container.php

@@ -100,7 +100,7 @@ public function __destruct()
      * @return $this
      * @throws DependencyResolutionException
      */
-    public function set(string $id, $definition, array $opts = [])
+    public function set(string $id, $definition, array $opts = []): self
     {
         $id = $this->_checkServiceId($id);
 
@@ -180,7 +180,7 @@ public function set(string $id, $definition, array $opts = [])
      * @throws \InvalidArgumentException
      * @throws DependencyResolutionException
      */
-    public function sets(array $services)
+    public function sets(array $services): self
     {
         foreach ($services as $id => $definition) {
             if (!$definition) {
@@ -212,7 +212,7 @@ public function sets(array $services)
      * @throws \InvalidArgumentException
      * @throws DependencyResolutionException
      */
-    public function protect(string $id, $definition, $share = false)
+    public function protect(string $id, $definition, $share = false): self
     {
         return $this->lock($id, $definition, $share);
     }
@@ -226,7 +226,7 @@ public function protect(string $id, $definition, $share = false)
      * @throws DependencyResolutionException
      * @throws \InvalidArgumentException
      */
-    public function lock(string $id, $definition, $share = false)
+    public function lock(string $id, $definition, $share = false): self
     {
         return $this->set($id, $definition, [
             'shared' => $share,
@@ -239,7 +239,7 @@ public function lock(string $id, $definition, $share = false)
      * @param  ServiceProviderInterface $provider 在提供者内添加需要的服务到容器
      * @return $this
      */
-    public function registerServiceProvider(ServiceProviderInterface $provider)
+    public function registerServiceProvider(ServiceProviderInterface $provider): self
     {
         $provider->register($this);
 
@@ -250,7 +250,7 @@ public function registerServiceProvider(ServiceProviderInterface $provider)
      * @param array $providers
      * @return $this
      */
-    public function registerServiceProviders(array $providers)
+    public function registerServiceProviders(array $providers): self
     {
         /** @var ServiceProviderInterface $provider */
         foreach ($providers as $provider) {

src/DIManager.php

@@ -33,7 +33,7 @@ final class DIManager
     /**
      * @return Container
      */
-    public static function getDefault()
+    public static function getDefault(): Container
     {
         return self::make('root', self::$defaultGroup);
     }
@@ -42,7 +42,7 @@ public static function getDefault()
      * @param null|string $name
      * @return Container
      */
-    public static function getContainer(string $name = null)
+    public static function getContainer(string $name = null): Container
     {
         return self::make($name);
     }
@@ -52,7 +52,7 @@ public static function getContainer(string $name = null)
      * @param string $group
      * @return Container
      */
-    public static function make(string $name = null, string $group = null)
+    public static function make(string $name = null, string $group = null): Container
     {
         $group = $group ?: self::$defaultGroup;
 
@@ -100,7 +100,7 @@ public static function setDefaultGroup($group = 'di')
      * Method to get property Profile
      * @return  string
      */
-    public static function getDefaultGroup()
+    public static function getDefaultGroup(): string
     {
         return static::$defaultGroup;
     }

src/NameAliasTrait.php

@@ -86,7 +86,7 @@ public function getAliases(): array
      * @param array $aliases
      * @return $this
      */
-    public function setAliases(array $aliases)
+    public function setAliases(array $aliases): self
     {
         $this->aliases = $aliases;
 

test/MakeByMethod.php

@@ -14,7 +14,7 @@
  */
 class MakeByMethod
 {
-    public function factory(array $options = [])
+    public function factory(array $options = []): SomeClass
     {
         return new SomeClass($options);
     }

test/MakeByStatic.php

@@ -14,7 +14,7 @@
  */
 class MakeByStatic
 {
-    public static function factory(array $options = [])
+    public static function factory(array $options = []): SomeClass
     {
         return new SomeClass($options);
     }