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

Built out new Display class with tests

Browse source 
Not hooked up to the Controller yet, wanted to get Travis setup.
This commit is contained in:
Josh Sherman 2013-12-28 01:13:02 -05:00
parent 99a04865e8
commit 07a95a7508
7 changed files with 386 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

41
classes/Config.php
View file

@ -41,49 +41,12 @@ class Config extends Object
* Constructor
*
* Calls the parent constructor and loads the passed file.
*
* @param string $filename optional Filename of the config
*/
public function __construct($filename = null)
public function __construct()
{
parent::__construct();
// Try to fine the configuration
if ($filename == null)
{
$filename = 'config.php';
$loaded = false;
$cwd = getcwd();
while ($loaded == false)
{
chdir(dirname($filename));
if (getcwd() == '/')
{
throw new Exception('Unable to load configuration.');
}
chdir($cwd);
$filename = '../' . $filename;
$loaded = $this->load($filename);
}
}
else
{
$this->load($filename);
}
}
/**
* Loads a configuration file
*
* @param string $filename filename of the config file
* @return boolean success of the load process
*/
public function load($filename)
{
$filename = '../config.php';
$environments = false;
$environment = false;