Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit 4b9c6dc15fc1 · 2020-09-02T18:08:58.000+02:00
* 3.4:
  Enable "native_constant_invocation" CS rule
  Make AbstractPhpFileCacheWarmer public
diff --git a/Command/LintCommand.php b/Command/LintCommand.php
@@ -93,8 +93,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         // @deprecated to be removed in 5.0
         if (!$filenames) {
-            if (0 === ftell(STDIN)) {
-                @trigger_error('Piping content from STDIN to the "lint:yaml" command without passing the dash symbol "-" as argument is deprecated since Symfony 4.4.', E_USER_DEPRECATED);
+            if (0 === ftell(\STDIN)) {
+                @trigger_error('Piping content from STDIN to the "lint:yaml" command without passing the dash symbol "-" as argument is deprecated since Symfony 4.4.', \E_USER_DEPRECATED);
 
                 return $this->display($io, [$this->validate(file_get_contents('php://stdin'), $flags)]);
             }
@@ -119,7 +119,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     private function validate(string $content, int $flags, string $file = null)
     {
         $prevErrorHandler = set_error_handler(function ($level, $message, $file, $line) use (&$prevErrorHandler) {
-            if (E_USER_DEPRECATED === $level) {
+            if (\E_USER_DEPRECATED === $level) {
                 throw new ParseException($message, $this->getParser()->getRealCurrentLineNb() + 1);
             }
 
@@ -193,7 +193,7 @@ private function displayJson(SymfonyStyle $io, array $filesInfo): int
             }
         });
 
-        $io->writeln(json_encode($filesInfo, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+        $io->writeln(json_encode($filesInfo, \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES));
 
         return min($errors, 1);
     }
diff --git a/Exception/ParseException.php b/Exception/ParseException.php
@@ -121,7 +121,7 @@ private function updateRepr()
         }
 
         if (null !== $this->parsedFile) {
-            $this->message .= sprintf(' in %s', json_encode($this->parsedFile, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
+            $this->message .= sprintf(' in %s', json_encode($this->parsedFile, \JSON_UNESCAPED_SLASHES | \JSON_UNESCAPED_UNICODE));
         }
 
         if ($this->parsedLine >= 0) {
diff --git a/Inline.php b/Inline.php
@@ -162,9 +162,9 @@ public static function dump($value, int $flags = 0): string
             case ctype_digit($value):
                 return \is_string($value) ? "'$value'" : (int) $value;
             case is_numeric($value) && false === strpos($value, "\f") && false === strpos($value, "\n") && false === strpos($value, "\r") && false === strpos($value, "\t") && false === strpos($value, "\v"):
-                $locale = setlocale(LC_NUMERIC, 0);
+                $locale = setlocale(\LC_NUMERIC, 0);
                 if (false !== $locale) {
-                    setlocale(LC_NUMERIC, 'C');
+                    setlocale(\LC_NUMERIC, 'C');
                 }
                 if (\is_float($value)) {
                     $repr = (string) $value;
@@ -178,7 +178,7 @@ public static function dump($value, int $flags = 0): string
                     $repr = \is_string($value) ? "'$value'" : (string) $value;
                 }
                 if (false !== $locale) {
-                    setlocale(LC_NUMERIC, $locale);
+                    setlocale(\LC_NUMERIC, $locale);
                 }
 
                 return $repr;
@@ -289,7 +289,7 @@ public static function parseScalar(string $scalar, int $flags = 0, array $delimi
                 $i += \strlen($output);
 
                 // remove comments
-                if (Parser::preg_match('/[ \t]+#/', $output, $match, PREG_OFFSET_CAPTURE)) {
+                if (Parser::preg_match('/[ \t]+#/', $output, $match, \PREG_OFFSET_CAPTURE)) {
                     $output = substr($output, 0, $match[0][1]);
                 }
             } elseif (Parser::preg_match('/^(.*?)('.implode('|', $delimiters).')/', substr($scalar, $i), $match)) {
diff --git a/Parser.php b/Parser.php
@@ -443,7 +443,7 @@ private function doParse(string $value, int $flags)
                         }
 
                         if (false !== strpos($line, ': ')) {
-                            @trigger_error('Support for mapping keys in multi-line blocks is deprecated since Symfony 4.3 and will throw a ParseException in 5.0.', E_USER_DEPRECATED);
+                            @trigger_error('Support for mapping keys in multi-line blocks is deprecated since Symfony 4.3 and will throw a ParseException in 5.0.', \E_USER_DEPRECATED);
                         }
 
                         if ('' === trim($line)) {
@@ -1072,19 +1072,19 @@ public static function preg_match(string $pattern, string $subject, array &$matc
     {
         if (false === $ret = preg_match($pattern, $subject, $matches, $flags, $offset)) {
             switch (preg_last_error()) {
-                case PREG_INTERNAL_ERROR:
+                case \PREG_INTERNAL_ERROR:
                     $error = 'Internal PCRE error.';
                     break;
-                case PREG_BACKTRACK_LIMIT_ERROR:
+                case \PREG_BACKTRACK_LIMIT_ERROR:
                     $error = 'pcre.backtrack_limit reached.';
                     break;
-                case PREG_RECURSION_LIMIT_ERROR:
+                case \PREG_RECURSION_LIMIT_ERROR:
                     $error = 'pcre.recursion_limit reached.';
                     break;
-                case PREG_BAD_UTF8_ERROR:
+                case \PREG_BAD_UTF8_ERROR:
                     $error = 'Malformed UTF-8 data.';
                     break;
-                case PREG_BAD_UTF8_OFFSET_ERROR:
+                case \PREG_BAD_UTF8_OFFSET_ERROR:
                     $error = 'Offset doesn\'t correspond to the begin of a valid UTF-8 code point.';
                     break;
                 default:
diff --git a/Tests/InlineTest.php b/Tests/InlineTest.php
@@ -56,10 +56,10 @@ public function getTestsForParsePhpConstants()
     {
         return [
             ['!php/const Symfony\Component\Yaml\Yaml::PARSE_CONSTANT', Yaml::PARSE_CONSTANT],
-            ['!php/const PHP_INT_MAX', PHP_INT_MAX],
-            ['[!php/const PHP_INT_MAX]', [PHP_INT_MAX]],
-            ['{ foo: !php/const PHP_INT_MAX }', ['foo' => PHP_INT_MAX]],
-            ['{ !php/const PHP_INT_MAX: foo }', [PHP_INT_MAX => 'foo']],
+            ['!php/const PHP_INT_MAX', \PHP_INT_MAX],
+            ['[!php/const PHP_INT_MAX]', [\PHP_INT_MAX]],
+            ['{ foo: !php/const PHP_INT_MAX }', ['foo' => \PHP_INT_MAX]],
+            ['{ !php/const PHP_INT_MAX: foo }', [\PHP_INT_MAX => 'foo']],
             ['!php/const NULL', null],
         ];
     }
@@ -90,21 +90,21 @@ public function testDump($yaml, $value, $parseFlags = 0)
 
     public function testDumpNumericValueWithLocale()
     {
-        $locale = setlocale(LC_NUMERIC, 0);
+        $locale = setlocale(\LC_NUMERIC, 0);
         if (false === $locale) {
             $this->markTestSkipped('Your platform does not support locales.');
         }
 
         try {
             $requiredLocales = ['fr_FR.UTF-8', 'fr_FR.UTF8', 'fr_FR.utf-8', 'fr_FR.utf8', 'French_France.1252'];
-            if (false === setlocale(LC_NUMERIC, $requiredLocales)) {
+            if (false === setlocale(\LC_NUMERIC, $requiredLocales)) {
                 $this->markTestSkipped('Could not set any of required locales: '.implode(', ', $requiredLocales));
             }
 
             $this->assertEquals('1.2', Inline::dump(1.2));
-            $this->assertStringContainsStringIgnoringCase('fr', setlocale(LC_NUMERIC, 0));
+            $this->assertStringContainsStringIgnoringCase('fr', setlocale(\LC_NUMERIC, 0));
         } finally {
-            setlocale(LC_NUMERIC, $locale);
+            setlocale(\LC_NUMERIC, $locale);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -93,8 +93,8 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`93`	`93`
`94`	`94`	`// @deprecated to be removed in 5.0`
`95`	`95`	`if (!$filenames) {`
`96`		`- if (0 === ftell(STDIN)) {`
`97`		`- @trigger_error('Piping content from STDIN to the "lint:yaml" command without passing the dash symbol "-" as argument is deprecated since Symfony 4.4.', E_USER_DEPRECATED);`
	`96`	`+ if (0 === ftell(\STDIN)) {`
	`97`	`+ @trigger_error('Piping content from STDIN to the "lint:yaml" command without passing the dash symbol "-" as argument is deprecated since Symfony 4.4.', \E_USER_DEPRECATED);`
`98`	`98`
`99`	`99`	`return $this->display($io, [$this->validate(file_get_contents('php://stdin'), $flags)]);`
`100`	`100`	`}`
`@@ -119,7 +119,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`119`	`119`	`private function validate(string $content, int $flags, string $file = null)`
`120`	`120`	`{`
`121`	`121`	`$prevErrorHandler = set_error_handler(function ($level, $message, $file, $line) use (&$prevErrorHandler) {`
`122`		`- if (E_USER_DEPRECATED === $level) {`
	`122`	`+ if (\E_USER_DEPRECATED === $level) {`
`123`	`123`	`throw new ParseException($message, $this->getParser()->getRealCurrentLineNb() + 1);`
`124`	`124`	`}`
`125`	`125`
`@@ -193,7 +193,7 @@ private function displayJson(SymfonyStyle $io, array $filesInfo): int`
`193`	`193`	`}`
`194`	`194`	`});`
`195`	`195`
`196`		`- $io->writeln(json_encode($filesInfo, JSON_PRETTY_PRINT \| JSON_UNESCAPED_SLASHES));`
	`196`	`+ $io->writeln(json_encode($filesInfo, \JSON_PRETTY_PRINT \| \JSON_UNESCAPED_SLASHES));`
`197`	`197`
`198`	`198`	`return min($errors, 1);`
`199`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ private function updateRepr()`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`if (null !== $this->parsedFile) {`
`124`		`- $this->message .= sprintf(' in %s', json_encode($this->parsedFile, JSON_UNESCAPED_SLASHES \| JSON_UNESCAPED_UNICODE));`
	`124`	`+ $this->message .= sprintf(' in %s', json_encode($this->parsedFile, \JSON_UNESCAPED_SLASHES \| \JSON_UNESCAPED_UNICODE));`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`if ($this->parsedLine >= 0) {`
Original file line number	Diff line number	Diff line change
`@@ -56,10 +56,10 @@ public function getTestsForParsePhpConstants()`
`56`	`56`	`{`
`57`	`57`	`return [`
`58`	`58`	`['!php/const Symfony\Component\Yaml\Yaml::PARSE_CONSTANT', Yaml::PARSE_CONSTANT],`
`59`		`- ['!php/const PHP_INT_MAX', PHP_INT_MAX],`
`60`		`- ['[!php/const PHP_INT_MAX]', [PHP_INT_MAX]],`
`61`		`- ['{ foo: !php/const PHP_INT_MAX }', ['foo' => PHP_INT_MAX]],`
`62`		`- ['{ !php/const PHP_INT_MAX: foo }', [PHP_INT_MAX => 'foo']],`
	`59`	`+ ['!php/const PHP_INT_MAX', \PHP_INT_MAX],`
	`60`	`+ ['[!php/const PHP_INT_MAX]', [\PHP_INT_MAX]],`
	`61`	`+ ['{ foo: !php/const PHP_INT_MAX }', ['foo' => \PHP_INT_MAX]],`
	`62`	`+ ['{ !php/const PHP_INT_MAX: foo }', [\PHP_INT_MAX => 'foo']],`
`63`	`63`	`['!php/const NULL', null],`
`64`	`64`	`];`
`65`	`65`	`}`
`@@ -90,21 +90,21 @@ public function testDump($yaml, $value, $parseFlags = 0)`
`90`	`90`
`91`	`91`	`public function testDumpNumericValueWithLocale()`
`92`	`92`	`{`
`93`		`- $locale = setlocale(LC_NUMERIC, 0);`
	`93`	`+ $locale = setlocale(\LC_NUMERIC, 0);`
`94`	`94`	`if (false === $locale) {`
`95`	`95`	`$this->markTestSkipped('Your platform does not support locales.');`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`try {`
`99`	`99`	`$requiredLocales = ['fr_FR.UTF-8', 'fr_FR.UTF8', 'fr_FR.utf-8', 'fr_FR.utf8', 'French_France.1252'];`
`100`		`- if (false === setlocale(LC_NUMERIC, $requiredLocales)) {`
	`100`	`+ if (false === setlocale(\LC_NUMERIC, $requiredLocales)) {`
`101`	`101`	`$this->markTestSkipped('Could not set any of required locales: '.implode(', ', $requiredLocales));`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`$this->assertEquals('1.2', Inline::dump(1.2));`
`105`		`- $this->assertStringContainsStringIgnoringCase('fr', setlocale(LC_NUMERIC, 0));`
	`105`	`+ $this->assertStringContainsStringIgnoringCase('fr', setlocale(\LC_NUMERIC, 0));`
`106`	`106`	`} finally {`
`107`		`- setlocale(LC_NUMERIC, $locale);`
	`107`	`+ setlocale(\LC_NUMERIC, $locale);`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`