Skip to content

Commit 39c0321

Browse files
Merge branch '6.4' into 7.0
* 6.4: Use typed properties in tests as much as possible
2 parents 6f6ec0d + 47924c7 commit 39c0321

File tree

2 files changed

+7
-22
lines changed

2 files changed

+7
-22
lines changed

Tests/FilesystemTestCase.php

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,14 @@
1616

1717
class FilesystemTestCase extends TestCase
1818
{
19-
private $umask;
19+
protected array $longPathNamesWindows = [];
20+
protected Filesystem $filesystem;
21+
protected string $workspace;
2022

21-
protected $longPathNamesWindows = [];
23+
private int $umask;
2224

23-
/**
24-
* @var Filesystem
25-
*/
26-
protected $filesystem;
27-
28-
/**
29-
* @var string
30-
*/
31-
protected $workspace;
32-
33-
/**
34-
* @var bool|null Flag for hard links on Windows
35-
*/
36-
private static $linkOnWindows;
37-
38-
/**
39-
* @var bool|null Flag for symbolic links on Windows
40-
*/
41-
private static $symlinkOnWindows;
25+
private static ?bool $linkOnWindows = null;
26+
private static ?bool $symlinkOnWindows = null;
4227

4328
public static function setUpBeforeClass(): void
4429
{

Tests/PathTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
class PathTest extends TestCase
2323
{
24-
protected $storedEnv = [];
24+
protected array $storedEnv = [];
2525

2626
protected function setUp(): void
2727
{

0 commit comments

Comments
 (0)