joshtronic/pickles
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Wrapped up unit tests on Config class

Browse source
This commit is contained in:
Josh Sherman 2014-09-30 15:58:16 -04:00
parent 2acd1b976e
commit 88a4375dd5
2 changed files with 109 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Config.php
View file

@ -121,7 +121,7 @@ class Config extends \ArrayObject
}
}
if (!isset($environment))
if (!$environment)
{
throw new \Exception('Unable to determine the environment.');
}
@ -196,14 +196,14 @@ class Config extends \ArrayObject
* Let's the parent class do all the work
*
* @static
* @param string $class name of the class to instantiate
* @return object self::$instance instance of the Config class
* @param string $file name of config to load
* @return object self::$_instance instance of the Config class
*/
public static function getInstance()
public static function getInstance($file = false)
{
if (!self::$_instance)
{
self::$_instance = new Config();
self::$_instance = new Config($file);
}
return self::$_instance;