X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tests%2FThumbnailerTest.php;h=70519aca066892d04c6dee3c84a18db34ec536de;hb=a5a9cf23acd1248585173aa32757d9720b5f2d62;hp=08311545ef3b597f19d124aa7e6dc7286b69ae1d;hpb=ad5f47adbaee1eef85e90950ab8a45fe82959924;p=github%2Fshaarli%2FShaarli.git diff --git a/tests/ThumbnailerTest.php b/tests/ThumbnailerTest.php index 08311545..70519aca 100644 --- a/tests/ThumbnailerTest.php +++ b/tests/ThumbnailerTest.php @@ -2,7 +2,6 @@ namespace Shaarli; -use PHPUnit\Framework\TestCase; use Shaarli\Config\ConfigManager; use WebThumbnailer\Application\ConfigManager as WTConfigManager; @@ -30,7 +29,7 @@ class ThumbnailerTest extends TestCase */ protected $conf; - public function setUp() + protected function setUp(): void { $this->conf = new ConfigManager('tests/utils/config/configJson'); $this->conf->set('thumbnails.mode', Thumbnailer::MODE_ALL); @@ -43,7 +42,7 @@ class ThumbnailerTest extends TestCase WTConfigManager::addFile('tests/utils/config/wt.json'); } - public function tearDown() + protected function tearDown(): void { $this->rrmdirContent('sandbox/'); } @@ -98,15 +97,17 @@ class ThumbnailerTest extends TestCase ini_set('error_log', $oldlog); } - protected function rrmdirContent($dir) { + protected function rrmdirContent($dir) + { if (is_dir($dir)) { $objects = scandir($dir); foreach ($objects as $object) { if ($object != "." && $object != "..") { - if (is_dir($dir."/".$object)) + if (is_dir($dir."/".$object)) { $this->rrmdirContent($dir."/".$object); - else + } else { unlink($dir."/".$object); + } } } }