deblan/phpci
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Updating Settings Controller to use the configured config file, rather than assuming config.yml

Browse source
This commit is contained in:
Dan Cryer 2015-02-25 14:18:05 +00:00
parent e423c73c4e
commit 8ab098821b
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
PHPCI/Controller/SettingsController.php
View file

@ -40,7 +40,7 @@ class SettingsController extends Controller
parent::init();
$parser = new Parser();
$yaml = file_get_contents(APPLICATION_PATH . 'PHPCI/config.yml');
$yaml = file_get_contents(PHPCI_CONFIG_FILE);
$this->settings = $parser->parse($yaml);
}
@ -76,6 +76,7 @@ class SettingsController extends Controller
$authSettings = $this->settings['phpci']['authentication_settings'];
}
$this->view->configFile = PHPCI_CONFIG_FILE;
$this->view->basicSettings = $this->getBasicForm($basicSettings);
$this->view->buildSettings = $this->getBuildForm($buildSettings);
$this->view->github = $this->getGithubForm();
@ -241,7 +242,7 @@ class SettingsController extends Controller
{
$dumper = new Dumper();
$yaml = $dumper->dump($this->settings, 4);
file_put_contents(APPLICATION_PATH . 'PHPCI/config.yml', $yaml);
file_put_contents(PHPCI_CONFIG_FILE, $yaml);
if (error_get_last()) {
$error_get_last = error_get_last();
@ -386,7 +387,7 @@ class SettingsController extends Controller
*/
protected function canWriteConfig()
{
return is_writeable(APPLICATION_PATH . 'PHPCI/config.yml');
return is_writeable(PHPCI_CONFIG_FILE);
}
/**

2
bootstrap.php
View file

@ -25,6 +25,8 @@ if (!empty($configEnv)) {
$configFile = $configEnv;
}
define('PHPCI_CONFIG_FILE', $configFile);
// If we don't have a config file at all, fail at this point and tell the user to install:
if (!file_exists($configFile) && (!defined('PHPCI_IS_CONSOLE') || !PHPCI_IS_CONSOLE)) {
$message = 'PHPCI has not yet been installed - Please use the command "./console phpci:install" ';