Skip to content

Commit cbe4dea

Browse files
Merge branch '5.1' into 5.x
* 5.1: [Contracts] add branch-aliases for dev-main [Cache] Make Redis initializers static [Messenger] Fixed typos in Connection [CI] Fixed build on AppVeyor Fix tests typo [Lock] Reset Key lifetime time before we acquire it [CI] Silence errors when remove file/dir on test tearDown() Fix tests Remove content-type check on toArray methods
2 parents b4c853a + 0bb5d4a commit cbe4dea

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Tests/Command/XliffLintCommandTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ protected function tearDown(): void
121121
{
122122
foreach ($this->files as $file) {
123123
if (file_exists($file)) {
124-
unlink($file);
124+
@unlink($file);
125125
}
126126
}
127-
rmdir(sys_get_temp_dir().'/xliff-lint-test');
127+
@rmdir(sys_get_temp_dir().'/xliff-lint-test');
128128
}
129129
}

Tests/Command/YamlLintCommandTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,9 @@ protected function tearDown(): void
168168
{
169169
foreach ($this->files as $file) {
170170
if (file_exists($file)) {
171-
unlink($file);
171+
@unlink($file);
172172
}
173173
}
174-
rmdir(sys_get_temp_dir().'/yml-lint-test');
174+
@rmdir(sys_get_temp_dir().'/yml-lint-test');
175175
}
176176
}

0 commit comments

Comments
 (0)