From 199ceeadbf0a3bcc5f184ca714facc3bec402b91 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Sun, 10 Feb 2019 13:09:38 +0100 Subject: [PATCH] Adding ConfigCacheLoaderTest --- src/Core/Config/ConfigCacheLoader.php | 8 - tests/Util/VFSTrait.php | 2 +- tests/datasets/config/.htconfig.test.php | 13 ++ tests/datasets/config/local.config.php | 27 +++ tests/datasets/config/local.ini.php | 16 ++ .../src/Core/Config/ConfigCacheLoaderTest.php | 184 ++++++++++++++++++ 6 files changed, 241 insertions(+), 9 deletions(-) create mode 100644 tests/datasets/config/.htconfig.test.php create mode 100644 tests/datasets/config/local.config.php create mode 100644 tests/datasets/config/local.ini.php create mode 100644 tests/src/Core/Config/ConfigCacheLoaderTest.php diff --git a/src/Core/Config/ConfigCacheLoader.php b/src/Core/Config/ConfigCacheLoader.php index 0b8761415..3a6a3c803 100644 --- a/src/Core/Config/ConfigCacheLoader.php +++ b/src/Core/Config/ConfigCacheLoader.php @@ -160,10 +160,6 @@ class ConfigCacheLoader */ private function loadINIConfigFile($filepath) { - if (!file_exists($filepath)) { - throw new \Exception('Error parsing non-existent INI config file ' . $filepath); - } - $contents = include($filepath); $config = parse_ini_string($contents, true, INI_SCANNER_TYPED); @@ -193,10 +189,6 @@ class ConfigCacheLoader */ private function loadConfigFile($filepath) { - if (!file_exists($filepath)) { - throw new \Exception('Error loading non-existent config file ' . $filepath); - } - $config = include($filepath); if (!is_array($config)) { diff --git a/tests/Util/VFSTrait.php b/tests/Util/VFSTrait.php index 50999b984..320d989cc 100644 --- a/tests/Util/VFSTrait.php +++ b/tests/Util/VFSTrait.php @@ -60,7 +60,7 @@ trait VFSTrait protected function delConfigFile($filename) { if ($this->root->hasChild('config/' . $filename)) { - $this->root->removeChild('config/' . $filename); + $this->root->getChild('config')->removeChild($filename); } } } diff --git a/tests/datasets/config/.htconfig.test.php b/tests/datasets/config/.htconfig.test.php new file mode 100644 index 000000000..88ba4e3ef --- /dev/null +++ b/tests/datasets/config/.htconfig.test.php @@ -0,0 +1,13 @@ + [ + 'hostname' => 'testhost', + 'username' => 'testuser', + 'password' => 'testpw', + 'database' => 'testdb', + 'charset' => 'utf8mb4', + ], + + 'config' => [ + 'admin_email' => 'admin@test.it', + 'sitename' => 'Friendica Social Network', + 'register_policy' => \Friendica\Module\Register::OPEN, + 'register_text' => '', + ], + 'system' => [ + 'default_timezone' => 'UTC', + 'language' => 'en', + ], +]; diff --git a/tests/datasets/config/local.ini.php b/tests/datasets/config/local.ini.php new file mode 100644 index 000000000..1fea0b028 --- /dev/null +++ b/tests/datasets/config/local.ini.php @@ -0,0 +1,16 @@ +setUpVfsDir(); + } + + /** + * Test the loadConfigFiles() method with default values + */ + public function testLoadConfigFiles() + { + $configCacheLoader = new ConfigCacheLoader($this->root->url()); + $configCache = new ConfigCache(); + + $configCacheLoader->loadConfigFiles($configCache); + + $this->assertEquals($this->root->url(), $configCache->get('system', 'basepath')); + } + + /** + * Test the loadConfigFiles() method with a wrong local.config.php + * @expectedException \Exception + * @expectedExceptionMessageRegExp /Error loading config file \w+/ + */ + public function testLoadConfigWrong() + { + $this->delConfigFile('local.config.php'); + + vfsStream::newFile('local.config.php') + ->at($this->root->getChild('config')) + ->setContent('root->url()); + $configCache = new ConfigCache(); + + $configCacheLoader->loadConfigFiles($configCache); + } + + /** + * Test the loadConfigFiles() method with a local.config.php file + */ + public function testLoadConfigFilesLocal() + { + $this->delConfigFile('local.config.php'); + + $file = dirname(__DIR__) . DIRECTORY_SEPARATOR . + '..' . DIRECTORY_SEPARATOR . + '..' . DIRECTORY_SEPARATOR . + 'datasets' . DIRECTORY_SEPARATOR . + 'config' . DIRECTORY_SEPARATOR . + 'local.config.php'; + + vfsStream::newFile('local.config.php') + ->at($this->root->getChild('config')) + ->setContent(file_get_contents($file)); + + $configCacheLoader = new ConfigCacheLoader($this->root->url()); + $configCache = new ConfigCache(); + + $configCacheLoader->loadConfigFiles($configCache); + + $this->assertEquals('testhost', $configCache->get('database', 'hostname')); + $this->assertEquals('testuser', $configCache->get('database', 'username')); + $this->assertEquals('testpw', $configCache->get('database', 'password')); + $this->assertEquals('testdb', $configCache->get('database', 'database')); + + $this->assertEquals('admin@test.it', $configCache->get('config', 'admin_email')); + $this->assertEquals('Friendica Social Network', $configCache->get('config', 'sitename')); + } + + /** + * Test the loadConfigFile() method with a local.ini.php file + */ + public function testLoadConfigFilesINI() + { + $this->delConfigFile('local.config.php'); + + $file = dirname(__DIR__) . DIRECTORY_SEPARATOR . + '..' . DIRECTORY_SEPARATOR . + '..' . DIRECTORY_SEPARATOR . + 'datasets' . DIRECTORY_SEPARATOR . + 'config' . DIRECTORY_SEPARATOR . + 'local.ini.php'; + + vfsStream::newFile('local.ini.php') + ->at($this->root->getChild('config')) + ->setContent(file_get_contents($file)); + + $configCacheLoader = new ConfigCacheLoader($this->root->url()); + $configCache = new ConfigCache(); + + $configCacheLoader->loadConfigFiles($configCache); + + $this->assertEquals('testhost', $configCache->get('database', 'hostname')); + $this->assertEquals('testuser', $configCache->get('database', 'username')); + $this->assertEquals('testpw', $configCache->get('database', 'password')); + $this->assertEquals('testdb', $configCache->get('database', 'database')); + + $this->assertEquals('admin@test.it', $configCache->get('config', 'admin_email')); + } + + /** + * Test the loadConfigFile() method with a .htconfig.php file + */ + public function testLoadConfigFilesHtconfig() + { + $this->delConfigFile('local.config.php'); + + $file = dirname(__DIR__) . DIRECTORY_SEPARATOR . + '..' . DIRECTORY_SEPARATOR . + '..' . DIRECTORY_SEPARATOR . + 'datasets' . DIRECTORY_SEPARATOR . + 'config' . DIRECTORY_SEPARATOR . + '.htconfig.test.php'; + + vfsStream::newFile('.htconfig.php') + ->at($this->root) + ->setContent(file_get_contents($file)); + + $configCacheLoader = new ConfigCacheLoader($this->root->url()); + $configCache = new ConfigCache(); + + $configCacheLoader->loadConfigFiles($configCache); + + $this->assertEquals('testhost', $configCache->get('database', 'hostname')); + $this->assertEquals('testuser', $configCache->get('database', 'username')); + $this->assertEquals('testpw', $configCache->get('database', 'password')); + $this->assertEquals('testdb', $configCache->get('database', 'database')); + + $this->assertEquals('/var/run/friendica.pid', $configCache->get('system', 'pidfile')); + $this->assertEquals('Europe/Berlin', $configCache->get('system', 'default_timezone')); + $this->assertEquals('fr', $configCache->get('system', 'language')); + } + + public function testLoadAddonConfig() + { + $structure = [ + 'addon' => [ + 'test' => [ + 'config' => [], + ], + ], + ]; + + vfsStream::create($structure, $this->root); + + $file = dirname(__DIR__) . DIRECTORY_SEPARATOR . + '..' . DIRECTORY_SEPARATOR . + '..' . DIRECTORY_SEPARATOR . + 'datasets' . DIRECTORY_SEPARATOR . + 'config' . DIRECTORY_SEPARATOR . + 'local.config.php'; + + vfsStream::newFile('test.config.php') + ->at($this->root->getChild('addon')->getChild('test')->getChild('config')) + ->setContent(file_get_contents($file)); + + $configCacheLoader = new ConfigCacheLoader($this->root->url()); + + $conf = $configCacheLoader->loadAddonConfig('test'); + + $this->assertEquals('testhost', $conf['database']['hostname']); + $this->assertEquals('testuser', $conf['database']['username']); + $this->assertEquals('testpw', $conf['database']['password']); + $this->assertEquals('testdb', $conf['database']['database']); + + $this->assertEquals('admin@test.it', $conf['config']['admin_email']); + } +}