From 96a98ae846ca484b8a8796deeb1303455aeed25e Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Fri, 19 Aug 2016 01:13:51 +0200 Subject: [PATCH] Don't concatenate in function declaration --- classes/Config.php | 3 ++- tests/ConfigTest.php | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/classes/Config.php b/classes/Config.php index 1feef95..7d33665 100644 --- a/classes/Config.php +++ b/classes/Config.php @@ -93,8 +93,9 @@ class Config * * @return Config */ - public static function getInstance($yamlfile = __DIR__.'/../config.yml') + public static function getInstance($yamlfile = 'config.yml') { + $yamlfile = __DIR__.'/../'.$yamlfile; if (is_null(self::$instance) || self::$instance->file != $yamlfile) { self::$instance = new Config($yamlfile); } diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php index c58b171..8ea8e84 100644 --- a/tests/ConfigTest.php +++ b/tests/ConfigTest.php @@ -16,7 +16,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase protected function setUp() { - $this->config = Config::getInstance(__DIR__.'/../config_test.yml'); + $this->config = Config::getInstance('config_test.yml'); } /** @@ -39,7 +39,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase { putenv('CONVERT=1'); Config::destroyInstance(); - $config = Config::getInstance(__DIR__.'/../config_test.yml'); + $config = Config::getInstance('config_test.yml'); $this->assertEquals($config->convert, true); } }