Merge branch '5.2' into 5.3

nicolas-grekas · nicolas-grekas · commit 88a3e179edc7 · 2021-07-02T18:38:59.000+02:00
* 5.2:
  Backport type fixes
  Fix CS
  Avoid triggering the autoloader in Deprecation::isLegacy()
  fix markdown markup
  Backport type fixes
  uzb translation
  [DependencyInjection] Fix doc blocks
  [DependencyInjection] Turn $defaultDeprecationTemplate into a constant
  [Form] better form doc types to support static analysis
diff --git a/Alias.php b/Alias.php
@@ -15,12 +15,12 @@
 
 class Alias
 {
+    private const DEFAULT_DEPRECATION_TEMPLATE = 'The "%alias_id%" service alias is deprecated. You should stop using it, as it will be removed in the future.';
+
     private $id;
     private $public;
     private $deprecation = [];
 
-    private static $defaultDeprecationTemplate = 'The "%alias_id%" service alias is deprecated. You should stop using it, as it will be removed in the future.';
-
     public function __construct(string $id, bool $public = false)
     {
         $this->id = $id;
@@ -117,7 +117,7 @@ public function setDeprecated(/* string $package, string $version, string $messa
             }
         }
 
-        $this->deprecation = $status ? ['package' => $package, 'version' => $version, 'message' => $message ?: self::$defaultDeprecationTemplate] : [];
+        $this->deprecation = $status ? ['package' => $package, 'version' => $version, 'message' => $message ?: self::DEFAULT_DEPRECATION_TEMPLATE] : [];
 
         return $this;
     }
diff --git a/ChildDefinition.php b/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;
 
diff --git a/Compiler/AutowirePass.php b/Compiler/AutowirePass.php
@@ -408,7 +408,7 @@ private function set(string $type, string $id)
         $this->ambiguousServiceTypes[$type][] = $id;
     }
 
-    private function createTypeNotFoundMessageCallback(TypedReference $reference, string $label): callable
+    private function createTypeNotFoundMessageCallback(TypedReference $reference, string $label): \Closure
     {
         if (null === $this->typesClone->container) {
             $this->typesClone->container = new ContainerBuilder($this->container->getParameterBag());
diff --git a/Compiler/ServiceReferenceGraph.php b/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;
diff --git a/Config/ContainerParametersResource.php b/Config/ContainerParametersResource.php
@@ -32,9 +32,6 @@ public function __construct(array $parameters)
         $this->parameters = $parameters;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function __toString(): string
     {
         return 'container_parameters_'.md5(serialize($this->parameters));
diff --git a/Container.php b/Container.php
@@ -107,9 +107,7 @@ public function getParameterBag()
     /**
      * Gets a parameter.
      *
-     * @param string $name The parameter name
-     *
-     * @return array|bool|float|int|string|null The parameter value
+     * @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(string $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));
diff --git a/ContainerBuilder.php b/ContainerBuilder.php
@@ -524,11 +524,6 @@ public function has(string $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
@@ -842,11 +837,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])) {
@@ -856,8 +846,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)
@@ -866,8 +854,6 @@ public function hasAlias(string $id)
     }
 
     /**
-     * Gets all defined aliases.
-     *
      * @return Alias[] An array of aliases
      */
     public function getAliases()
@@ -876,8 +862,6 @@ public function getAliases()
     }
 
     /**
-     * Gets an alias.
-     *
      * @return Alias An Alias instance
      *
      * @throws InvalidArgumentException if the alias does not exist
@@ -1586,7 +1570,7 @@ public static function hash($value)
     /**
      * {@inheritdoc}
      */
-    protected function getEnv($name)
+    protected function getEnv(string $name)
     {
         $value = parent::getEnv($name);
         $bag = $this->getParameterBag();
@@ -1615,7 +1599,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)) {
diff --git a/ContainerInterface.php b/ContainerInterface.php
@@ -51,8 +51,6 @@ public function set(string $id, ?object $service);
     public function get(string $id, int $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE);
 
     /**
-     * Returns true if the given service is defined.
-     *
      * @param string $id The service identifier
      *
      * @return bool true if the service is defined, false otherwise
@@ -67,22 +65,14 @@ public function has(string $id);
     public function initialized(string $id);
 
     /**
-     * Gets a parameter.
-     *
-     * @param string $name The parameter name
-     *
-     * @return array|bool|float|int|string|null 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);
 
diff --git a/Definition.php b/Definition.php
@@ -22,6 +22,8 @@
  */
 class Definition
 {
+    private const DEFAULT_DEPRECATION_TEMPLATE = 'The "%service_id%" service is deprecated. You should stop using it, as it will be removed in the future.';
+
     private $class;
     private $file;
     private $factory;
@@ -45,8 +47,6 @@ class Definition
 
     protected $arguments = [];
 
-    private static $defaultDeprecationTemplate = 'The "%service_id%" service is deprecated. You should stop using it, as it will be removed in the future.';
-
     /**
      * @internal
      *
@@ -743,7 +743,7 @@ public function setDeprecated(/* string $package, string $version, string $messa
         }
 
         $this->changes['deprecated'] = true;
-        $this->deprecation = $status ? ['package' => $package, 'version' => $version, 'message' => $message ?: self::$defaultDeprecationTemplate] : [];
+        $this->deprecation = $status ? ['package' => $package, 'version' => $version, 'message' => $message ?: self::DEFAULT_DEPRECATION_TEMPLATE] : [];
 
         return $this;
     }
@@ -790,7 +790,7 @@ public function getDeprecation(string $id): array
     /**
      * Sets a configurator to call after the service is fully initialized.
      *
-     * @param string|array|Reference $configurator A PHP function, reference or an array containing a class/Reference and a method to call
+     * @param string|array|Reference|null $configurator A PHP function, reference or an array containing a class/Reference and a method to call
      *
      * @return $this
      */
diff --git a/Exception/ParameterNotFoundException.php b/Exception/ParameterNotFoundException.php
@@ -27,12 +27,12 @@ class ParameterNotFoundException extends InvalidArgumentException implements Not
     private $nonNestedAlternative;
 
     /**
-     * @param string      $key                  The requested parameter key
-     * @param string      $sourceId             The service id that references the non-existent parameter
-     * @param string      $sourceKey            The parameter key that references the non-existent parameter
-     * @param \Throwable  $previous             The previous exception
-     * @param string[]    $alternatives         Some parameter name alternatives
-     * @param string|null $nonNestedAlternative The alternative parameter name when the user expected dot notation for nested parameters
+     * @param string          $key                  The requested parameter key
+     * @param string|null     $sourceId             The service id that references the non-existent parameter
+     * @param string|null     $sourceKey            The parameter key that references the non-existent parameter
+     * @param \Throwable|null $previous             The previous exception
+     * @param string[]        $alternatives         Some parameter name alternatives
+     * @param string|null     $nonNestedAlternative The alternative parameter name when the user expected dot notation for nested parameters
      */
     public function __construct(string $key, string $sourceId = null, string $sourceKey = null, \Throwable $previous = null, array $alternatives = [], string $nonNestedAlternative = null)
     {
@@ -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;
 
diff --git a/Loader/Configurator/ServiceConfigurator.php b/Loader/Configurator/ServiceConfigurator.php
@@ -47,7 +47,7 @@ class ServiceConfigurator extends AbstractServiceConfigurator
     private $path;
     private $destructed = false;
 
-    public function __construct(ContainerBuilder $container, array $instanceof, bool $allowParent, ServicesConfigurator $parent, Definition $definition, $id, array $defaultTags, string $path = null)
+    public function __construct(ContainerBuilder $container, array $instanceof, bool $allowParent, ServicesConfigurator $parent, Definition $definition, ?string $id, array $defaultTags, string $path = null)
     {
         $this->container = $container;
         $this->instanceof = $instanceof;
diff --git a/Loader/YamlFileLoader.php b/Loader/YamlFileLoader.php
@@ -742,13 +742,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.');
@@ -931,9 +929,6 @@ private function resolveServices($value, string $file, bool $isParameter = false
         return $value;
     }
 
-    /**
-     * Loads from Extensions.
-     */
     private function loadFromExtensions(array $content)
     {
         foreach ($content as $namespace => $values) {
@@ -949,9 +944,6 @@ private function loadFromExtensions(array $content)
         }
     }
 
-    /**
-     * Checks the keywords used to define a service.
-     */
     private function checkDefinition(string $id, array $definition, string $file)
     {
         if ($this->isLoadingInstanceof) {
diff --git a/ParameterBag/ContainerBag.php b/ParameterBag/ContainerBag.php
diff --git a/ParameterBag/ParameterBag.php b/ParameterBag/ParameterBag.php
diff --git a/ParameterBag/ParameterBagInterface.php b/ParameterBag/ParameterBagInterface.php
diff --git a/Tests/Compiler/ResolveChildDefinitionsPassTest.php b/Tests/Compiler/ResolveChildDefinitionsPassTest.php
diff --git a/TypedReference.php b/TypedReference.php

Original file line number	Diff line number	Diff line change
`@@ -15,12 +15,12 @@`
`15`	`15`
`16`	`16`	`class Alias`
`17`	`17`	`{`
	`18`	`+ private const DEFAULT_DEPRECATION_TEMPLATE = 'The "%alias_id%" service alias is deprecated. You should stop using it, as it will be removed in the future.';`
	`19`	`+`
`18`	`20`	`private $id;`
`19`	`21`	`private $public;`
`20`	`22`	`private $deprecation = [];`
`21`	`23`
`22`		`- private static $defaultDeprecationTemplate = 'The "%alias_id%" service alias is deprecated. You should stop using it, as it will be removed in the future.';`
`23`		`-`
`24`	`24`	`public function __construct(string $id, bool $public = false)`
`25`	`25`	`{`
`26`	`26`	`$this->id = $id;`
`@@ -117,7 +117,7 @@ public function setDeprecated(/* string $package, string $version, string $messa`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`
`120`		`- $this->deprecation = $status ? ['package' => $package, 'version' => $version, 'message' => $message ?: self::$defaultDeprecationTemplate] : [];`
	`120`	`+ $this->deprecation = $status ? ['package' => $package, 'version' => $version, 'message' => $message ?: self::DEFAULT_DEPRECATION_TEMPLATE] : [];`
`121`	`121`
`122`	`122`	`return $this;`
`123`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,11 +44,9 @@ public function getParent()`
`44`	`44`	`/**`
`45`	`45`	`* Sets the Definition to inherit from.`
`46`	`46`	`*`
`47`		`- * @param string $parent`
`48`		`- *`
`49`	`47`	`* @return $this`
`50`	`48`	`*/`
`51`		`- public function setParent($parent)`
	`49`	`+ public function setParent(string $parent)`
`52`	`50`	`{`
`53`	`51`	`$this->parent = $parent;`
`54`	`52`
Original file line number	Diff line number	Diff line change
`@@ -408,7 +408,7 @@ private function set(string $type, string $id)`
`408`	`408`	`$this->ambiguousServiceTypes[$type][] = $id;`
`409`	`409`	`}`
`410`	`410`
`411`		`- private function createTypeNotFoundMessageCallback(TypedReference $reference, string $label): callable`
	`411`	`+ private function createTypeNotFoundMessageCallback(TypedReference $reference, string $label): \Closure`
`412`	`412`	`{`
`413`	`413`	`if (null === $this->typesClone->container) {`
`414`	`414`	`$this->typesClone->container = new ContainerBuilder($this->container->getParameterBag());`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,6 @@ public function __construct(array $parameters)`
`32`	`32`	`$this->parameters = $parameters;`
`33`	`33`	`}`
`34`	`34`
`35`		`- /**`
`36`		`- * {@inheritdoc}`
`37`		`- */`
`38`	`35`	`public function __toString(): string`
`39`	`36`	`{`
`40`	`37`	`return 'container_parameters_'.md5(serialize($this->parameters));`
Original file line number	Diff line number	Diff line change
`@@ -107,9 +107,7 @@ public function getParameterBag()`
`107`	`107`	`/**`
`108`	`108`	`* Gets a parameter.`
`109`	`109`	`*`
`110`		`- * @param string $name The parameter name`
`111`		`- *`
`112`		`- * @return array\|bool\|float\|int\|string\|null The parameter value`
	`110`	`+ * @return mixed`
`113`	`111`	`*`
`114`	`112`	`* @throws InvalidArgumentException if the parameter is not defined`
`115`	`113`	`*/`
`@@ -119,10 +117,6 @@ public function getParameter(string $name)`
`119`	`117`	`}`
`120`	`118`
`121`	`119`	`/**`
`122`		`- * Checks if a parameter exists.`
`123`		`- *`
`124`		`- * @param string $name The parameter name`
`125`		`- *`
`126`	`120`	`* @return bool The presence of parameter in container`
`127`	`121`	`*/`
`128`	`122`	`public function hasParameter(string $name)`
`@@ -210,9 +204,6 @@ public function has(string $id)`
`210`	`204`	`/**`
`211`	`205`	`* Gets a service.`
`212`	`206`	`*`
`213`		`- * @param string $id The service identifier`
`214`		`- * @param int $invalidBehavior The behavior when the service does not exist`
`215`		`- *`
`216`	`207`	`* @return object\|null The associated service`
`217`	`208`	`*`
`218`	`209`	`* @throws ServiceCircularReferenceException When a circular reference is detected`
`@@ -286,8 +277,6 @@ private function make(string $id, int $invalidBehavior)`
`286`	`277`	`/**`
`287`	`278`	`* Returns true if the given service has actually been initialized.`
`288`	`279`	`*`
`289`		`- * @param string $id The service identifier`
`290`		`- *`
`291`	`280`	`* @return bool true if service has already been initialized, false otherwise`
`292`	`281`	`*/`
`293`	`282`	`public function initialized(string $id)`
`@@ -345,45 +334,39 @@ public function getRemovedIds()`
`345`	`334`	`/**`
`346`	`335`	`* Camelizes a string.`
`347`	`336`	`*`
`348`		`- * @param string $id A string to camelize`
`349`		`- *`
`350`	`337`	`* @return string The camelized string`
`351`	`338`	`*/`
`352`		`- public static function camelize($id)`
	`339`	`+ public static function camelize(string $id)`
`353`	`340`	`{`
`354`	`341`	`return strtr(ucwords(strtr($id, ['_' => ' ', '.' => '_ ', '\\' => '_ '])), [' ' => '']);`
`355`	`342`	`}`
`356`	`343`
`357`	`344`	`/**`
`358`	`345`	`* A string to underscore.`
`359`	`346`	`*`
`360`		`- * @param string $id The string to underscore`
`361`		`- *`
`362`	`347`	`* @return string The underscored string`
`363`	`348`	`*/`
`364`		`- public static function underscore($id)`
	`349`	`+ public static function underscore(string $id)`
`365`	`350`	`{`
`366`	`351`	`return strtolower(preg_replace(['/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'], ['\\1_\\2', '\\1_\\2'], str_replace('_', '.', $id)));`
`367`	`352`	`}`
`368`	`353`
`369`	`354`	`/**`
`370`	`355`	`* Creates a service by requiring its factory file.`
`371`	`356`	`*/`
`372`		`- protected function load($file)`
	`357`	`+ protected function load(string $file)`
`373`	`358`	`{`
`374`	`359`	`return require $file;`
`375`	`360`	`}`
`376`	`361`
`377`	`362`	`/**`
`378`	`363`	`* Fetches a variable from the environment.`
`379`	`364`	`*`
`380`		`- * @param string $name The name of the environment variable`
`381`		`- *`
`382`	`365`	`* @return mixed The value to use for the provided environment variable name`
`383`	`366`	`*`
`384`	`367`	`* @throws EnvNotFoundException When the environment variable is not found and has no default value`
`385`	`368`	`*/`
`386`		`- protected function getEnv($name)`
	`369`	`+ protected function getEnv(string $name)`
`387`	`370`	`{`
`388`	`371`	`if (isset($this->resolving[$envName = "env($name)"])) {`
`389`	`372`	`throw new ParameterCircularReferenceException(array_keys($this->resolving));`
Original file line number	Diff line number	Diff line change
`@@ -524,11 +524,6 @@ public function has(string $id)`
`524`	`524`	`}`
`525`	`525`
`526`	`526`	`/**`
`527`		`- * Gets a service.`
`528`		`- *`
`529`		`- * @param string $id The service identifier`
`530`		`- * @param int $invalidBehavior The behavior when the service does not exist`
`531`		`- *`
`532`	`527`	`* @return object\|null The associated service`
`533`	`528`	`*`
`534`	`529`	`* @throws InvalidArgumentException when no definitions are available`
`@@ -842,11 +837,6 @@ public function setAlias(string $alias, $id)`
`842`	`837`	`return $this->aliasDefinitions[$alias] = $id;`
`843`	`838`	`}`
`844`	`839`
`845`		`- /**`
`846`		`- * Removes an alias.`
`847`		`- *`
`848`		`- * @param string $alias The alias to remove`
`849`		`- */`
`850`	`840`	`public function removeAlias(string $alias)`
`851`	`841`	`{`
`852`	`842`	`if (isset($this->aliasDefinitions[$alias])) {`
`@@ -856,8 +846,6 @@ public function removeAlias(string $alias)`
`856`	`846`	`}`
`857`	`847`
`858`	`848`	`/**`
`859`		`- * Returns true if an alias exists under the given identifier.`
`860`		`- *`
`861`	`849`	`* @return bool true if the alias exists, false otherwise`
`862`	`850`	`*/`
`863`	`851`	`public function hasAlias(string $id)`
`@@ -866,8 +854,6 @@ public function hasAlias(string $id)`
`866`	`854`	`}`
`867`	`855`
`868`	`856`	`/**`
`869`		`- * Gets all defined aliases.`
`870`		`- *`
`871`	`857`	`* @return Alias[] An array of aliases`
`872`	`858`	`*/`
`873`	`859`	`public function getAliases()`
`@@ -876,8 +862,6 @@ public function getAliases()`
`876`	`862`	`}`
`877`	`863`
`878`	`864`	`/**`
`879`		`- * Gets an alias.`
`880`		`- *`
`881`	`865`	`* @return Alias An Alias instance`
`882`	`866`	`*`
`883`	`867`	`* @throws InvalidArgumentException if the alias does not exist`
`@@ -1586,7 +1570,7 @@ public static function hash($value)`
`1586`	`1570`	`/**`
`1587`	`1571`	`* {@inheritdoc}`
`1588`	`1572`	`*/`
`1589`		`- protected function getEnv($name)`
	`1573`	`+ protected function getEnv(string $name)`
`1590`	`1574`	`{`
`1591`	`1575`	`$value = parent::getEnv($name);`
`1592`	`1576`	`$bag = $this->getParameterBag();`
`@@ -1615,7 +1599,7 @@ protected function getEnv($name)`
`1615`	`1599`	`}`
`1616`	`1600`	`}`
`1617`	`1601`
`1618`		`- private function callMethod($service, array $call, array &$inlineServices)`
	`1602`	`+ private function callMethod(object $service, array $call, array &$inlineServices)`
`1619`	`1603`	`{`
`1620`	`1604`	`foreach (self::getServiceConditionals($call[1]) as $s) {`
`1621`	`1605`	`if (!$this->has($s)) {`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@`
`22`	`22`	`*/`
`23`	`23`	`class Definition`
`24`	`24`	`{`
	`25`	`+ private const DEFAULT_DEPRECATION_TEMPLATE = 'The "%service_id%" service is deprecated. You should stop using it, as it will be removed in the future.';`
	`26`	`+`
`25`	`27`	`private $class;`
`26`	`28`	`private $file;`
`27`	`29`	`private $factory;`
`@@ -45,8 +47,6 @@ class Definition`
`45`	`47`
`46`	`48`	`protected $arguments = [];`
`47`	`49`
`48`		`- private static $defaultDeprecationTemplate = 'The "%service_id%" service is deprecated. You should stop using it, as it will be removed in the future.';`
`49`		`-`
`50`	`50`	`/**`
`51`	`51`	`* @internal`
`52`	`52`	`*`
`@@ -743,7 +743,7 @@ public function setDeprecated(/* string $package, string $version, string $messa`
`743`	`743`	`}`
`744`	`744`
`745`	`745`	`$this->changes['deprecated'] = true;`
`746`		`- $this->deprecation = $status ? ['package' => $package, 'version' => $version, 'message' => $message ?: self::$defaultDeprecationTemplate] : [];`
	`746`	`+ $this->deprecation = $status ? ['package' => $package, 'version' => $version, 'message' => $message ?: self::DEFAULT_DEPRECATION_TEMPLATE] : [];`
`747`	`747`
`748`	`748`	`return $this;`
`749`	`749`	`}`
`@@ -790,7 +790,7 @@ public function getDeprecation(string $id): array`
`790`	`790`	`/**`
`791`	`791`	`* Sets a configurator to call after the service is fully initialized.`
`792`	`792`	`*`
`793`		`- * @param string\|array\|Reference $configurator A PHP function, reference or an array containing a class/Reference and a method to call`
	`793`	`+ * @param string\|array\|Reference\|null $configurator A PHP function, reference or an array containing a class/Reference and a method to call`
`794`	`794`	`*`
`795`	`795`	`* @return $this`
`796`	`796`	`*/`