Add return types to internal|final|private methods

Author: nicolas-grekas

ContainerBuilder.php

@@ -1496,23 +1496,19 @@ public function log(CompilerPassInterface $pass, string $message)
     /**
      * Gets removed binding ids.
      *
-     * @return array
-     *
      * @internal
      */
-    public function getRemovedBindingIds()
+    public function getRemovedBindingIds(): array
     {
         return $this->removedBindingIds;
     }
 
     /**
      * Removes bindings for a service.
      *
-     * @param string $id The service identifier
-     *
      * @internal
      */
-    public function removeBindings($id)
+    public function removeBindings(string $id)
     {
         if ($this->hasDefinition($id)) {
             foreach ($this->getDefinition($id)->getBindings() as $key => $binding) {
@@ -1527,11 +1523,9 @@ public function removeBindings($id)
      *
      * @param mixed $value An array of conditionals to return
      *
-     * @return array An array of Service conditionals
-     *
      * @internal
      */
-    public static function getServiceConditionals($value)
+    public static function getServiceConditionals($value): array
     {
         $services = [];
 
@@ -1551,11 +1545,9 @@ public static function getServiceConditionals($value)
      *
      * @param mixed $value An array of conditionals to return
      *
-     * @return array An array of uninitialized conditionals
-     *
      * @internal
      */
-    public static function getInitializedConditionals($value)
+    public static function getInitializedConditionals($value): array
     {
         $services = [];
 

LazyProxy/PhpDumper/NullDumper.php

@@ -25,23 +25,23 @@ class NullDumper implements DumperInterface
     /**
      * {@inheritdoc}
      */
-    public function isProxyCandidate(Definition $definition)
+    public function isProxyCandidate(Definition $definition): bool
     {
         return false;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getProxyFactoryCode(Definition $definition, $id, $factoryCode = null)
+    public function getProxyFactoryCode(Definition $definition, $id, $factoryCode = null): string
     {
         return '';
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getProxyCode(Definition $definition)
+    public function getProxyCode(Definition $definition): string
     {
         return '';
     }

LazyProxy/ProxyHelper.php

@@ -21,7 +21,7 @@ class ProxyHelper
     /**
      * @return string|null The FQCN or builtin name of the type hint, or null when the type hint references an invalid self|parent context
      */
-    public static function getTypeHint(\ReflectionFunctionAbstract $r, \ReflectionParameter $p = null, $noBuiltin = false)
+    public static function getTypeHint(\ReflectionFunctionAbstract $r, \ReflectionParameter $p = null, $noBuiltin = false): ?string
     {
         if ($p instanceof \ReflectionParameter) {
             $type = $p->getType();

Loader/Configurator/DefaultsConfigurator.php

@@ -61,10 +61,8 @@ final public function tag(string $name, array $attributes = [])
 
     /**
      * Defines an instanceof-conditional to be applied to following service definitions.
-     *
-     * @return InstanceofConfigurator
      */
-    final public function instanceof(string $fqcn)
+    final public function instanceof(string $fqcn): InstanceofConfigurator
     {
         return $this->parent->instanceof($fqcn);
     }

Tests/Compiler/CustomExpressionLanguageFunctionTest.php

@@ -19,7 +19,7 @@ public function testDump()
             ->setArguments([new Expression('custom_func("foobar")')]);
 
         $container->addExpressionLanguageProvider(new class() implements ExpressionFunctionProviderInterface {
-            public function getFunctions()
+            public function getFunctions(): array
             {
                 return [
                     ExpressionFunction::fromPhp('strtolower', 'custom_func'),

Tests/Compiler/RegisterServiceSubscribersPassTest.php

@@ -196,7 +196,7 @@ public function testServiceSubscriberWithSemanticId()
         $container = new ContainerBuilder();
 
         $subscriber = new class() implements ServiceSubscriberInterface {
-            public static function getSubscribedServices()
+            public static function getSubscribedServices(): array
             {
                 return [
                     'some.service' => 'stdClass',

Tests/ContainerTest.php

@@ -327,7 +327,7 @@ public function testReset()
         $c->set('bar', $bar = new class() implements ResetInterface {
             public $resetCounter = 0;
 
-            public function reset()
+            public function reset(): void
             {
                 ++$this->resetCounter;
             }