From b8e932cb76daaf60836274600019f1ad6fa741fa Mon Sep 17 00:00:00 2001 From: "a.cianfarani" Date: Wed, 22 May 2013 09:58:04 +0200 Subject: [PATCH] Some coding style corrections --- PHPCI/Command/InstallCommand.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/PHPCI/Command/InstallCommand.php b/PHPCI/Command/InstallCommand.php index 8c38dc21..dea8f430 100644 --- a/PHPCI/Command/InstallCommand.php +++ b/PHPCI/Command/InstallCommand.php @@ -44,7 +44,7 @@ class InstallCommand extends Command $dbPass = $this->ask('Enter your MySQL password: ', true); $ciUrl = $this->ask('Your PHPCI URL (without trailing slash): '); // verify url format and re-ask if wrong - while(! $this->controlFormat($ciUrl,array(FILTER_VALIDATE_URL,"/[^\/]$/i"),$status)) { + while (! $this->controlFormat($ciUrl, array(FILTER_VALIDATE_URL,"/[^\/]$/i"), $status) ) { print $status; $ciUrl = $this->ask('Your PHPCI URL (without trailing slash): '); } @@ -92,15 +92,14 @@ b8\Database::setReadServers(array('{$dbHost}')); if (empty($adminEmail)) { return; - } - else { + } else { // verify e-mail format and re-ask if wrong - while (! $this->controlFormat($adminEmail,FILTER_VALIDATE_EMAIL,$status)) { + while (! $this->controlFormat($adminEmail, FILTER_VALIDATE_EMAIL, $status)) { print $status; $adminEmail = $this->ask('Enter your email address (leave blank if updating): '); } } - + $adminPass = $this->ask('Enter your desired admin password: '); $adminName = $this->ask('Enter your name: '); @@ -155,7 +154,7 @@ b8\Database::setReadServers(array('{$dbHost}')); ) ); } - if (! filter_var($valueToInspect,$filter,$options)) { + if (! filter_var($valueToInspect, $filter, $options)) { $status = false; switch ($filter) { @@ -171,6 +170,7 @@ b8\Database::setReadServers(array('{$dbHost}')); } } } + return $status; } }