Backport type fixes

Author: nicolas-grekas

ChildDefinition.php

@@ -44,11 +44,9 @@ public function getParent()
     /**
      * Sets the Definition to inherit from.
      *
-     * @param string $parent
-     *
      * @return $this
      */
-    public function setParent($parent)
+    public function setParent(string $parent)
     {
         $this->parent = $parent;
 

Compiler/ServiceReferenceGraph.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Reference;
 
 /**
  * This is a directed graph of your services.
@@ -73,7 +74,7 @@ public function clear()
     /**
      * Connects 2 nodes together in the Graph.
      */
-    public function connect(?string $sourceId, $sourceValue, ?string $destId, $destValue = null, $reference = null, bool $lazy = false, bool $weak = false, bool $byConstructor = false)
+    public function connect(?string $sourceId, $sourceValue, ?string $destId, $destValue = null, Reference $reference = null, bool $lazy = false, bool $weak = false, bool $byConstructor = false)
     {
         if (null === $sourceId || null === $destId) {
             return;

Container.php

@@ -107,8 +107,6 @@ public function getParameterBag()
     /**
      * Gets a parameter.
      *
-     * @param string $name The parameter name
-     *
      * @return mixed
      *
      * @throws InvalidArgumentException if the parameter is not defined
@@ -119,10 +117,6 @@ public function getParameter(string $name)
     }
 
     /**
-     * Checks if a parameter exists.
-     *
-     * @param string $name The parameter name
-     *
      * @return bool The presence of parameter in container
      */
     public function hasParameter(string $name)
@@ -210,9 +204,6 @@ public function has($id)
     /**
      * Gets a service.
      *
-     * @param string $id              The service identifier
-     * @param int    $invalidBehavior The behavior when the service does not exist
-     *
      * @return object|null The associated service
      *
      * @throws ServiceCircularReferenceException When a circular reference is detected
@@ -286,8 +277,6 @@ private function make(string $id, int $invalidBehavior)
     /**
      * Returns true if the given service has actually been initialized.
      *
-     * @param string $id The service identifier
-     *
      * @return bool true if service has already been initialized, false otherwise
      */
     public function initialized(string $id)
@@ -345,45 +334,39 @@ public function getRemovedIds()
     /**
      * Camelizes a string.
      *
-     * @param string $id A string to camelize
-     *
      * @return string The camelized string
      */
-    public static function camelize($id)
+    public static function camelize(string $id)
     {
         return strtr(ucwords(strtr($id, ['_' => ' ', '.' => '_ ', '\\' => '_ '])), [' ' => '']);
     }
 
     /**
      * A string to underscore.
      *
-     * @param string $id The string to underscore
-     *
      * @return string The underscored string
      */
-    public static function underscore($id)
+    public static function underscore(string $id)
     {
         return strtolower(preg_replace(['/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'], ['\\1_\\2', '\\1_\\2'], str_replace('_', '.', $id)));
     }
 
     /**
      * Creates a service by requiring its factory file.
      */
-    protected function load($file)
+    protected function load(string $file)
     {
         return require $file;
     }
 
     /**
      * Fetches a variable from the environment.
      *
-     * @param string $name The name of the environment variable
-     *
      * @return mixed The value to use for the provided environment variable name
      *
      * @throws EnvNotFoundException When the environment variable is not found and has no default value
      */
-    protected function getEnv($name)
+    protected function getEnv(string $name)
     {
         if (isset($this->resolving[$envName = "env($name)"])) {
             throw new ParameterCircularReferenceException(array_keys($this->resolving));

ContainerBuilder.php

@@ -519,11 +519,6 @@ public function has($id)
     }
 
     /**
-     * Gets a service.
-     *
-     * @param string $id              The service identifier
-     * @param int    $invalidBehavior The behavior when the service does not exist
-     *
      * @return object|null The associated service
      *
      * @throws InvalidArgumentException          when no definitions are available
@@ -829,11 +824,6 @@ public function setAlias(string $alias, $id)
         return $this->aliasDefinitions[$alias] = $id;
     }
 
-    /**
-     * Removes an alias.
-     *
-     * @param string $alias The alias to remove
-     */
     public function removeAlias(string $alias)
     {
         if (isset($this->aliasDefinitions[$alias])) {
@@ -843,8 +833,6 @@ public function removeAlias(string $alias)
     }
 
     /**
-     * Returns true if an alias exists under the given identifier.
-     *
      * @return bool true if the alias exists, false otherwise
      */
     public function hasAlias(string $id)
@@ -861,8 +849,6 @@ public function getAliases()
     }
 
     /**
-     * Gets an alias.
-     *
      * @return Alias An Alias instance
      *
      * @throws InvalidArgumentException if the alias does not exist
@@ -1520,7 +1506,7 @@ public static function hash($value)
     /**
      * {@inheritdoc}
      */
-    protected function getEnv($name)
+    protected function getEnv(string $name)
     {
         $value = parent::getEnv($name);
         $bag = $this->getParameterBag();
@@ -1549,7 +1535,7 @@ protected function getEnv($name)
         }
     }
 
-    private function callMethod($service, array $call, array &$inlineServices)
+    private function callMethod(object $service, array $call, array &$inlineServices)
     {
         foreach (self::getServiceConditionals($call[1]) as $s) {
             if (!$this->has($s)) {

ContainerInterface.php

@@ -65,22 +65,14 @@ public function has($id);
     public function initialized(string $id);
 
     /**
-     * Gets a parameter.
-     *
-     * @param string $name The parameter name
-     *
-     * @return mixed The parameter value
+     * @return mixed
      *
      * @throws InvalidArgumentException if the parameter is not defined
      */
     public function getParameter(string $name);
 
     /**
-     * Checks if a parameter exists.
-     *
-     * @param string $name The parameter name
-     *
-     * @return bool The presence of parameter in container
+     * @return bool
      */
     public function hasParameter(string $name);
 

Exception/ParameterNotFoundException.php

@@ -84,14 +84,14 @@ public function getSourceKey()
         return $this->sourceKey;
     }
 
-    public function setSourceId($sourceId)
+    public function setSourceId(?string $sourceId)
     {
         $this->sourceId = $sourceId;
 
         $this->updateRepr();
     }
 
-    public function setSourceKey($sourceKey)
+    public function setSourceKey(?string $sourceKey)
     {
         $this->sourceKey = $sourceKey;
 

Loader/YamlFileLoader.php

@@ -716,13 +716,11 @@ private function parseCallable($callable, string $parameter, string $id, string
     /**
      * Loads a YAML file.
      *
-     * @param string $file
-     *
      * @return array The file content
      *
      * @throws InvalidArgumentException when the given file is not a local file or when it does not exist
      */
-    protected function loadFile($file)
+    protected function loadFile(string $file)
     {
         if (!class_exists(\Symfony\Component\Yaml\Parser::class)) {
             throw new RuntimeException('Unable to load YAML config files as the Symfony Yaml Component is not installed.');