Merge branch '4.1'

* 4.1:
  Enable native_constant_invocation CS fixer

Author: nicolas-grekas

Command/DebugCommand.php

@@ -126,7 +126,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
             $firstNamespace = false;
             foreach ($paths as $path) {
-                $rows[] = array($namespace, $path.DIRECTORY_SEPARATOR);
+                $rows[] = array($namespace, $path.\DIRECTORY_SEPARATOR);
                 $namespace = '';
             }
             if (\count($paths) > 1) {
@@ -159,7 +159,7 @@ private function getLoaderPaths()
         foreach ($loader->getNamespaces() as $namespace) {
             $paths = array_map(function ($path) {
                 if (null !== $this->projectDir && 0 === strpos($path, $this->projectDir)) {
-                    $path = ltrim(substr($path, \strlen($this->projectDir)), DIRECTORY_SEPARATOR);
+                    $path = ltrim(substr($path, \strlen($this->projectDir)), \DIRECTORY_SEPARATOR);
                 }
 
                 return $path;
@@ -272,7 +272,7 @@ private function findWrongBundleOverrides(): array
 
         if ($this->rootDir && $this->projectDir) {
             $folders = glob($this->rootDir.'/Resources/*/views', GLOB_ONLYDIR);
-            $relativePath = ltrim(substr($this->rootDir.'/Resources/', \strlen($this->projectDir)), DIRECTORY_SEPARATOR);
+            $relativePath = ltrim(substr($this->rootDir.'/Resources/', \strlen($this->projectDir)), \DIRECTORY_SEPARATOR);
             $bundleNames = array_reduce(
                 $folders,
                 function ($carry, $absolutePath) use ($relativePath) {
@@ -290,13 +290,13 @@ function ($carry, $absolutePath) use ($relativePath) {
 
         if ($this->twigDefaultPath && $this->projectDir) {
             $folders = glob($this->twigDefaultPath.'/bundles/*', GLOB_ONLYDIR);
-            $relativePath = ltrim(substr($this->twigDefaultPath.'/bundles', \strlen($this->projectDir)), DIRECTORY_SEPARATOR);
+            $relativePath = ltrim(substr($this->twigDefaultPath.'/bundles', \strlen($this->projectDir)), \DIRECTORY_SEPARATOR);
             $bundleNames = array_reduce(
                 $folders,
                 function ($carry, $absolutePath) use ($relativePath) {
                     if (0 === strpos($absolutePath, $this->projectDir)) {
-                        $path = ltrim(substr($absolutePath, \strlen($this->projectDir)), DIRECTORY_SEPARATOR);
-                        $name = ltrim(substr($path, \strlen($relativePath)), DIRECTORY_SEPARATOR);
+                        $path = ltrim(substr($absolutePath, \strlen($this->projectDir)), \DIRECTORY_SEPARATOR);
+                        $name = ltrim(substr($path, \strlen($relativePath)), \DIRECTORY_SEPARATOR);
                         $carry[$name] = $path;
                     }
 

Extension/CodeExtension.php

@@ -35,7 +35,7 @@ class CodeExtension extends AbstractExtension
     public function __construct($fileLinkFormat, string $rootDir, string $charset, string $projectDir = null)
     {
         $this->fileLinkFormat = $fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
-        $this->rootDir = str_replace('/', DIRECTORY_SEPARATOR, \dirname($rootDir)).DIRECTORY_SEPARATOR;
+        $this->rootDir = str_replace('/', \DIRECTORY_SEPARATOR, \dirname($rootDir)).\DIRECTORY_SEPARATOR;
         $this->charset = $charset;
         $this->projectDir = $projectDir;
     }
@@ -176,11 +176,11 @@ public function formatFile($file, $line, $text = null)
         $file = trim($file);
 
         if (null === $text) {
-            $text = str_replace('/', DIRECTORY_SEPARATOR, $file);
+            $text = str_replace('/', \DIRECTORY_SEPARATOR, $file);
             if (0 === strpos($text, $this->rootDir)) {
                 $text = substr($text, \strlen($this->rootDir));
-                $text = explode(DIRECTORY_SEPARATOR, $text, 2);
-                $text = sprintf('<abbr title="%s%2$s">%s</abbr>%s', $this->rootDir, $text[0], isset($text[1]) ? DIRECTORY_SEPARATOR.$text[1] : '');
+                $text = explode(\DIRECTORY_SEPARATOR, $text, 2);
+                $text = sprintf('<abbr title="%s%2$s">%s</abbr>%s', $this->rootDir, $text[0], isset($text[1]) ? \DIRECTORY_SEPARATOR.$text[1] : '');
             }
         }
 

Tests/Command/DebugCommandTest.php

@@ -39,7 +39,7 @@ public function testLineSeparatorInLoaderPaths()
             FilesystemLoader::MAIN_NAMESPACE => array('extractor', 'extractor'),
         ));
         $ret = $tester->execute(array(), array('decorated' => false));
-        $ds = DIRECTORY_SEPARATOR;
+        $ds = \DIRECTORY_SEPARATOR;
         $loaderPaths = <<<TXT
 Loader Paths
 ------------

Tests/Translation/TwigExtractorTest.php

@@ -90,7 +90,7 @@ public function testExtractSyntaxError($resources)
             $extractor->extract($resources, new MessageCatalogue('en'));
         } catch (Error $e) {
             if (method_exists($e, 'getSourceContext')) {
-                $this->assertSame(\dirname(__DIR__).strtr('/Fixtures/extractor/syntax_error.twig', '/', DIRECTORY_SEPARATOR), $e->getFile());
+                $this->assertSame(\dirname(__DIR__).strtr('/Fixtures/extractor/syntax_error.twig', '/', \DIRECTORY_SEPARATOR), $e->getFile());
                 $this->assertSame(1, $e->getLine());
                 $this->assertSame('Unclosed "block".', $e->getMessage());
             } else {