Skip to content

Commit 596d12b

Browse files
Merge branch '3.4' into 4.1
* 3.4: [php_cs] disable fopen_flags [DI] fix error in dumped container [CS] Remove unused variables passed to closures [DI] fix dumping setters before their inlined instances [CS] Remove empty comment [CS] Enforces null type hint on last position in phpDocs [CS] Use combined assignment operators when possible Fix a typo in error messages Don't return early as this bypasses the auto exit feature [Console] Add missing null to input values allowed types [PHPUnitBridge] Fix microtime() format bumped Symfony version to 3.4.17 updated VERSION for 3.4.16 updated CHANGELOG for 3.4.16 bumped Symfony version to 2.8.47 update CONTRIBUTORS for 2.8.46 updated VERSION for 2.8.46 updated CHANGELOG for 2.8.46
2 parents a10ae71 + d69930f commit 596d12b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Tests/FilesystemTestCase.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ class FilesystemTestCase extends TestCase
3131
protected $workspace = null;
3232

3333
/**
34-
* @var null|bool Flag for hard links on Windows
34+
* @var bool|null Flag for hard links on Windows
3535
*/
3636
private static $linkOnWindows = null;
3737

3838
/**
39-
* @var null|bool Flag for symbolic links on Windows
39+
* @var bool|null Flag for symbolic links on Windows
4040
*/
4141
private static $symlinkOnWindows = null;
4242

0 commit comments

Comments
 (0)