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

Make PHPCI output properly formatted JSON and Yaml files where possible, rather than one-line files.

Browse source 
Closes #547
This commit is contained in:
Marc Aschmann 2014-08-06 17:46:19 +02:00 committed by Dan Cryer
parent 91f29fb22b
commit 646d2ba3d7
3 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PHPCI/Command/InstallCommand.php
View file

@ -312,7 +312,7 @@ class InstallCommand extends Command
protected function writeConfigFile(array $config)
{
$dumper = new \Symfony\Component\Yaml\Dumper();
$yaml = $dumper->dump($config, 2);
$yaml = $dumper->dump($config, 4);
file_put_contents($this->configFilePath, $yaml);
}

12
PHPCI/Controller/PluginController.php
View file

@ -109,9 +109,19 @@ class PluginController extends \PHPCI\Controller
return json_decode($json, true);
}
/**
* Convert array to json and save composer.json
*
* @param $array
*/
protected function setComposerJson($array)
{
$json = json_encode($array);
if (defined('JSON_PRETTY_PRINT')) {
$json = json_encode($array, JSON_PRETTY_PRINT);
} else {
$json = json_encode($array);
}
file_put_contents(APPLICATION_PATH . 'composer.json', $json);
}

7
PHPCI/Controller/SettingsController.php
View file

@ -138,11 +138,16 @@ class SettingsController extends Controller
die;
}
/**
* Convert config to yaml and store to file.
* @return mixed
*/
protected function storeSettings()
{
$dumper = new Dumper();
$yaml = $dumper->dump($this->settings);
$yaml = $dumper->dump($this->settings, 4);
file_put_contents(APPLICATION_PATH . 'PHPCI/config.yml', $yaml);
if (error_get_last()) {
$error_get_last = error_get_last();
return $error_get_last['message'];