From 35bc3dad3114df649ad269b8ebbf5dcfbf368c6a Mon Sep 17 00:00:00 2001 From: Ondrej Huta Date: Wed, 27 Nov 2013 11:42:34 +0100 Subject: [PATCH 1/2] Fix the SettingsController 5.4 call --- PHPCI/Controller/SettingsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Controller/SettingsController.php b/PHPCI/Controller/SettingsController.php index 9fce197d..d5b4a894 100644 --- a/PHPCI/Controller/SettingsController.php +++ b/PHPCI/Controller/SettingsController.php @@ -101,7 +101,7 @@ class SettingsController extends Controller $dumper = new Dumper(); $yaml = $dumper->dump($this->settings); file_put_contents(APPLICATION_PATH . 'PHPCI/config.yml', $yaml); - if(error_get_last()) return error_get_last()['message']; + if ($error_get_last = error_get_last()) { return $error_get_last['message']; } } protected function getGithubForm() From 77cfd1e5b2c713b92211981b022ac4f513f9c776 Mon Sep 17 00:00:00 2001 From: Ondrej Huta Date: Wed, 27 Nov 2013 11:54:17 +0100 Subject: [PATCH 2/2] Fix the SettingsController 5.4 call (refactor) --- PHPCI/Controller/SettingsController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PHPCI/Controller/SettingsController.php b/PHPCI/Controller/SettingsController.php index d5b4a894..6f8f544c 100644 --- a/PHPCI/Controller/SettingsController.php +++ b/PHPCI/Controller/SettingsController.php @@ -101,7 +101,10 @@ class SettingsController extends Controller $dumper = new Dumper(); $yaml = $dumper->dump($this->settings); file_put_contents(APPLICATION_PATH . 'PHPCI/config.yml', $yaml); - if ($error_get_last = error_get_last()) { return $error_get_last['message']; } + if (error_get_last()) { + $error_get_last = error_get_last(); + return $error_get_last['message']; + } } protected function getGithubForm()