Merge branch '4.0' into 4.1

nicolas-grekas · nicolas-grekas · commit 6912cfebc0ea · 2018-07-26T13:24:31.000+02:00
* 4.0:
  Enable native_constant_invocation CS fixer
diff --git a/Tests/Generator/Dumper/PhpGeneratorDumperTest.php b/Tests/Generator/Dumper/PhpGeneratorDumperTest.php
@@ -46,8 +46,8 @@ protected function setUp()
 
         $this->routeCollection = new RouteCollection();
         $this->generatorDumper = new PhpGeneratorDumper($this->routeCollection);
-        $this->testTmpFilepath = sys_get_temp_dir().DIRECTORY_SEPARATOR.'php_generator.'.$this->getName().'.php';
-        $this->largeTestTmpFilepath = sys_get_temp_dir().DIRECTORY_SEPARATOR.'php_generator.'.$this->getName().'.large.php';
+        $this->testTmpFilepath = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'php_generator.'.$this->getName().'.php';
+        $this->largeTestTmpFilepath = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'php_generator.'.$this->getName().'.large.php';
         @unlink($this->testTmpFilepath);
         @unlink($this->largeTestTmpFilepath);
     }
diff --git a/Tests/Matcher/Dumper/PhpMatcherDumperTest.php b/Tests/Matcher/Dumper/PhpMatcherDumperTest.php
@@ -36,7 +36,7 @@ protected function setUp()
         parent::setUp();
 
         $this->matcherClass = uniqid('ProjectUrlMatcher');
-        $this->dumpPath = sys_get_temp_dir().DIRECTORY_SEPARATOR.'php_matcher.'.$this->matcherClass.'.php';
+        $this->dumpPath = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'php_matcher.'.$this->matcherClass.'.php';
     }
 
     protected function tearDown()

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ protected function setUp()`
`36`	`36`	`parent::setUp();`
`37`	`37`
`38`	`38`	`$this->matcherClass = uniqid('ProjectUrlMatcher');`
`39`		`- $this->dumpPath = sys_get_temp_dir().DIRECTORY_SEPARATOR.'php_matcher.'.$this->matcherClass.'.php';`
	`39`	`+ $this->dumpPath = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'php_matcher.'.$this->matcherClass.'.php';`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`protected function tearDown()`