Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit fc9fd3bc7d90 · 2020-09-02T18:08:58.000+02:00
* 3.4:
  Enable "native_constant_invocation" CS rule
  Make AbstractPhpFileCacheWarmer public
diff --git a/Compiler/AnalyzeServiceReferencesPass.php b/Compiler/AnalyzeServiceReferencesPass.php
@@ -53,7 +53,7 @@ public function __construct(bool $onlyConstructorArguments = false, bool $hasPro
      */
     public function setRepeatedPass(RepeatedPass $repeatedPass)
     {
-        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.2.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.2.', __METHOD__), \E_USER_DEPRECATED);
     }
 
     /**
diff --git a/Compiler/DecoratorServicePass.php b/Compiler/DecoratorServicePass.php
@@ -29,7 +29,7 @@ class DecoratorServicePass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         $definitions = new \SplPriorityQueue();
-        $order = PHP_INT_MAX;
+        $order = \PHP_INT_MAX;
 
         foreach ($container->getDefinitions() as $id => $definition) {
             if (!$decorated = $definition->getDecoratedService()) {
diff --git a/Compiler/InlineServiceDefinitionsPass.php b/Compiler/InlineServiceDefinitionsPass.php
@@ -43,7 +43,7 @@ public function __construct(AnalyzeServiceReferencesPass $analyzingPass = null)
      */
     public function setRepeatedPass(RepeatedPass $repeatedPass)
     {
-        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.2.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.2.', __METHOD__), \E_USER_DEPRECATED);
         $this->repeatedPass = $repeatedPass;
     }
 
diff --git a/Compiler/RemoveUnusedDefinitionsPass.php b/Compiler/RemoveUnusedDefinitionsPass.php
@@ -29,7 +29,7 @@ class RemoveUnusedDefinitionsPass extends AbstractRecursivePass implements Repea
      */
     public function setRepeatedPass(RepeatedPass $repeatedPass)
     {
-        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.2.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.2.', __METHOD__), \E_USER_DEPRECATED);
     }
 
     /**
diff --git a/Compiler/RepeatedPass.php b/Compiler/RepeatedPass.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\DependencyInjection\Compiler;
 
-@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.2.', RepeatedPass::class), E_USER_DEPRECATED);
+@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.2.', RepeatedPass::class), \E_USER_DEPRECATED);
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
diff --git a/Compiler/ResolveReferencesToAliasesPass.php b/Compiler/ResolveReferencesToAliasesPass.php
@@ -62,7 +62,7 @@ private function getDefinitionId(string $id, ContainerBuilder $container): strin
         $alias = $container->getAlias($id);
 
         if ($alias->isDeprecated()) {
-            @trigger_error(sprintf('%s. It is being referenced by the "%s" %s.', rtrim($alias->getDeprecationMessage($id), '. '), $this->currentId, $container->hasDefinition($this->currentId) ? 'service' : 'alias'), E_USER_DEPRECATED);
+            @trigger_error(sprintf('%s. It is being referenced by the "%s" %s.', rtrim($alias->getDeprecationMessage($id), '. '), $this->currentId, $container->hasDefinition($this->currentId) ? 'service' : 'alias'), \E_USER_DEPRECATED);
         }
 
         $seen = [];
diff --git a/Container.php b/Container.php
@@ -231,7 +231,7 @@ public function get($id, $invalidBehavior = /* self::EXCEPTION_ON_INVALID_REFERE
             ?? ('service_container' === $id ? $this : ($this->factories[$id] ?? [$this, 'make'])($id, $invalidBehavior));
 
         if (!\is_object($service) && null !== $service) {
-            @trigger_error(sprintf('Non-object services are deprecated since Symfony 4.4, please fix the "%s" service which is of type "%s" right now.', $id, \gettype($service)), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Non-object services are deprecated since Symfony 4.4, please fix the "%s" service which is of type "%s" right now.', $id, \gettype($service)), \E_USER_DEPRECATED);
         }
 
         return $service;
diff --git a/ContainerBuilder.php b/ContainerBuilder.php
@@ -492,7 +492,7 @@ public function getCompiler()
     public function set($id, $service)
     {
         if (!\is_object($service) && null !== $service) {
-            @trigger_error(sprintf('Non-object services are deprecated since Symfony 4.4, setting the "%s" service to a value of type "%s" should be avoided.', $id, \gettype($service)), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Non-object services are deprecated since Symfony 4.4, setting the "%s" service to a value of type "%s" should be avoided.', $id, \gettype($service)), \E_USER_DEPRECATED);
         }
 
         $id = (string) $id;
@@ -558,7 +558,7 @@ public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INV
         $service = $this->doGet($id, $invalidBehavior);
 
         if (!\is_object($service) && null !== $service) {
-            @trigger_error(sprintf('Non-object services are deprecated since Symfony 4.4, please fix the "%s" service which is of type "%s" right now.', $id, \gettype($service)), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Non-object services are deprecated since Symfony 4.4, please fix the "%s" service which is of type "%s" right now.', $id, \gettype($service)), \E_USER_DEPRECATED);
         }
 
         return $service;
@@ -590,7 +590,7 @@ private function doGet(string $id, int $invalidBehavior = ContainerInterface::EX
             $alias = $this->aliasDefinitions[$id];
 
             if ($alias->isDeprecated()) {
-                @trigger_error($alias->getDeprecationMessage($id), E_USER_DEPRECATED);
+                @trigger_error($alias->getDeprecationMessage($id), \E_USER_DEPRECATED);
             }
 
             return $this->doGet((string) $alias, $invalidBehavior, $inlineServices, $isConstructorArgument);
@@ -1092,7 +1092,7 @@ private function createService(Definition $definition, array &$inlineServices, b
         }
 
         if ($definition->isDeprecated()) {
-            @trigger_error($definition->getDeprecationMessage($id), E_USER_DEPRECATED);
+            @trigger_error($definition->getDeprecationMessage($id), \E_USER_DEPRECATED);
         }
 
         if ($tryProxy && $definition->isLazy() && !$tryProxy = !($proxy = $this->proxyInstantiator) || $proxy instanceof RealServiceInstantiator) {
@@ -1135,7 +1135,7 @@ private function createService(Definition $definition, array &$inlineServices, b
                 $r = new \ReflectionClass($factory[0]);
 
                 if (0 < strpos($r->getDocComment(), "\n * @deprecated ")) {
-                    @trigger_error(sprintf('The "%s" service relies on the deprecated "%s" factory class. It should either be deprecated or its factory upgraded.', $id, $r->name), E_USER_DEPRECATED);
+                    @trigger_error(sprintf('The "%s" service relies on the deprecated "%s" factory class. It should either be deprecated or its factory upgraded.', $id, $r->name), \E_USER_DEPRECATED);
                 }
             }
         } else {
@@ -1144,7 +1144,7 @@ private function createService(Definition $definition, array &$inlineServices, b
             $service = null === $r->getConstructor() ? $r->newInstance() : $r->newInstanceArgs($arguments);
 
             if (!$definition->isDeprecated() && 0 < strpos($r->getDocComment(), "\n * @deprecated ")) {
-                @trigger_error(sprintf('The "%s" service relies on the deprecated "%s" class. It should either be deprecated or its implementation upgraded.', $id, $r->name), E_USER_DEPRECATED);
+                @trigger_error(sprintf('The "%s" service relies on the deprecated "%s" class. It should either be deprecated or its implementation upgraded.', $id, $r->name), \E_USER_DEPRECATED);
             }
         }
 
diff --git a/Definition.php b/Definition.php
@@ -186,10 +186,10 @@ public function getDecoratedService()
     public function setClass($class)
     {
         if ($class instanceof Parameter) {
-            @trigger_error(sprintf('Passing an instance of %s as class name to %s in deprecated in Symfony 4.4 and will result in a TypeError in 5.0. Please pass the string "%%%s%%" instead.', Parameter::class, __CLASS__, (string) $class), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Passing an instance of %s as class name to %s in deprecated in Symfony 4.4 and will result in a TypeError in 5.0. Please pass the string "%%%s%%" instead.', Parameter::class, __CLASS__, (string) $class), \E_USER_DEPRECATED);
         }
         if (null !== $class && !\is_string($class)) {
-            @trigger_error(sprintf('The class name passed to %s is expected to be a string. Passing a %s is deprecated in Symfony 4.4 and will result in a TypeError in 5.0.', __CLASS__, \is_object($class) ? \get_class($class) : \gettype($class)), E_USER_DEPRECATED);
+            @trigger_error(sprintf('The class name passed to %s is expected to be a string. Passing a %s is deprecated in Symfony 4.4 and will result in a TypeError in 5.0.', __CLASS__, \is_object($class) ? \get_class($class) : \gettype($class)), \E_USER_DEPRECATED);
         }
 
         $this->changes['class'] = true;
diff --git a/Dumper/PhpDumper.php b/Dumper/PhpDumper.php
@@ -2013,7 +2013,7 @@ private function isSingleUsePrivateNode(ServiceReferenceGraphNode $node): bool
      */
     private function export($value)
     {
-        if (null !== $this->targetDirRegex && \is_string($value) && preg_match($this->targetDirRegex, $value, $matches, PREG_OFFSET_CAPTURE)) {
+        if (null !== $this->targetDirRegex && \is_string($value) && preg_match($this->targetDirRegex, $value, $matches, \PREG_OFFSET_CAPTURE)) {
             $suffix = $matches[0][1] + \strlen($matches[0][0]);
             $matches[0][1] += \strlen($matches[1][0]);
             $prefix = $matches[0][1] ? $this->doExport(substr($value, 0, $matches[0][1]), true).'.' : '';
diff --git a/EnvVarProcessor.php b/EnvVarProcessor.php
@@ -192,19 +192,19 @@ public function getEnv($prefix, $name, \Closure $getEnv)
         }
 
         if ('bool' === $prefix) {
-            return (bool) (filter_var($env, FILTER_VALIDATE_BOOLEAN) ?: filter_var($env, FILTER_VALIDATE_INT) ?: filter_var($env, FILTER_VALIDATE_FLOAT));
+            return (bool) (filter_var($env, \FILTER_VALIDATE_BOOLEAN) ?: filter_var($env, \FILTER_VALIDATE_INT) ?: filter_var($env, \FILTER_VALIDATE_FLOAT));
         }
 
         if ('int' === $prefix) {
-            if (false === $env = filter_var($env, FILTER_VALIDATE_INT) ?: filter_var($env, FILTER_VALIDATE_FLOAT)) {
+            if (false === $env = filter_var($env, \FILTER_VALIDATE_INT) ?: filter_var($env, \FILTER_VALIDATE_FLOAT)) {
                 throw new RuntimeException(sprintf('Non-numeric env var "%s" cannot be cast to int.', $name));
             }
 
             return (int) $env;
         }
 
         if ('float' === $prefix) {
-            if (false === $env = filter_var($env, FILTER_VALIDATE_FLOAT)) {
+            if (false === $env = filter_var($env, \FILTER_VALIDATE_FLOAT)) {
                 throw new RuntimeException(sprintf('Non-numeric env var "%s" cannot be cast to float.', $name));
             }
 
@@ -226,7 +226,7 @@ public function getEnv($prefix, $name, \Closure $getEnv)
         if ('json' === $prefix) {
             $env = json_decode($env, true);
 
-            if (JSON_ERROR_NONE !== json_last_error()) {
+            if (\JSON_ERROR_NONE !== json_last_error()) {
                 throw new RuntimeException(sprintf('Invalid JSON in env var "%s": ', $name).json_last_error_msg());
             }
 
@@ -262,7 +262,7 @@ public function getEnv($prefix, $name, \Closure $getEnv)
         }
 
         if ('query_string' === $prefix) {
-            $queryString = parse_url($env, PHP_URL_QUERY) ?: $env;
+            $queryString = parse_url($env, \PHP_URL_QUERY) ?: $env;
             parse_str($queryString, $result);
 
             return $result;
diff --git a/Extension/Extension.php b/Extension/Extension.php
@@ -93,7 +93,7 @@ public function getConfiguration(array $config, ContainerBuilder $container)
         }
 
         if (!$class->implementsInterface(ConfigurationInterface::class)) {
-            @trigger_error(sprintf('Not implementing "%s" in the extension configuration class "%s" is deprecated since Symfony 4.1.', ConfigurationInterface::class, $class->getName()), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Not implementing "%s" in the extension configuration class "%s" is deprecated since Symfony 4.1.', ConfigurationInterface::class, $class->getName()), \E_USER_DEPRECATED);
             //throw new LogicException(sprintf('The extension configuration class "%s" must implement "%s".', $class->getName(), ConfigurationInterface::class));
 
             return null;
diff --git a/Loader/Configurator/ContainerConfigurator.php b/Loader/Configurator/ContainerConfigurator.php
@@ -114,7 +114,7 @@ function iterator(array $values): IteratorArgument
  */
 function tagged(string $tag, string $indexAttribute = null, string $defaultIndexMethod = null): TaggedIteratorArgument
 {
-    @trigger_error(__NAMESPACE__.'\tagged() is deprecated since Symfony 4.4 and will be removed in 5.0, use '.__NAMESPACE__.'\tagged_iterator() instead.', E_USER_DEPRECATED);
+    @trigger_error(__NAMESPACE__.'\tagged() is deprecated since Symfony 4.4 and will be removed in 5.0, use '.__NAMESPACE__.'\tagged_iterator() instead.', \E_USER_DEPRECATED);
 
     return new TaggedIteratorArgument($tag, $indexAttribute, $defaultIndexMethod);
 }
diff --git a/Loader/FileLoader.php b/Loader/FileLoader.php
@@ -58,7 +58,7 @@ public function import($resource, $type = null, $ignoreErrors = false, $sourceRe
         if ($ignoreNotFound = 'not_found' === $ignoreErrors) {
             $args[2] = false;
         } elseif (!\is_bool($ignoreErrors)) {
-            @trigger_error(sprintf('Invalid argument $ignoreErrors provided to %s::import(): boolean or "not_found" expected, %s given.', static::class, \gettype($ignoreErrors)), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Invalid argument $ignoreErrors provided to %s::import(): boolean or "not_found" expected, %s given.', static::class, \gettype($ignoreErrors)), \E_USER_DEPRECATED);
             $args[2] = (bool) $ignoreErrors;
         }
 
diff --git a/Loader/IniFileLoader.php b/Loader/IniFileLoader.php
@@ -37,7 +37,7 @@ public function load($resource, $type = null)
         }
 
         // real raw parsing
-        $result = parse_ini_file($path, true, INI_SCANNER_RAW);
+        $result = parse_ini_file($path, true, \INI_SCANNER_RAW);
 
         if (isset($result['parameters']) && \is_array($result['parameters'])) {
             foreach ($result['parameters'] as $key => $value) {
@@ -55,7 +55,7 @@ public function supports($resource, $type = null)
             return false;
         }
 
-        if (null === $type && 'ini' === pathinfo($resource, PATHINFO_EXTENSION)) {
+        if (null === $type && 'ini' === pathinfo($resource, \PATHINFO_EXTENSION)) {
             return true;
         }
 
diff --git a/Loader/PhpFileLoader.php b/Loader/PhpFileLoader.php
@@ -64,7 +64,7 @@ public function supports($resource, $type = null)
             return false;
         }
 
-        if (null === $type && 'php' === pathinfo($resource, PATHINFO_EXTENSION)) {
+        if (null === $type && 'php' === pathinfo($resource, \PATHINFO_EXTENSION)) {
             return true;
         }
 
diff --git a/Loader/XmlFileLoader.php b/Loader/XmlFileLoader.php
@@ -81,7 +81,7 @@ public function supports($resource, $type = null)
             return false;
         }
 
-        if (null === $type && 'xml' === pathinfo($resource, PATHINFO_EXTENSION)) {
+        if (null === $type && 'xml' === pathinfo($resource, \PATHINFO_EXTENSION)) {
             return true;
         }
 
@@ -634,7 +634,7 @@ public function validateSchema(\DOMDocument $dom)
 EOF
         ;
 
-        if (LIBXML_VERSION < 20900) {
+        if (\LIBXML_VERSION < 20900) {
             $disableEntities = libxml_disable_entity_loader(false);
             $valid = @$dom->schemaValidateSource($source);
             libxml_disable_entity_loader($disableEntities);
diff --git a/Loader/YamlFileLoader.php b/Loader/YamlFileLoader.php
@@ -166,7 +166,7 @@ public function supports($resource, $type = null)
             return false;
         }
 
-        if (null === $type && \in_array(pathinfo($resource, PATHINFO_EXTENSION), ['yaml', 'yml'], true)) {
+        if (null === $type && \in_array(pathinfo($resource, \PATHINFO_EXTENSION), ['yaml', 'yml'], true)) {
             return true;
         }
 
@@ -637,7 +637,7 @@ private function parseCallable($callable, string $parameter, string $id, string
             if (false !== strpos($callable, ':') && false === strpos($callable, '::')) {
                 $parts = explode(':', $callable);
 
-                @trigger_error(sprintf('Using short %s syntax for service "%s" is deprecated since Symfony 4.4, use "[\'@%s\', \'%s\']" instead.', $parameter, $id, ...$parts), E_USER_DEPRECATED);
+                @trigger_error(sprintf('Using short %s syntax for service "%s" is deprecated since Symfony 4.4, use "[\'@%s\', \'%s\']" instead.', $parameter, $id, ...$parts), \E_USER_DEPRECATED);
 
                 return [$this->resolveServices('@'.$parts[0], $file), $parts[1]];
             }
diff --git a/ParameterBag/EnvPlaceholderParameterBag.php b/ParameterBag/EnvPlaceholderParameterBag.php
@@ -55,7 +55,7 @@ public function get($name)
                     //throw new RuntimeException(sprintf('The default value of an env() parameter must be a string or null, but "%s" given to "%s".', \gettype($defaultValue), $name));
                     throw new RuntimeException(sprintf('The default value of an env() parameter must be scalar or null, but "%s" given to "%s".', \gettype($defaultValue), $name));
                 } elseif (is_scalar($defaultValue) && !\is_string($defaultValue)) {
-                    @trigger_error(sprintf('A non-string default value of an env() parameter is deprecated since 4.3, cast "%s" to string instead.', $name), E_USER_DEPRECATED);
+                    @trigger_error(sprintf('A non-string default value of an env() parameter is deprecated since 4.3, cast "%s" to string instead.', $name), \E_USER_DEPRECATED);
                 }
             }
 
@@ -159,14 +159,14 @@ public function resolve()
             }
             if (is_numeric($default = $this->parameters[$name])) {
                 if (!\is_string($default)) {
-                    @trigger_error(sprintf('A non-string default value of env parameter "%s" is deprecated since 4.3, cast it to string instead.', $env), E_USER_DEPRECATED);
+                    @trigger_error(sprintf('A non-string default value of env parameter "%s" is deprecated since 4.3, cast it to string instead.', $env), \E_USER_DEPRECATED);
                 }
                 $this->parameters[$name] = (string) $default;
             } elseif (null !== $default && !is_scalar($default)) { // !is_string in 5.0
                 //throw new RuntimeException(sprintf('The default value of env parameter "%s" must be a string or null, "%s" given.', $env, \gettype($default)));
                 throw new RuntimeException(sprintf('The default value of env parameter "%s" must be scalar or null, "%s" given.', $env, \gettype($default)));
             } elseif (is_scalar($default) && !\is_string($default)) {
-                @trigger_error(sprintf('A non-string default value of env parameter "%s" is deprecated since 4.3, cast it to string instead.', $env), E_USER_DEPRECATED);
+                @trigger_error(sprintf('A non-string default value of env parameter "%s" is deprecated since 4.3, cast it to string instead.', $env), \E_USER_DEPRECATED);
             }
         }
     }
diff --git a/ServiceLocator.php b/ServiceLocator.php
@@ -84,7 +84,7 @@ private function createNotFoundException(string $id): NotFoundExceptionInterface
             return new ServiceNotFoundException($id, end($this->loading) ?: null, null, [], $msg);
         }
 
-        $class = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT | DEBUG_BACKTRACE_IGNORE_ARGS, 4);
+        $class = debug_backtrace(\DEBUG_BACKTRACE_PROVIDE_OBJECT | \DEBUG_BACKTRACE_IGNORE_ARGS, 4);
         $class = isset($class[3]['object']) ? \get_class($class[3]['object']) : null;
         $externalId = $this->externalId ?: $class;
 
diff --git a/Tests/EnvVarProcessorTest.php b/Tests/EnvVarProcessorTest.php
@@ -196,7 +196,7 @@ public function validConsts()
     {
         return [
             ['Symfony\Component\DependencyInjection\Tests\EnvVarProcessorTest::TEST_CONST', self::TEST_CONST],
-            ['E_ERROR', E_ERROR],
+            ['E_ERROR', \E_ERROR],
         ];
     }
 
diff --git a/Tests/Loader/FileLoaderTest.php b/Tests/Loader/FileLoaderTest.php
@@ -75,7 +75,7 @@ public function testImportWithGlobPattern()
                 ['foo', 'bar'],
             ],
             'mixedcase' => ['MixedCaseKey' => 'value'],
-            'constant' => PHP_EOL,
+            'constant' => \PHP_EOL,
             'bar' => '%foo%',
             'escape' => '@escapeme',
             'foo_bar' => new Reference('foo_bar'),
diff --git a/Tests/Loader/IniFileLoaderTest.php b/Tests/Loader/IniFileLoaderTest.php
diff --git a/Tests/Loader/XmlFileLoaderTest.php b/Tests/Loader/XmlFileLoaderTest.php
diff --git a/Tests/Loader/YamlFileLoaderTest.php b/Tests/Loader/YamlFileLoaderTest.php
diff --git a/TypedReference.php b/TypedReference.php

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function __construct(bool $onlyConstructorArguments = false, bool $hasPro`
`53`	`53`	`*/`
`54`	`54`	`public function setRepeatedPass(RepeatedPass $repeatedPass)`
`55`	`55`	`{`
`56`		`- @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.2.', __METHOD__), E_USER_DEPRECATED);`
	`56`	`+ @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.2.', __METHOD__), \E_USER_DEPRECATED);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class DecoratorServicePass implements CompilerPassInterface`
`29`	`29`	`public function process(ContainerBuilder $container)`
`30`	`30`	`{`
`31`	`31`	`$definitions = new \SplPriorityQueue();`
`32`		`- $order = PHP_INT_MAX;`
	`32`	`+ $order = \PHP_INT_MAX;`
`33`	`33`
`34`	`34`	`foreach ($container->getDefinitions() as $id => $definition) {`
`35`	`35`	`if (!$decorated = $definition->getDecoratedService()) {`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function __construct(AnalyzeServiceReferencesPass $analyzingPass = null)`
`43`	`43`	`*/`
`44`	`44`	`public function setRepeatedPass(RepeatedPass $repeatedPass)`
`45`	`45`	`{`
`46`		`- @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.2.', __METHOD__), E_USER_DEPRECATED);`
	`46`	`+ @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.2.', __METHOD__), \E_USER_DEPRECATED);`
`47`	`47`	`$this->repeatedPass = $repeatedPass;`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class RemoveUnusedDefinitionsPass extends AbstractRecursivePass implements Repea`
`29`	`29`	`*/`
`30`	`30`	`public function setRepeatedPass(RepeatedPass $repeatedPass)`
`31`	`31`	`{`
`32`		`- @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.2.', __METHOD__), E_USER_DEPRECATED);`
	`32`	`+ @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.2.', __METHOD__), \E_USER_DEPRECATED);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ private function getDefinitionId(string $id, ContainerBuilder $container): strin`
`62`	`62`	`$alias = $container->getAlias($id);`
`63`	`63`
`64`	`64`	`if ($alias->isDeprecated()) {`
`65`		`- @trigger_error(sprintf('%s. It is being referenced by the "%s" %s.', rtrim($alias->getDeprecationMessage($id), '. '), $this->currentId, $container->hasDefinition($this->currentId) ? 'service' : 'alias'), E_USER_DEPRECATED);`
	`65`	`+ @trigger_error(sprintf('%s. It is being referenced by the "%s" %s.', rtrim($alias->getDeprecationMessage($id), '. '), $this->currentId, $container->hasDefinition($this->currentId) ? 'service' : 'alias'), \E_USER_DEPRECATED);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`$seen = [];`
Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ public function get($id, $invalidBehavior = /* self::EXCEPTION_ON_INVALID_REFERE`
`231`	`231`	`?? ('service_container' === $id ? $this : ($this->factories[$id] ?? [$this, 'make'])($id, $invalidBehavior));`
`232`	`232`
`233`	`233`	`if (!\is_object($service) && null !== $service) {`
`234`		`- @trigger_error(sprintf('Non-object services are deprecated since Symfony 4.4, please fix the "%s" service which is of type "%s" right now.', $id, \gettype($service)), E_USER_DEPRECATED);`
	`234`	`+ @trigger_error(sprintf('Non-object services are deprecated since Symfony 4.4, please fix the "%s" service which is of type "%s" right now.', $id, \gettype($service)), \E_USER_DEPRECATED);`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`return $service;`
Original file line number	Diff line number	Diff line change
`@@ -492,7 +492,7 @@ public function getCompiler()`
`492`	`492`	`public function set($id, $service)`
`493`	`493`	`{`
`494`	`494`	`if (!\is_object($service) && null !== $service) {`
`495`		`- @trigger_error(sprintf('Non-object services are deprecated since Symfony 4.4, setting the "%s" service to a value of type "%s" should be avoided.', $id, \gettype($service)), E_USER_DEPRECATED);`
	`495`	`+ @trigger_error(sprintf('Non-object services are deprecated since Symfony 4.4, setting the "%s" service to a value of type "%s" should be avoided.', $id, \gettype($service)), \E_USER_DEPRECATED);`
`496`	`496`	`}`
`497`	`497`
`498`	`498`	`$id = (string) $id;`
`@@ -558,7 +558,7 @@ public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INV`
`558`	`558`	`$service = $this->doGet($id, $invalidBehavior);`
`559`	`559`
`560`	`560`	`if (!\is_object($service) && null !== $service) {`
`561`		`- @trigger_error(sprintf('Non-object services are deprecated since Symfony 4.4, please fix the "%s" service which is of type "%s" right now.', $id, \gettype($service)), E_USER_DEPRECATED);`
	`561`	`+ @trigger_error(sprintf('Non-object services are deprecated since Symfony 4.4, please fix the "%s" service which is of type "%s" right now.', $id, \gettype($service)), \E_USER_DEPRECATED);`
`562`	`562`	`}`
`563`	`563`
`564`	`564`	`return $service;`
`@@ -590,7 +590,7 @@ private function doGet(string $id, int $invalidBehavior = ContainerInterface::EX`
`590`	`590`	`$alias = $this->aliasDefinitions[$id];`
`591`	`591`
`592`	`592`	`if ($alias->isDeprecated()) {`
`593`		`- @trigger_error($alias->getDeprecationMessage($id), E_USER_DEPRECATED);`
	`593`	`+ @trigger_error($alias->getDeprecationMessage($id), \E_USER_DEPRECATED);`
`594`	`594`	`}`
`595`	`595`
`596`	`596`	`return $this->doGet((string) $alias, $invalidBehavior, $inlineServices, $isConstructorArgument);`
`@@ -1092,7 +1092,7 @@ private function createService(Definition $definition, array &$inlineServices, b`
`1092`	`1092`	`}`
`1093`	`1093`
`1094`	`1094`	`if ($definition->isDeprecated()) {`
`1095`		`- @trigger_error($definition->getDeprecationMessage($id), E_USER_DEPRECATED);`
	`1095`	`+ @trigger_error($definition->getDeprecationMessage($id), \E_USER_DEPRECATED);`
`1096`	`1096`	`}`
`1097`	`1097`
`1098`	`1098`	`if ($tryProxy && $definition->isLazy() && !$tryProxy = !($proxy = $this->proxyInstantiator) \|\| $proxy instanceof RealServiceInstantiator) {`
`@@ -1135,7 +1135,7 @@ private function createService(Definition $definition, array &$inlineServices, b`
`1135`	`1135`	`$r = new \ReflectionClass($factory[0]);`
`1136`	`1136`
`1137`	`1137`	`if (0 < strpos($r->getDocComment(), "\n * @deprecated ")) {`
`1138`		`- @trigger_error(sprintf('The "%s" service relies on the deprecated "%s" factory class. It should either be deprecated or its factory upgraded.', $id, $r->name), E_USER_DEPRECATED);`
	`1138`	`+ @trigger_error(sprintf('The "%s" service relies on the deprecated "%s" factory class. It should either be deprecated or its factory upgraded.', $id, $r->name), \E_USER_DEPRECATED);`
`1139`	`1139`	`}`
`1140`	`1140`	`}`
`1141`	`1141`	`} else {`
`@@ -1144,7 +1144,7 @@ private function createService(Definition $definition, array &$inlineServices, b`
`1144`	`1144`	`$service = null === $r->getConstructor() ? $r->newInstance() : $r->newInstanceArgs($arguments);`
`1145`	`1145`
`1146`	`1146`	`if (!$definition->isDeprecated() && 0 < strpos($r->getDocComment(), "\n * @deprecated ")) {`
`1147`		`- @trigger_error(sprintf('The "%s" service relies on the deprecated "%s" class. It should either be deprecated or its implementation upgraded.', $id, $r->name), E_USER_DEPRECATED);`
	`1147`	`+ @trigger_error(sprintf('The "%s" service relies on the deprecated "%s" class. It should either be deprecated or its implementation upgraded.', $id, $r->name), \E_USER_DEPRECATED);`
`1148`	`1148`	`}`
`1149`	`1149`	`}`
`1150`	`1150`
Original file line number	Diff line number	Diff line change
`@@ -186,10 +186,10 @@ public function getDecoratedService()`
`186`	`186`	`public function setClass($class)`
`187`	`187`	`{`
`188`	`188`	`if ($class instanceof Parameter) {`
`189`		`- @trigger_error(sprintf('Passing an instance of %s as class name to %s in deprecated in Symfony 4.4 and will result in a TypeError in 5.0. Please pass the string "%%%s%%" instead.', Parameter::class, __CLASS__, (string) $class), E_USER_DEPRECATED);`
	`189`	`+ @trigger_error(sprintf('Passing an instance of %s as class name to %s in deprecated in Symfony 4.4 and will result in a TypeError in 5.0. Please pass the string "%%%s%%" instead.', Parameter::class, __CLASS__, (string) $class), \E_USER_DEPRECATED);`
`190`	`190`	`}`
`191`	`191`	`if (null !== $class && !\is_string($class)) {`
`192`		`- @trigger_error(sprintf('The class name passed to %s is expected to be a string. Passing a %s is deprecated in Symfony 4.4 and will result in a TypeError in 5.0.', __CLASS__, \is_object($class) ? \get_class($class) : \gettype($class)), E_USER_DEPRECATED);`
	`192`	`+ @trigger_error(sprintf('The class name passed to %s is expected to be a string. Passing a %s is deprecated in Symfony 4.4 and will result in a TypeError in 5.0.', __CLASS__, \is_object($class) ? \get_class($class) : \gettype($class)), \E_USER_DEPRECATED);`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`$this->changes['class'] = true;`
Original file line number	Diff line number	Diff line change
`@@ -2013,7 +2013,7 @@ private function isSingleUsePrivateNode(ServiceReferenceGraphNode $node): bool`
`2013`	`2013`	`*/`
`2014`	`2014`	`private function export($value)`
`2015`	`2015`	`{`
`2016`		`- if (null !== $this->targetDirRegex && \is_string($value) && preg_match($this->targetDirRegex, $value, $matches, PREG_OFFSET_CAPTURE)) {`
	`2016`	`+ if (null !== $this->targetDirRegex && \is_string($value) && preg_match($this->targetDirRegex, $value, $matches, \PREG_OFFSET_CAPTURE)) {`
`2017`	`2017`	`$suffix = $matches[0][1] + \strlen($matches[0][0]);`
`2018`	`2018`	`$matches[0][1] += \strlen($matches[1][0]);`
`2019`	`2019`	`$prefix = $matches[0][1] ? $this->doExport(substr($value, 0, $matches[0][1]), true).'.' : '';`