Merge branch '3.4' into 4.4

fabpot · fabpot · commit 66da73aa16b6 · 2020-10-14T11:30:35.000+02:00
* 3.4:
  [CI] Silence errors when remove file/dir on test tearDown()
diff --git a/Tests/Command/YamlLintCommandTest.php b/Tests/Command/YamlLintCommandTest.php
@@ -168,9 +168,9 @@ protected function tearDown(): void
     {
         foreach ($this->files as $file) {
             if (file_exists($file)) {
-                unlink($file);
+                @unlink($file);
             }
         }
-        rmdir(sys_get_temp_dir().'/yml-lint-test');
+        @rmdir(sys_get_temp_dir().'/yml-lint-test');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -168,9 +168,9 @@ protected function tearDown(): void`
`168`	`168`	`{`
`169`	`169`	`foreach ($this->files as $file) {`
`170`	`170`	`if (file_exists($file)) {`
`171`		`- unlink($file);`
	`171`	`+ @unlink($file);`
`172`	`172`	`}`
`173`	`173`	`}`
`174`		`- rmdir(sys_get_temp_dir().'/yml-lint-test');`
	`174`	`+ @rmdir(sys_get_temp_dir().'/yml-lint-test');`
`175`	`175`	`}`
`176`	`176`	`}`