Skip to content

Commit 0c47226

Browse files
committed
Merge branch '3.4' into 4.4
* 3.4: [CI] Silence errors when remove file/dir on test tearDown()
2 parents 6166a35 + d18c26c commit 0c47226

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

Tests/FileBagTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,9 @@ protected function setUp(): void
168168
protected function tearDown(): void
169169
{
170170
foreach (glob(sys_get_temp_dir().'/form_test/*') as $file) {
171-
unlink($file);
171+
@unlink($file);
172172
}
173173

174-
rmdir(sys_get_temp_dir().'/form_test');
174+
@rmdir(sys_get_temp_dir().'/form_test');
175175
}
176176
}

Tests/Session/Storage/MockFileSessionStorageTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ protected function tearDown(): void
4343
{
4444
array_map('unlink', glob($this->sessionDir.'/*'));
4545
if (is_dir($this->sessionDir)) {
46-
rmdir($this->sessionDir);
46+
@rmdir($this->sessionDir);
4747
}
4848
$this->sessionDir = null;
4949
$this->storage = null;

Tests/Session/Storage/NativeSessionStorageTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ protected function tearDown(): void
4747
session_write_close();
4848
array_map('unlink', glob($this->savePath.'/*'));
4949
if (is_dir($this->savePath)) {
50-
rmdir($this->savePath);
50+
@rmdir($this->savePath);
5151
}
5252

5353
$this->savePath = null;

Tests/Session/Storage/PhpBridgeSessionStorageTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ protected function tearDown(): void
4343
session_write_close();
4444
array_map('unlink', glob($this->savePath.'/*'));
4545
if (is_dir($this->savePath)) {
46-
rmdir($this->savePath);
46+
@rmdir($this->savePath);
4747
}
4848

4949
$this->savePath = null;

0 commit comments

Comments
 (0)