From 3c66e56435359dc678048193e8ee239d06f79b64 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Fri, 3 Mar 2017 23:06:12 +0100 Subject: application: introduce the Shaarli\Config namespace Namespaces have been introduced with the REST API, and should be generalized to the whole codebase to manage object scope and benefit from autoloading. See: - https://secure.php.net/manual/en/language.namespaces.php - http://www.php-fig.org/psr/psr-4/ Signed-off-by: VirtualTam --- application/Updater.php | 2 ++ application/api/ApiMiddleware.php | 2 +- application/config/ConfigIO.php | 1 + application/config/ConfigJson.php | 5 +++-- application/config/ConfigManager.php | 16 ++++++---------- application/config/ConfigPhp.php | 3 ++- application/config/ConfigPlugin.php | 4 +++- composer.json | 3 ++- index.php | 3 +-- tests/ApplicationUtilsTest.php | 3 ++- tests/PluginManagerTest.php | 1 + tests/Updater/UpdaterTest.php | 4 +++- tests/api/ApiMiddlewareTest.php | 5 +++-- tests/api/controllers/GetLinkIdTest.php | 5 +++-- tests/api/controllers/GetLinksTest.php | 6 +++--- tests/api/controllers/InfoTest.php | 9 +++++---- tests/config/ConfigJsonTest.php | 11 +++++------ tests/config/ConfigManagerTest.php | 9 +++++---- tests/config/ConfigPhpTest.php | 5 ++--- tests/config/ConfigPluginTest.php | 6 ++++-- tests/plugins/PluginIssoTest.php | 1 + tests/plugins/PluginMarkdownTest.php | 1 + tests/plugins/PluginPubsubhubbubTest.php | 1 + tests/plugins/PluginQrcodeTest.php | 1 - tests/plugins/PluginReadityourselfTest.php | 1 + tests/plugins/PluginWallabagTest.php | 1 + 26 files changed, 62 insertions(+), 47 deletions(-) diff --git a/application/Updater.php b/application/Updater.php index f5ebf31a..27cb2f0a 100644 --- a/application/Updater.php +++ b/application/Updater.php @@ -1,4 +1,6 @@ conf = new \ConfigManager('tests/utils/config/configJson.json.php'); + $this->conf = new ConfigManager('tests/utils/config/configJson.json.php'); $this->conf->set('api.secret', 'NapoleonWasALizard'); $this->refDB = new \ReferenceLinkDB(); diff --git a/tests/api/controllers/GetLinkIdTest.php b/tests/api/controllers/GetLinkIdTest.php index 1b020505..45b18e6a 100644 --- a/tests/api/controllers/GetLinkIdTest.php +++ b/tests/api/controllers/GetLinkIdTest.php @@ -2,6 +2,7 @@ namespace Shaarli\Api\Controllers; +use Shaarli\Config\ConfigManager; use Slim\Container; use Slim\Http\Environment; @@ -25,7 +26,7 @@ class GetLinkIdTest extends \PHPUnit_Framework_TestCase protected static $testDatastore = 'sandbox/datastore.php'; /** - * @var \ConfigManager instance + * @var ConfigManager instance */ protected $conf; @@ -54,7 +55,7 @@ class GetLinkIdTest extends \PHPUnit_Framework_TestCase */ public function setUp() { - $this->conf = new \ConfigManager('tests/utils/config/configJson'); + $this->conf = new ConfigManager('tests/utils/config/configJson'); $this->refDB = new \ReferenceLinkDB(); $this->refDB->write(self::$testDatastore); diff --git a/tests/api/controllers/GetLinksTest.php b/tests/api/controllers/GetLinksTest.php index da54fcf1..10330cd9 100644 --- a/tests/api/controllers/GetLinksTest.php +++ b/tests/api/controllers/GetLinksTest.php @@ -1,7 +1,7 @@ conf = new \ConfigManager('tests/utils/config/configJson'); + $this->conf = new ConfigManager('tests/utils/config/configJson'); $this->refDB = new \ReferenceLinkDB(); $this->refDB->write(self::$testDatastore); diff --git a/tests/api/controllers/InfoTest.php b/tests/api/controllers/InfoTest.php index 2916eed8..4beef3f7 100644 --- a/tests/api/controllers/InfoTest.php +++ b/tests/api/controllers/InfoTest.php @@ -1,7 +1,8 @@ conf = new \ConfigManager('tests/utils/config/configJson.json.php'); + $this->conf = new ConfigManager('tests/utils/config/configJson.json.php'); $this->refDB = new \ReferenceLinkDB(); $this->refDB->write(self::$testDatastore); @@ -84,7 +85,7 @@ class InfoTest extends \PHPUnit_Framework_TestCase $this->assertEquals('Shaarli', $data['settings']['title']); $this->assertEquals('?', $data['settings']['header_link']); $this->assertEquals('UTC', $data['settings']['timezone']); - $this->assertEquals(\ConfigManager::$DEFAULT_PLUGINS, $data['settings']['enabled_plugins']); + $this->assertEquals(ConfigManager::$DEFAULT_PLUGINS, $data['settings']['enabled_plugins']); $this->assertEquals(false, $data['settings']['default_private_links']); $title = 'My links'; diff --git a/tests/config/ConfigJsonTest.php b/tests/config/ConfigJsonTest.php index 07f6ab49..3527f83d 100644 --- a/tests/config/ConfigJsonTest.php +++ b/tests/config/ConfigJsonTest.php @@ -1,11 +1,10 @@ empty array. * - * @expectedException Exception + * @expectedException \Exception * @expectedExceptionMessage An error occurred while parsing JSON file: error code #4 */ public function testReadInvalidJson() @@ -112,7 +111,7 @@ class ConfigJsonTest extends PHPUnit_Framework_TestCase /** * Write to invalid path. * - * @expectedException IOException + * @expectedException \IOException */ public function testWriteInvalidArray() { @@ -123,7 +122,7 @@ class ConfigJsonTest extends PHPUnit_Framework_TestCase /** * Write to invalid path. * - * @expectedException IOException + * @expectedException \IOException */ public function testWriteInvalidBlank() { diff --git a/tests/config/ConfigManagerTest.php b/tests/config/ConfigManagerTest.php index 436e3d67..b81be5b6 100644 --- a/tests/config/ConfigManagerTest.php +++ b/tests/config/ConfigManagerTest.php @@ -1,4 +1,5 @@