Add types to private/final/internal methods and constructors.

Author: derrabus

Compiler/AbstractRecursivePass.php

@@ -192,15 +192,15 @@ protected function getReflectionMethod(Definition $definition, $method)
         return $r;
     }
 
-    private function getExpressionLanguage()
+    private function getExpressionLanguage(): ExpressionLanguage
     {
         if (null === $this->expressionLanguage) {
             if (!class_exists(ExpressionLanguage::class)) {
                 throw new LogicException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed.');
             }
 
             $providers = $this->container->getExpressionLanguageProviders();
-            $this->expressionLanguage = new ExpressionLanguage(null, $providers, function ($arg) {
+            $this->expressionLanguage = new ExpressionLanguage(null, $providers, function (string $arg): string {
                 if ('""' === substr_replace($arg, '', 1, -1)) {
                     $id = stripcslashes(substr($arg, 1, -1));
                     $this->inExpression = true;

Compiler/AutowirePass.php

@@ -81,6 +81,9 @@ protected function processValue($value, $isRoot = false)
         }
     }
 
+    /**
+     * @return mixed
+     */
     private function doProcessValue($value, bool $isRoot = false)
     {
         if ($value instanceof TypedReference) {
@@ -371,7 +374,7 @@ private function set(string $type, string $id)
         $this->ambiguousServiceTypes[$type][] = $id;
     }
 
-    private function createTypeNotFoundMessageCallback(TypedReference $reference, string $label)
+    private function createTypeNotFoundMessageCallback(TypedReference $reference, string $label): callable
     {
         if (null === $this->typesClone->container) {
             $this->typesClone->container = new ContainerBuilder($this->container->getParameterBag());
@@ -386,7 +389,7 @@ private function createTypeNotFoundMessageCallback(TypedReference $reference, st
         })->bindTo($this->typesClone);
     }
 
-    private function createTypeNotFoundMessage(TypedReference $reference, string $label, string $currentId)
+    private function createTypeNotFoundMessage(TypedReference $reference, string $label, string $currentId): string
     {
         if (!$r = $this->container->getReflectionClass($type = $reference->getType(), false)) {
             // either $type does not exist or a parent class does not exist
@@ -420,7 +423,7 @@ private function createTypeNotFoundMessage(TypedReference $reference, string $la
         return $message;
     }
 
-    private function createTypeAlternatives(ContainerBuilder $container, TypedReference $reference)
+    private function createTypeAlternatives(ContainerBuilder $container, TypedReference $reference): string
     {
         // try suggesting available aliases first
         if ($message = $this->getAliasesSuggestionForType($container, $type = $reference->getType())) {
@@ -444,7 +447,7 @@ private function createTypeAlternatives(ContainerBuilder $container, TypedRefere
         return sprintf(' You should maybe alias this %s to %s.', class_exists($type, false) ? 'class' : 'interface', $message);
     }
 
-    private function getAliasesSuggestionForType(ContainerBuilder $container, string $type)
+    private function getAliasesSuggestionForType(ContainerBuilder $container, string $type): ?string
     {
         $aliases = [];
         foreach (class_parents($type) + class_implements($type) as $parent) {

Compiler/RegisterEnvVarProcessorsPass.php

@@ -60,7 +60,7 @@ public function process(ContainerBuilder $container)
         }
     }
 
-    private static function validateProvidedTypes($types, $class)
+    private static function validateProvidedTypes(string $types, string $class): array
     {
         $types = explode('|', $types);
 

Compiler/ResolveBindingsPass.php

@@ -205,6 +205,9 @@ protected function processValue($value, $isRoot = false)
         return parent::processValue($value, $isRoot);
     }
 
+    /**
+     * @return mixed
+     */
     private function getBindingValue(BoundArgument $binding)
     {
         list($bindingValue, $bindingId) = $binding->getValues();

Compiler/ResolveHotPathPass.php

@@ -26,7 +26,7 @@ class ResolveHotPathPass extends AbstractRecursivePass
     private $tagName;
     private $resolvedIds = [];
 
-    public function __construct($tagName = 'container.hot_path')
+    public function __construct(string $tagName = 'container.hot_path')
     {
         $this->tagName = $tagName;
     }

Compiler/ResolveInstanceofConditionalsPass.php

@@ -44,7 +44,7 @@ public function process(ContainerBuilder $container)
         }
     }
 
-    private function processDefinition(ContainerBuilder $container, string $id, Definition $definition)
+    private function processDefinition(ContainerBuilder $container, string $id, Definition $definition): Definition
     {
         $instanceofConditionals = $definition->getInstanceofConditionals();
         $autoconfiguredInstanceof = $definition->isAutoconfigured() ? $container->getAutoconfiguredInstanceof() : [];
@@ -144,7 +144,7 @@ private function processDefinition(ContainerBuilder $container, string $id, Defi
         return $definition;
     }
 
-    private function mergeConditionals(array $autoconfiguredInstanceof, array $instanceofConditionals, ContainerBuilder $container)
+    private function mergeConditionals(array $autoconfiguredInstanceof, array $instanceofConditionals, ContainerBuilder $container): array
     {
         // make each value an array of ChildDefinition
         $conditionals = array_map(function ($childDef) { return [$childDef]; }, $autoconfiguredInstanceof);

Compiler/ResolveInvalidReferencesPass.php

@@ -51,6 +51,8 @@ public function process(ContainerBuilder $container)
     /**
      * Processes arguments to determine invalid references.
      *
+     * @return mixed
+     *
      * @throws RuntimeException When an invalid reference is found
      */
     private function processValue($value, int $rootLevel = 0, int $level = 0)

Compiler/ServiceLocatorTagPass.php

@@ -88,9 +88,8 @@ protected function processValue($value, $isRoot = false)
 
     /**
      * @param Reference[] $refMap
-     * @param string|null $callerId
      */
-    public static function register(ContainerBuilder $container, array $refMap, $callerId = null): Reference
+    public static function register(ContainerBuilder $container, array $refMap, string $callerId = null): Reference
     {
         foreach ($refMap as $id => $ref) {
             if (!$ref instanceof Reference) {

Container.php

@@ -422,9 +422,14 @@ protected function getEnv($name)
     }
 
     /**
+     * @param string|false $registry
+     * @param string|bool  $load
+     *
+     * @return mixed
+     *
      * @internal
      */
-    final protected function getService($registry, $id, $method, $load)
+    final protected function getService($registry, string $id, ?string $method, $load)
     {
         if ('service_container' === $id) {
             return $this;

ContainerBuilder.php

@@ -1236,7 +1236,7 @@ private function doResolveServices($value, array &$inlineServices = [], bool $is
 
                     yield $k => $this->resolveServices($v);
                 }
-            }, function () use ($value) {
+            }, function () use ($value): int {
                 $count = 0;
                 foreach ($value->getValues() as $v) {
                     foreach (self::getServiceConditionals($v) as $s) {
@@ -1641,7 +1641,7 @@ private function shareService(Definition $definition, $service, ?string $id, arr
         }
     }
 
-    private function getExpressionLanguage()
+    private function getExpressionLanguage(): ExpressionLanguage
     {
         if (null === $this->expressionLanguage) {
             if (!class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) {
@@ -1653,7 +1653,7 @@ private function getExpressionLanguage()
         return $this->expressionLanguage;
     }
 
-    private function inVendors(string $path)
+    private function inVendors(string $path): bool
     {
         if (null === $this->vendors) {
             $resource = new ComposerResource();