Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit 3880541ff96d · 2020-09-02T18:08:58.000+02:00
* 3.4:
  Enable "native_constant_invocation" CS rule
  Make AbstractPhpFileCacheWarmer public
diff --git a/Definition/ArrayNode.php b/Definition/ArrayNode.php
@@ -235,7 +235,7 @@ protected function finalizeValue($value)
             }
 
             if ($child->isDeprecated()) {
-                @trigger_error($child->getDeprecationMessage($name, $this->getPath()), E_USER_DEPRECATED);
+                @trigger_error($child->getDeprecationMessage($name, $this->getPath()), \E_USER_DEPRECATED);
             }
 
             try {
@@ -305,7 +305,7 @@ protected function normalizeValue($value)
             $guesses = [];
 
             foreach (array_keys($value) as $subject) {
-                $minScore = INF;
+                $minScore = \INF;
                 foreach ($proposals as $proposal) {
                     $distance = levenshtein($subject, $proposal);
                     if ($distance <= $minScore && $distance < 3) {
diff --git a/Definition/Builder/NodeDefinition.php b/Definition/Builder/NodeDefinition.php
@@ -362,7 +362,7 @@ public function setPathSeparator(string $separator)
                     $child->setPathSeparator($separator);
                 }
             } else {
-                @trigger_error(sprintf('Not implementing the "%s::getChildNodeDefinitions()" method in "%s" is deprecated since Symfony 4.1.', ParentNodeDefinitionInterface::class, static::class), E_USER_DEPRECATED);
+                @trigger_error(sprintf('Not implementing the "%s::getChildNodeDefinitions()" method in "%s" is deprecated since Symfony 4.1.', ParentNodeDefinitionInterface::class, static::class), \E_USER_DEPRECATED);
             }
         }
 
diff --git a/Definition/Builder/TreeBuilder.php b/Definition/Builder/TreeBuilder.php
@@ -27,7 +27,7 @@ class TreeBuilder implements NodeParentInterface
     public function __construct(string $name = null, string $type = 'array', NodeBuilder $builder = null)
     {
         if (null === $name) {
-            @trigger_error('A tree builder without a root node is deprecated since Symfony 4.2 and will not be supported anymore in 5.0.', E_USER_DEPRECATED);
+            @trigger_error('A tree builder without a root node is deprecated since Symfony 4.2 and will not be supported anymore in 5.0.', \E_USER_DEPRECATED);
         } else {
             $builder = $builder ?: new NodeBuilder();
             $this->root = $builder->node($name, $type)->setParent($this);
@@ -48,7 +48,7 @@ public function __construct(string $name = null, string $type = 'array', NodeBui
      */
     public function root($name, $type = 'array', NodeBuilder $builder = null)
     {
-        @trigger_error(sprintf('The "%s()" method called for the "%s" configuration is deprecated since Symfony 4.3, pass the root name to the constructor instead.', __METHOD__, $name), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s()" method called for the "%s" configuration is deprecated since Symfony 4.3, pass the root name to the constructor instead.', __METHOD__, $name), \E_USER_DEPRECATED);
 
         $builder = $builder ?: new NodeBuilder();
 
diff --git a/Definition/Dumper/XmlReferenceDumper.php b/Definition/Dumper/XmlReferenceDumper.php
@@ -188,7 +188,7 @@ private function writeNode(NodeInterface $node, int $depth = 0, bool $root = fal
                 $commentDepth = $depth + 4 + \strlen($attrName) + 2;
                 $commentLines = explode("\n", $comment);
                 $multiline = (\count($commentLines) > 1);
-                $comment = implode(PHP_EOL.str_repeat(' ', $commentDepth), $commentLines);
+                $comment = implode(\PHP_EOL.str_repeat(' ', $commentDepth), $commentLines);
 
                 if ($multiline) {
                     $this->writeLine('<!--', $depth);
@@ -259,7 +259,7 @@ private function writeLine(string $text, int $indent = 0)
         $indent = \strlen($text) + $indent;
         $format = '%'.$indent.'s';
 
-        $this->reference .= sprintf($format, $text).PHP_EOL;
+        $this->reference .= sprintf($format, $text).\PHP_EOL;
     }
 
     /**
diff --git a/Definition/VariableNode.php b/Definition/VariableNode.php
@@ -84,7 +84,7 @@ protected function finalizeValue($value)
         // deny environment variables only when using custom validators
         // this avoids ever passing an empty value to final validation closures
         if (!$this->allowEmptyValue && $this->isHandlingPlaceholder() && $this->finalValidationClosures) {
-            @trigger_error(sprintf('Setting path "%s" to an environment variable is deprecated since Symfony 4.3. Remove "cannotBeEmpty()", "validate()" or include a prefix/suffix value instead.', $this->getPath()), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Setting path "%s" to an environment variable is deprecated since Symfony 4.3. Remove "cannotBeEmpty()", "validate()" or include a prefix/suffix value instead.', $this->getPath()), \E_USER_DEPRECATED);
 //            $e = new InvalidConfigurationException(sprintf('The path "%s" cannot contain an environment variable when empty values are not allowed by definition and are validated.', $this->getPath()));
 //            if ($hint = $this->getInfo()) {
 //                $e->addHint($hint);
diff --git a/FileLocator.php b/FileLocator.php
@@ -84,7 +84,7 @@ private function isAbsolutePath(string $file): bool
                 && ':' === $file[1]
                 && ('\\' === $file[2] || '/' === $file[2])
             )
-            || null !== parse_url($file, PHP_URL_SCHEME)
+            || null !== parse_url($file, \PHP_URL_SCHEME)
         ) {
             return true;
         }
diff --git a/Loader/FileLoader.php b/Loader/FileLoader.php
@@ -74,7 +74,7 @@ public function getLocator()
     public function import($resource, $type = null, $ignoreErrors = false, $sourceResource = null/*, $exclude = null*/)
     {
         if (\func_num_args() < 5 && __CLASS__ !== static::class && 0 !== strpos(static::class, 'Symfony\Component\\') && __CLASS__ !== (new \ReflectionMethod($this, __FUNCTION__))->getDeclaringClass()->getName() && !$this instanceof \PHPUnit\Framework\MockObject\MockObject && !$this instanceof \Prophecy\Prophecy\ProphecySubjectInterface) {
-            @trigger_error(sprintf('The "%s()" method will have a new "$exclude = null" argument in version 5.0, not defining it is deprecated since Symfony 4.4.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('The "%s()" method will have a new "$exclude = null" argument in version 5.0, not defining it is deprecated since Symfony 4.4.', __METHOD__), \E_USER_DEPRECATED);
         }
         $exclude = \func_num_args() >= 5 ? func_get_arg(4) : null;
 
diff --git a/Resource/GlobResource.php b/Resource/GlobResource.php
@@ -48,7 +48,7 @@ public function __construct(string $prefix, string $pattern, bool $recursive, bo
         $this->recursive = $recursive;
         $this->forExclusion = $forExclusion;
         $this->excludedPrefixes = $excludedPrefixes;
-        $this->globBrace = \defined('GLOB_BRACE') ? GLOB_BRACE : 0;
+        $this->globBrace = \defined('GLOB_BRACE') ? \GLOB_BRACE : 0;
 
         if (false === $this->prefix) {
             throw new \InvalidArgumentException(sprintf('The path "%s" does not exist.', $prefix));
@@ -107,10 +107,10 @@ public function getIterator()
 
         if (0 !== strpos($this->prefix, 'phar://') && false === strpos($this->pattern, '/**/')) {
             if ($this->globBrace || false === strpos($this->pattern, '{')) {
-                $paths = glob($this->prefix.$this->pattern, GLOB_NOSORT | $this->globBrace);
+                $paths = glob($this->prefix.$this->pattern, \GLOB_NOSORT | $this->globBrace);
             } elseif (false === strpos($this->pattern, '\\') || !preg_match('/\\\\[,{}]/', $this->pattern)) {
                 foreach ($this->expandGlob($this->pattern) as $p) {
-                    $paths[] = glob($this->prefix.$p, GLOB_NOSORT);
+                    $paths[] = glob($this->prefix.$p, \GLOB_NOSORT);
                 }
                 $paths = array_merge(...$paths);
             }
@@ -203,7 +203,7 @@ private function computeHash(): string
 
     private function expandGlob(string $pattern): array
     {
-        $segments = preg_split('/\{([^{}]*+)\}/', $pattern, -1, PREG_SPLIT_DELIM_CAPTURE);
+        $segments = preg_split('/\{([^{}]*+)\}/', $pattern, -1, \PREG_SPLIT_DELIM_CAPTURE);
         $paths = [$segments[0]];
         $patterns = [];
 
diff --git a/ResourceCheckerConfigCache.php b/ResourceCheckerConfigCache.php
@@ -137,7 +137,7 @@ public function write($content, array $metadata = null)
             }
         }
 
-        if (\function_exists('opcache_invalidate') && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN)) {
+        if (\function_exists('opcache_invalidate') && filter_var(ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN)) {
             @opcache_invalidate($this->file, true);
         }
     }
diff --git a/Tests/Definition/ArrayNodeTest.php b/Tests/Definition/ArrayNodeTest.php
@@ -237,7 +237,7 @@ public function testSetDeprecated()
 
         $deprecationTriggered = false;
         $deprecationHandler = function ($level, $message, $file, $line) use (&$prevErrorHandler, &$deprecationTriggered) {
-            if (E_USER_DEPRECATED === $level) {
+            if (\E_USER_DEPRECATED === $level) {
                 return $deprecationTriggered = true;
             }
 
diff --git a/Tests/Definition/Dumper/XmlReferenceDumperTest.php b/Tests/Definition/Dumper/XmlReferenceDumperTest.php
@@ -35,7 +35,7 @@ public function testNamespaceDumper()
 
     private function getConfigurationAsString()
     {
-        return str_replace("\n", PHP_EOL, <<<'EOL'
+        return str_replace("\n", \PHP_EOL, <<<'EOL'
 <!-- Namespace: http://example.org/schema/dic/acme_root -->
 <!-- scalar-required: Required -->
 <!-- scalar-deprecated: Deprecated (The child node "scalar_deprecated" at path "acme_root" is deprecated.) -->
diff --git a/Tests/Definition/ScalarNodeTest.php b/Tests/Definition/ScalarNodeTest.php
@@ -54,7 +54,7 @@ public function testSetDeprecated()
 
         $deprecationTriggered = 0;
         $deprecationHandler = function ($level, $message, $file, $line) use (&$prevErrorHandler, &$deprecationTriggered) {
-            if (E_USER_DEPRECATED === $level) {
+            if (\E_USER_DEPRECATED === $level) {
                 return ++$deprecationTriggered;
             }
 
diff --git a/Tests/Loader/LoaderTest.php b/Tests/Loader/LoaderTest.php
@@ -107,7 +107,7 @@ public function load($resource, $type = null)
 
     public function supports($resource, $type = null): bool
     {
-        return \is_string($resource) && 'foo' === pathinfo($resource, PATHINFO_EXTENSION);
+        return \is_string($resource) && 'foo' === pathinfo($resource, \PATHINFO_EXTENSION);
     }
 
     public function getType()
diff --git a/Tests/Util/XmlUtilsTest.php b/Tests/Util/XmlUtilsTest.php
@@ -199,7 +199,7 @@ public function testLoadEmptyXmlFile()
     // test for issue https://github.com/symfony/symfony/issues/9731
     public function testLoadWrongEmptyXMLWithErrorHandler()
     {
-        if (LIBXML_VERSION < 20900) {
+        if (\LIBXML_VERSION < 20900) {
             $originalDisableEntities = libxml_disable_entity_loader(false);
         }
         $errorReporting = error_reporting(-1);
@@ -221,7 +221,7 @@ public function testLoadWrongEmptyXMLWithErrorHandler()
             error_reporting($errorReporting);
         }
 
-        if (LIBXML_VERSION < 20900) {
+        if (\LIBXML_VERSION < 20900) {
             $disableEntities = libxml_disable_entity_loader(true);
             libxml_disable_entity_loader($disableEntities);
 
diff --git a/Util/XmlUtils.php b/Util/XmlUtils.php
@@ -51,15 +51,15 @@ public static function parse($content, $schemaOrCallable = null)
         }
 
         $internalErrors = libxml_use_internal_errors(true);
-        if (LIBXML_VERSION < 20900) {
+        if (\LIBXML_VERSION < 20900) {
             $disableEntities = libxml_disable_entity_loader(true);
         }
         libxml_clear_errors();
 
         $dom = new \DOMDocument();
         $dom->validateOnParse = true;
-        if (!$dom->loadXML($content, LIBXML_NONET | (\defined('LIBXML_COMPACT') ? LIBXML_COMPACT : 0))) {
-            if (LIBXML_VERSION < 20900) {
+        if (!$dom->loadXML($content, \LIBXML_NONET | (\defined('LIBXML_COMPACT') ? \LIBXML_COMPACT : 0))) {
+            if (\LIBXML_VERSION < 20900) {
                 libxml_disable_entity_loader($disableEntities);
             }
 
@@ -69,12 +69,12 @@ public static function parse($content, $schemaOrCallable = null)
         $dom->normalizeDocument();
 
         libxml_use_internal_errors($internalErrors);
-        if (LIBXML_VERSION < 20900) {
+        if (\LIBXML_VERSION < 20900) {
             libxml_disable_entity_loader($disableEntities);
         }
 
         foreach ($dom->childNodes as $child) {
-            if (XML_DOCUMENT_TYPE_NODE === $child->nodeType) {
+            if (\XML_DOCUMENT_TYPE_NODE === $child->nodeType) {
                 throw new XmlParsingException('Document types are not allowed.');
             }
         }
@@ -267,7 +267,7 @@ protected static function getXmlErrors($internalErrors)
         $errors = [];
         foreach (libxml_get_errors() as $error) {
             $errors[] = sprintf('[%s %s] %s (in %s - line %d, column %d)',
-                LIBXML_ERR_WARNING == $error->level ? 'WARNING' : 'ERROR',
+                \LIBXML_ERR_WARNING == $error->level ? 'WARNING' : 'ERROR',
                 $error->code,
                 trim($error->message),
                 $error->file ?: 'n/a',

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ protected function finalizeValue($value)`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`if ($child->isDeprecated()) {`
`238`		`- @trigger_error($child->getDeprecationMessage($name, $this->getPath()), E_USER_DEPRECATED);`
	`238`	`+ @trigger_error($child->getDeprecationMessage($name, $this->getPath()), \E_USER_DEPRECATED);`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`try {`
`@@ -305,7 +305,7 @@ protected function normalizeValue($value)`
`305`	`305`	`$guesses = [];`
`306`	`306`
`307`	`307`	`foreach (array_keys($value) as $subject) {`
`308`		`- $minScore = INF;`
	`308`	`+ $minScore = \INF;`
`309`	`309`	`foreach ($proposals as $proposal) {`
`310`	`310`	`$distance = levenshtein($subject, $proposal);`
`311`	`311`	`if ($distance <= $minScore && $distance < 3) {`
Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ public function setPathSeparator(string $separator)`
`362`	`362`	`$child->setPathSeparator($separator);`
`363`	`363`	`}`
`364`	`364`	`} else {`
`365`		`- @trigger_error(sprintf('Not implementing the "%s::getChildNodeDefinitions()" method in "%s" is deprecated since Symfony 4.1.', ParentNodeDefinitionInterface::class, static::class), E_USER_DEPRECATED);`
	`365`	`+ @trigger_error(sprintf('Not implementing the "%s::getChildNodeDefinitions()" method in "%s" is deprecated since Symfony 4.1.', ParentNodeDefinitionInterface::class, static::class), \E_USER_DEPRECATED);`
`366`	`366`	`}`
`367`	`367`	`}`
`368`	`368`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ private function isAbsolutePath(string $file): bool`
`84`	`84`	`&& ':' === $file[1]`
`85`	`85`	`&& ('\\' === $file[2] \|\| '/' === $file[2])`
`86`	`86`	`)`
`87`		`- \|\| null !== parse_url($file, PHP_URL_SCHEME)`
	`87`	`+ \|\| null !== parse_url($file, \PHP_URL_SCHEME)`
`88`	`88`	`) {`
`89`	`89`	`return true;`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function getLocator()`
`74`	`74`	`public function import($resource, $type = null, $ignoreErrors = false, $sourceResource = null/, $exclude = null/)`
`75`	`75`	`{`
`76`	`76`	`if (\func_num_args() < 5 && __CLASS__ !== static::class && 0 !== strpos(static::class, 'Symfony\Component\\') && __CLASS__ !== (new \ReflectionMethod($this, __FUNCTION__))->getDeclaringClass()->getName() && !$this instanceof \PHPUnit\Framework\MockObject\MockObject && !$this instanceof \Prophecy\Prophecy\ProphecySubjectInterface) {`
`77`		`- @trigger_error(sprintf('The "%s()" method will have a new "$exclude = null" argument in version 5.0, not defining it is deprecated since Symfony 4.4.', __METHOD__), E_USER_DEPRECATED);`
	`77`	`+ @trigger_error(sprintf('The "%s()" method will have a new "$exclude = null" argument in version 5.0, not defining it is deprecated since Symfony 4.4.', __METHOD__), \E_USER_DEPRECATED);`
`78`	`78`	`}`
`79`	`79`	`$exclude = \func_num_args() >= 5 ? func_get_arg(4) : null;`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ public function write($content, array $metadata = null)`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`
`140`		`- if (\function_exists('opcache_invalidate') && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN)) {`
	`140`	`+ if (\function_exists('opcache_invalidate') && filter_var(ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN)) {`
`141`	`141`	`@opcache_invalidate($this->file, true);`
`142`	`142`	`}`
`143`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ public function testSetDeprecated()`
`237`	`237`
`238`	`238`	`$deprecationTriggered = false;`
`239`	`239`	`$deprecationHandler = function ($level, $message, $file, $line) use (&$prevErrorHandler, &$deprecationTriggered) {`
`240`		`- if (E_USER_DEPRECATED === $level) {`
	`240`	`+ if (\E_USER_DEPRECATED === $level) {`
`241`	`241`	`return $deprecationTriggered = true;`
`242`	`242`	`}`
`243`	`243`