Merge branch '4.4' into 5.1

nicolas-grekas · nicolas-grekas · commit 34692c873b5d · 2020-09-02T18:23:27.000+02:00
* 4.4:
  Enable "native_constant_invocation" CS rule
  Make AbstractPhpFileCacheWarmer public
diff --git a/Compiler/DecoratorServicePass.php b/Compiler/DecoratorServicePass.php
@@ -36,7 +36,7 @@ public function __construct(?string $innerId = '.inner')
     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/Dumper/PhpDumper.php b/Dumper/PhpDumper.php
@@ -2052,7 +2052,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/Dumper/Preloader.php b/Dumper/Preloader.php
@@ -27,14 +27,14 @@ public static function append(string $file, array $list): void
 
         foreach ($list as $item) {
             if (0 === strpos($item, $cacheDir)) {
-                file_put_contents($file, sprintf("require_once __DIR__.%s;\n", var_export(substr($item, \strlen($cacheDir)), true)), FILE_APPEND);
+                file_put_contents($file, sprintf("require_once __DIR__.%s;\n", var_export(substr($item, \strlen($cacheDir)), true)), \FILE_APPEND);
                 continue;
             }
 
             $classes[] = sprintf("\$classes[] = %s;\n", var_export($item, true));
         }
 
-        file_put_contents($file, sprintf("\n\$classes = [];\n%sPreloader::preload(\$classes);\n", implode('', $classes)), FILE_APPEND);
+        file_put_contents($file, sprintf("\n\$classes = [];\n%sPreloader::preload(\$classes);\n", implode('', $classes)), \FILE_APPEND);
     }
 
     public static function preload(array $classes): void
diff --git a/EnvVarProcessor.php b/EnvVarProcessor.php
@@ -192,19 +192,19 @@ public function getEnv(string $prefix, string $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(string $prefix, string $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(string $prefix, string $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/Loader/IniFileLoader.php b/Loader/IniFileLoader.php
@@ -37,7 +37,7 @@ public function load($resource, string $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, string $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, string $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
@@ -82,7 +82,7 @@ public function supports($resource, string $type = null)
             return false;
         }
 
-        if (null === $type && 'xml' === pathinfo($resource, PATHINFO_EXTENSION)) {
+        if (null === $type && 'xml' === pathinfo($resource, \PATHINFO_EXTENSION)) {
             return true;
         }
 
@@ -624,7 +624,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
@@ -167,7 +167,7 @@ public function supports($resource, string $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;
         }
 
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
@@ -53,7 +53,7 @@ public function testTypeConversionsWithNativePhp($key, $value, $supported)
             $this->markTestSkipped(sprintf('Converting the value "%s" to "%s" is not supported by the IniFileLoader.', $key, $value));
         }
 
-        $expected = parse_ini_file(__DIR__.'/../Fixtures/ini/types.ini', true, INI_SCANNER_TYPED);
+        $expected = parse_ini_file(__DIR__.'/../Fixtures/ini/types.ini', true, \INI_SCANNER_TYPED);
         $this->assertSame($value, $expected['parameters'][$key], '->load() converts values to PHP types');
     }
 
@@ -69,7 +69,7 @@ public function getTypeConversions()
             ['no', false, true],
             ['none', false, true],
             ['null', null, true],
-            ['constant', PHP_VERSION, true],
+            ['constant', \PHP_VERSION, true],
             ['12', 12, true],
             ['12_string', '12', true],
             ['12_quoted_number', 12, false], // INI_SCANNER_RAW removes the double quotes
diff --git a/Tests/Loader/XmlFileLoaderTest.php b/Tests/Loader/XmlFileLoaderTest.php
@@ -104,15 +104,15 @@ public function testParseFile()
 
     public function testLoadWithExternalEntitiesDisabled()
     {
-        if (LIBXML_VERSION < 20900) {
+        if (\LIBXML_VERSION < 20900) {
             $disableEntities = libxml_disable_entity_loader(true);
         }
 
         $containerBuilder = new ContainerBuilder();
         $loader = new XmlFileLoader($containerBuilder, new FileLocator(self::$fixturesPath.'/xml'));
         $loader->load('services2.xml');
 
-        if (LIBXML_VERSION < 20900) {
+        if (\LIBXML_VERSION < 20900) {
             libxml_disable_entity_loader($disableEntities);
         }
 
@@ -144,7 +144,7 @@ public function testLoadParameters()
                 ['foo', 'bar'],
             ],
             'mixedcase' => ['MixedCaseKey' => 'value'],
-            'constant' => PHP_EOL,
+            'constant' => \PHP_EOL,
         ];
 
         $this->assertEquals($expected, $actual, '->load() converts XML values to PHP ones');
@@ -180,7 +180,7 @@ public function testLoadImports()
                 ['foo', 'bar'],
             ],
             'mixedcase' => ['MixedCaseKey' => 'value'],
-            'constant' => PHP_EOL,
+            'constant' => \PHP_EOL,
             'bar' => '%foo%',
             'imported_from_ini' => true,
             'imported_from_yaml' => true,
diff --git a/Tests/Loader/YamlFileLoaderTest.php b/Tests/Loader/YamlFileLoaderTest.php
@@ -106,7 +106,7 @@ public function testLoadParameters()
         $container = new ContainerBuilder();
         $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
         $loader->load('services2.yml');
-        $this->assertEquals(['foo' => 'bar', 'mixedcase' => ['MixedCaseKey' => 'value'], 'values' => [true, false, 0, 1000.3, PHP_INT_MAX], 'bar' => 'foo', 'escape' => '@escapeme', 'foo_bar' => new Reference('foo_bar')], $container->getParameterBag()->all(), '->load() converts YAML keys to lowercase');
+        $this->assertEquals(['foo' => 'bar', 'mixedcase' => ['MixedCaseKey' => 'value'], 'values' => [true, false, 0, 1000.3, \PHP_INT_MAX], 'bar' => 'foo', 'escape' => '@escapeme', 'foo_bar' => new Reference('foo_bar')], $container->getParameterBag()->all(), '->load() converts YAML keys to lowercase');
     }
 
     public function testLoadImports()
@@ -124,7 +124,7 @@ public function testLoadImports()
         $actual = $container->getParameterBag()->all();
         $expected = [
             'foo' => 'bar',
-            'values' => [true, false, PHP_INT_MAX],
+            'values' => [true, false, \PHP_INT_MAX],
             'bar' => '%foo%',
             'escape' => '@escapeme',
             'foo_bar' => new Reference('foo_bar'),

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function __construct(?string $innerId = '.inner')`
`36`	`36`	`public function process(ContainerBuilder $container)`
`37`	`37`	`{`
`38`	`38`	`$definitions = new \SplPriorityQueue();`
`39`		`- $order = PHP_INT_MAX;`
	`39`	`+ $order = \PHP_INT_MAX;`
`40`	`40`
`41`	`41`	`foreach ($container->getDefinitions() as $id => $definition) {`
`42`	`42`	`if (!$decorated = $definition->getDecoratedService()) {`
Original file line number	Diff line number	Diff line change
`@@ -2052,7 +2052,7 @@ private function isSingleUsePrivateNode(ServiceReferenceGraphNode $node): bool`
`2052`	`2052`	`*/`
`2053`	`2053`	`private function export($value)`
`2054`	`2054`	`{`
`2055`		`- if (null !== $this->targetDirRegex && \is_string($value) && preg_match($this->targetDirRegex, $value, $matches, PREG_OFFSET_CAPTURE)) {`
	`2055`	`+ if (null !== $this->targetDirRegex && \is_string($value) && preg_match($this->targetDirRegex, $value, $matches, \PREG_OFFSET_CAPTURE)) {`
`2056`	`2056`	`$suffix = $matches[0][1] + \strlen($matches[0][0]);`
`2057`	`2057`	`$matches[0][1] += \strlen($matches[1][0]);`
`2058`	`2058`	`$prefix = $matches[0][1] ? $this->doExport(substr($value, 0, $matches[0][1]), true).'.' : '';`
Original file line number	Diff line number	Diff line change
`@@ -27,14 +27,14 @@ public static function append(string $file, array $list): void`
`27`	`27`
`28`	`28`	`foreach ($list as $item) {`
`29`	`29`	`if (0 === strpos($item, $cacheDir)) {`
`30`		`- file_put_contents($file, sprintf("require_once __DIR__.%s;\n", var_export(substr($item, \strlen($cacheDir)), true)), FILE_APPEND);`
	`30`	`+ file_put_contents($file, sprintf("require_once __DIR__.%s;\n", var_export(substr($item, \strlen($cacheDir)), true)), \FILE_APPEND);`
`31`	`31`	`continue;`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`$classes[] = sprintf("\$classes[] = %s;\n", var_export($item, true));`
`35`	`35`	`}`
`36`	`36`
`37`		`- file_put_contents($file, sprintf("\n\$classes = [];\n%sPreloader::preload(\$classes);\n", implode('', $classes)), FILE_APPEND);`
	`37`	`+ file_put_contents($file, sprintf("\n\$classes = [];\n%sPreloader::preload(\$classes);\n", implode('', $classes)), \FILE_APPEND);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public static function preload(array $classes): void`
Original file line number	Diff line number	Diff line change
`@@ -192,19 +192,19 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv)`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`if ('bool' === $prefix) {`
`195`		`- return (bool) (filter_var($env, FILTER_VALIDATE_BOOLEAN) ?: filter_var($env, FILTER_VALIDATE_INT) ?: filter_var($env, FILTER_VALIDATE_FLOAT));`
	`195`	`+ return (bool) (filter_var($env, \FILTER_VALIDATE_BOOLEAN) ?: filter_var($env, \FILTER_VALIDATE_INT) ?: filter_var($env, \FILTER_VALIDATE_FLOAT));`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`if ('int' === $prefix) {`
`199`		`- if (false === $env = filter_var($env, FILTER_VALIDATE_INT) ?: filter_var($env, FILTER_VALIDATE_FLOAT)) {`
	`199`	`+ if (false === $env = filter_var($env, \FILTER_VALIDATE_INT) ?: filter_var($env, \FILTER_VALIDATE_FLOAT)) {`
`200`	`200`	`throw new RuntimeException(sprintf('Non-numeric env var "%s" cannot be cast to int.', $name));`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`return (int) $env;`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`if ('float' === $prefix) {`
`207`		`- if (false === $env = filter_var($env, FILTER_VALIDATE_FLOAT)) {`
	`207`	`+ if (false === $env = filter_var($env, \FILTER_VALIDATE_FLOAT)) {`
`208`	`208`	`throw new RuntimeException(sprintf('Non-numeric env var "%s" cannot be cast to float.', $name));`
`209`	`209`	`}`
`210`	`210`
`@@ -226,7 +226,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv)`
`226`	`226`	`if ('json' === $prefix) {`
`227`	`227`	`$env = json_decode($env, true);`
`228`	`228`
`229`		`- if (JSON_ERROR_NONE !== json_last_error()) {`
	`229`	`+ if (\JSON_ERROR_NONE !== json_last_error()) {`
`230`	`230`	`throw new RuntimeException(sprintf('Invalid JSON in env var "%s": ', $name).json_last_error_msg());`
`231`	`231`	`}`
`232`	`232`
`@@ -262,7 +262,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv)`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`if ('query_string' === $prefix) {`
`265`		`- $queryString = parse_url($env, PHP_URL_QUERY) ?: $env;`
	`265`	`+ $queryString = parse_url($env, \PHP_URL_QUERY) ?: $env;`
`266`	`266`	`parse_str($queryString, $result);`
`267`	`267`
`268`	`268`	`return $result;`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function load($resource, string $type = null)`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`// real raw parsing`
`40`		`- $result = parse_ini_file($path, true, INI_SCANNER_RAW);`
	`40`	`+ $result = parse_ini_file($path, true, \INI_SCANNER_RAW);`
`41`	`41`
`42`	`42`	`if (isset($result['parameters']) && \is_array($result['parameters'])) {`
`43`	`43`	`foreach ($result['parameters'] as $key => $value) {`
`@@ -55,7 +55,7 @@ public function supports($resource, string $type = null)`
`55`	`55`	`return false;`
`56`	`56`	`}`
`57`	`57`
`58`		`- if (null === $type && 'ini' === pathinfo($resource, PATHINFO_EXTENSION)) {`
	`58`	`+ if (null === $type && 'ini' === pathinfo($resource, \PATHINFO_EXTENSION)) {`
`59`	`59`	`return true;`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public function supports($resource, string $type = null)`
`64`	`64`	`return false;`
`65`	`65`	`}`
`66`	`66`
`67`		`- if (null === $type && 'php' === pathinfo($resource, PATHINFO_EXTENSION)) {`
	`67`	`+ if (null === $type && 'php' === pathinfo($resource, \PATHINFO_EXTENSION)) {`
`68`	`68`	`return true;`
`69`	`69`	`}`
`70`	`70`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public function supports($resource, string $type = null)`
`82`	`82`	`return false;`
`83`	`83`	`}`
`84`	`84`
`85`		`- if (null === $type && 'xml' === pathinfo($resource, PATHINFO_EXTENSION)) {`
	`85`	`+ if (null === $type && 'xml' === pathinfo($resource, \PATHINFO_EXTENSION)) {`
`86`	`86`	`return true;`
`87`	`87`	`}`
`88`	`88`
`@@ -624,7 +624,7 @@ public function validateSchema(\DOMDocument $dom)`
`624`	`624`	`EOF`
`625`	`625`	`;`
`626`	`626`
`627`		`- if (LIBXML_VERSION < 20900) {`
	`627`	`+ if (\LIBXML_VERSION < 20900) {`
`628`	`628`	`$disableEntities = libxml_disable_entity_loader(false);`
`629`	`629`	`$valid = @$dom->schemaValidateSource($source);`
`630`	`630`	`libxml_disable_entity_loader($disableEntities);`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ public function supports($resource, string $type = null)`
`167`	`167`	`return false;`
`168`	`168`	`}`
`169`	`169`
`170`		`- if (null === $type && \in_array(pathinfo($resource, PATHINFO_EXTENSION), ['yaml', 'yml'], true)) {`
	`170`	`+ if (null === $type && \in_array(pathinfo($resource, \PATHINFO_EXTENSION), ['yaml', 'yml'], true)) {`
`171`	`171`	`return true;`
`172`	`172`	`}`
`173`	`173`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ private function createNotFoundException(string $id): NotFoundExceptionInterface`
`84`	`84`	`return new ServiceNotFoundException($id, end($this->loading) ?: null, null, [], $msg);`
`85`	`85`	`}`
`86`	`86`
`87`		`- $class = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT \| DEBUG_BACKTRACE_IGNORE_ARGS, 4);`
	`87`	`+ $class = debug_backtrace(\DEBUG_BACKTRACE_PROVIDE_OBJECT \| \DEBUG_BACKTRACE_IGNORE_ARGS, 4);`
`88`	`88`	`$class = isset($class[3]['object']) ? \get_class($class[3]['object']) : null;`
`89`	`89`	`$externalId = $this->externalId ?: $class;`
`90`	`90`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ public function validConsts()`
`196`	`196`	`{`
`197`	`197`	`return [`
`198`	`198`	`['Symfony\Component\DependencyInjection\Tests\EnvVarProcessorTest::TEST_CONST', self::TEST_CONST],`
`199`		`- ['E_ERROR', E_ERROR],`
	`199`	`+ ['E_ERROR', \E_ERROR],`
`200`	`200`	`];`
`201`	`201`	`}`
`202`	`202`