Merge branch '5.2' into 5.x

wouterj · wouterj · commit 51e0acf88bb8 · 2021-03-28T16:57:18.000+02:00
* 5.2:
  Use concrete user related classes in the tests
  [Filesystem] Fix dumpFile() method call
diff --git a/Tests/FilesystemTest.php b/Tests/FilesystemTest.php
@@ -1741,7 +1741,7 @@ public function testDumpKeepsExistingPermissionsWhenOverwritingAnExistingFile()
         file_put_contents($filename, 'FOO BAR');
         chmod($filename, 0745);
 
-        $this->filesystem->dumpFile($filename, 'bar', null);
+        $this->filesystem->dumpFile($filename, 'bar');
 
         $this->assertFilePermissions(745, $filename);
     }

Original file line number	Diff line number	Diff line change
`@@ -1741,7 +1741,7 @@ public function testDumpKeepsExistingPermissionsWhenOverwritingAnExistingFile()`
`1741`	`1741`	`file_put_contents($filename, 'FOO BAR');`
`1742`	`1742`	`chmod($filename, 0745);`
`1743`	`1743`
`1744`		`- $this->filesystem->dumpFile($filename, 'bar', null);`
	`1744`	`+ $this->filesystem->dumpFile($filename, 'bar');`
`1745`	`1745`
`1746`	`1746`	`$this->assertFilePermissions(745, $filename);`
`1747`	`1747`	`}`