Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit 38b92b58a841 · 2019-08-08T14:07:40.000+02:00
* 4.3:
  Disable phpunit typehint patch on 4.3 branch
  Fix deprecation on 4.3
diff --git a/Tests/FilesystemTestCase.php b/Tests/FilesystemTestCase.php
@@ -40,7 +40,7 @@ class FilesystemTestCase extends TestCase
      */
     private static $symlinkOnWindows = null;
 
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         if ('\\' === \DIRECTORY_SEPARATOR) {
             self::$linkOnWindows = true;
@@ -69,7 +69,7 @@ public static function setUpBeforeClass()
         }
     }
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->umask = umask(0);
         $this->filesystem = new Filesystem();
@@ -78,7 +78,7 @@ protected function setUp()
         $this->workspace = realpath($this->workspace);
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         if (!empty($this->longPathNamesWindows)) {
             foreach ($this->longPathNamesWindows as $path) {

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class FilesystemTestCase extends TestCase`
`40`	`40`	`*/`
`41`	`41`	`private static $symlinkOnWindows = null;`
`42`	`42`
`43`		`- public static function setUpBeforeClass()`
	`43`	`+ public static function setUpBeforeClass(): void`
`44`	`44`	`{`
`45`	`45`	`if ('\\' === \DIRECTORY_SEPARATOR) {`
`46`	`46`	`self::$linkOnWindows = true;`
`@@ -69,7 +69,7 @@ public static function setUpBeforeClass()`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`- protected function setUp()`
	`72`	`+ protected function setUp(): void`
`73`	`73`	`{`
`74`	`74`	`$this->umask = umask(0);`
`75`	`75`	`$this->filesystem = new Filesystem();`
`@@ -78,7 +78,7 @@ protected function setUp()`
`78`	`78`	`$this->workspace = realpath($this->workspace);`
`79`	`79`	`}`
`80`	`80`
`81`		`- protected function tearDown()`
	`81`	`+ protected function tearDown(): void`
`82`	`82`	`{`
`83`	`83`	`if (!empty($this->longPathNamesWindows)) {`
`84`	`84`	`foreach ($this->longPathNamesWindows as $path) {`