From 278d9ee2836df7d805845077f26f8cecd16f0f4f Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Thu, 9 Jun 2016 20:04:02 +0200 Subject: ConfigManager no longer uses singleton pattern --- tests/ApplicationUtilsTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/ApplicationUtilsTest.php') diff --git a/tests/ApplicationUtilsTest.php b/tests/ApplicationUtilsTest.php index f92412ba..3da72639 100644 --- a/tests/ApplicationUtilsTest.php +++ b/tests/ApplicationUtilsTest.php @@ -276,7 +276,7 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase */ public function testCheckCurrentResourcePermissions() { - $conf = ConfigManager::getInstance(); + $conf = new ConfigManager(''); $conf->set('path.thumbnails_cache', 'cache'); $conf->set('path.config', 'data/config.php'); $conf->set('path.data_dir', 'data'); @@ -290,7 +290,7 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase $this->assertEquals( array(), - ApplicationUtils::checkResourcePermissions() + ApplicationUtils::checkResourcePermissions($conf) ); } @@ -299,7 +299,7 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase */ public function testCheckCurrentResourcePermissionsErrors() { - $conf = ConfigManager::getInstance(); + $conf = new ConfigManager(''); $conf->set('path.thumbnails_cache', 'null/cache'); $conf->set('path.config', 'null/data/config.php'); $conf->set('path.data_dir', 'null/data'); @@ -322,7 +322,7 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase '"null/tmp" directory is not readable', '"null/tmp" directory is not writable' ), - ApplicationUtils::checkResourcePermissions() + ApplicationUtils::checkResourcePermissions($conf) ); } } -- cgit v1.2.3