chg: [config:bootstrap] Only get file content if config.json exists
parent
fa68d62890
commit
2859977756
|
@ -37,6 +37,7 @@ use Cake\Core\Configure\Engine\PhpConfig;
|
||||||
use Cake\Datasource\ConnectionManager;
|
use Cake\Datasource\ConnectionManager;
|
||||||
use Cake\Error\ConsoleErrorHandler;
|
use Cake\Error\ConsoleErrorHandler;
|
||||||
use Cake\Error\ErrorHandler;
|
use Cake\Error\ErrorHandler;
|
||||||
|
use Cake\Filesystem\File;
|
||||||
use Cake\Http\ServerRequest;
|
use Cake\Http\ServerRequest;
|
||||||
use Cake\Log\Log;
|
use Cake\Log\Log;
|
||||||
use Cake\Mailer\Mailer;
|
use Cake\Mailer\Mailer;
|
||||||
|
@ -88,10 +89,13 @@ try {
|
||||||
if (file_exists(CONFIG . 'app_local.php')) {
|
if (file_exists(CONFIG . 'app_local.php')) {
|
||||||
Configure::load('app_local', 'default');
|
Configure::load('app_local', 'default');
|
||||||
//Configure::load('cerebrate', 'default', true);
|
//Configure::load('cerebrate', 'default', true);
|
||||||
$settings = file_get_contents(CONFIG . 'config.json');
|
$settingsFile = new File(CONFIG . 'config.json');
|
||||||
$settings = json_decode($settings, true);
|
if ($settingsFile->exists()) {
|
||||||
foreach ($settings as $path => $setting) {
|
$settings = file_get_contents(CONFIG . 'config.json');
|
||||||
Configure::write($path, $setting);
|
$settings = json_decode($settings, true);
|
||||||
|
foreach ($settings as $path => $setting) {
|
||||||
|
Configure::write($path, $setting);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue