EGroupware / egroupware

install-cli.php

Spacing +21 added lines, -21 removed lines

@@ -37,7 +37,7 @@ 
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  */
 
-chdir(__DIR__);	// to enable relative pathes to work
+chdir(__DIR__); // to enable relative pathes to work
 
 if (php_sapi_name() !== 'cli')	// security precaution: forbit calling setup-cli as web-page
 {
@@ -51,11 +51,11 @@ 
 $argv = $_SERVER['argv'];
 $cmd  = array_shift($argv);
 
-foreach($argv as $n => $arg)
+foreach ($argv as $n => $arg)
 {
 	if ($arg[0] === '-')
 	{
-		switch($arg)
+		switch ($arg)
 		{
 			case '-v':
 			case '--verbose':
@@ -75,7 +75,7 @@ 
 			case '--git':
 				$run_git = true;
 				unset($argv[$n]);
-				break 2;	// no further argument processing, as they are for git
+				break 2; // no further argument processing, as they are for git
 
 			default:
 				usage("Unknown argument '$arg'!");
@@ -85,7 +85,7 @@ 
 
 if (!$run_git && count($argv) > 1) usage("Too many arguments!");
 
-function usage($err=null)
+function usage($err = null)
 {
 	global $cmd;
 
@@ -107,9 +107,9 @@ 
 );
 
 // check if the necessary binaries are installed
-foreach($bins as $name => $binaries)
+foreach ($bins as $name => $binaries)
 {
-	foreach((array)$binaries as $bin)
+	foreach ((array)$binaries as $bin)
 	{
 		if (file_exists($bin) && is_executable($bin))
 		{
@@ -132,7 +132,7 @@ 
 	{
 		$bins[$name] = $$name = false;
 		error_log("Could not find $name command!");
-		if (!in_array($name, ['npm','grunt']))
+		if (!in_array($name, ['npm', 'grunt']))
 		{
 			exit(1);
 		}
@@ -144,7 +144,7 @@ 
 	}
 }
 
-if ($verbose) echo "Using following binaries: ".json_encode ($bins, JSON_UNESCAPED_SLASHES)."\n";
+if ($verbose) echo "Using following binaries: ".json_encode($bins, JSON_UNESCAPED_SLASHES)."\n";
 
 if (!extension_loaded('curl')) die("Required PHP extesion 'curl' missing! You need to install php-curl package.\n\n");
 
@@ -164,13 +164,13 @@ 
 
 if (!exec($git.' branch --no-color', $output, $ret) || $ret)
 {
-	foreach($output as $line)
+	foreach ($output as $line)
 	{
 		error_log($line);
 	}
 	exit($ret);
 }
-foreach($output as $line)
+foreach ($output as $line)
 {
 	if ($line[0] == '*')
 	{
@@ -217,7 +217,7 @@ 
 echo "Updating to: $target\n";
 
 // Update EGroupware itself and further apps installed via git
-foreach(scandir(__DIR__) as $dir)
+foreach (scandir(__DIR__) as $dir)
 {
 	if ($dir !== '..' && file_exists(__DIR__.'/'.$dir.'/.git') &&
 		// these apps / dirs are managed by composer, no need to run manual updates
@@ -275,7 +275,7 @@ 
 	$git_cmd = $git.' '.implode(' ', array_map('escapeshellarg', $argv));
 
 	$ret = 0;
-	foreach(scandir(__DIR__) as $dir)
+	foreach (scandir(__DIR__) as $dir)
 	{
 		if ($dir !== '..' && file_exists(__DIR__.'/'.$dir.'/.git'))
 		{
@@ -297,9 +297,9 @@ 
  * @param boolean $return_name =true true: just return name, false: full release object
  * @return array|string|null null if no release found
  */
-function get_latest_release($prerelease=false, $return_name=true)
+function get_latest_release($prerelease = false, $return_name = true)
 {
-	foreach(github_api('/repos/egroupware/egroupware/releases', [], 'GET') as $release)
+	foreach (github_api('/repos/egroupware/egroupware/releases', [], 'GET') as $release)
 	{
 		if ($prerelease || $release['prerelease'] === false)
 		{
@@ -319,7 +319,7 @@ 
  * @throws Exception
  * @return array with response
  */
-function github_api($_url, $data, $method='POST', $upload=null, $content_type=null)
+function github_api($_url, $data, $method = 'POST', $upload = null, $content_type = null)
 {
 	global /*$config,*/ $verbose;
 
@@ -332,7 +332,7 @@ 
 	curl_setopt($c, CURLOPT_TIMEOUT, 240);
 	curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
 
-	switch($method)
+	switch ($method)
 	{
 		case 'POST':
 			curl_setopt($c, CURLOPT_POST, true);
@@ -340,13 +340,13 @@ 
 			curl_setopt($c, CURLOPT_POSTFIELDS, $data);
 			break;
 		case 'GET':
-			if(count($data)) $url .= '?' . http_build_query($data);
+			if (count($data)) $url .= '?'.http_build_query($data);
 			break;
 		case 'FILE':
 			curl_setopt($c, CURLOPT_HTTPHEADER, array("Content-type: $content_type"));
 			curl_setopt($c, CURLOPT_POST, true);
 			curl_setopt($c, CURLOPT_POSTFIELDS, file_get_contents($upload));
-			if(count($data)) $url .= '?' . http_build_query($data);
+			if (count($data)) $url .= '?'.http_build_query($data);
 			break;
 		default:
 			throw new Exception(__FUNCTION__.": Unknown/unimplemented method=$method!");
@@ -354,7 +354,7 @@ 
 	curl_setopt($c, CURLOPT_URL, $url);
 
 	if (is_string($data)) $short_data = strlen($data) > 100 ? substr($data, 0, 100).' ...' : $data;
-	if ($verbose) echo "Sending $method request to $url ".(isset($short_data)&&$method!='GET'?$short_data:'')."\n";
+	if ($verbose) echo "Sending $method request to $url ".(isset($short_data) && $method != 'GET' ? $short_data : '')."\n";
 
 	if (($response = curl_exec($c)) === false)
 	{
@@ -362,7 +362,7 @@ 
 		curl_setopt($c, CURLOPT_HEADER, true);
 		curl_setopt($c, CURLOPT_RETURNTRANSFER, false);
 		curl_exec($c);
-		throw new Exception("$method request to $url failed ".(isset($short_data)&&$method!='GET'?$short_data:''));
+		throw new Exception("$method request to $url failed ".(isset($short_data) && $method != 'GET' ? $short_data : ''));
 	}
 
 	if ($verbose) echo (strlen($response) > 200 ? substr($response, 0, 200).' ...' : $response)."\n";

Braces +64 added lines, -16 removed lines

@@ -39,10 +39,13 @@ 
 
 chdir(__DIR__);	// to enable relative pathes to work
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling setup-cli as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling setup-cli as web-page
 {
 	die('<h1>install-cli.php must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT);
 
 // parse arguments
@@ -83,7 +86,10 @@ 
 	}
 }
 
-if (!$run_git && count($argv) > 1) usage("Too many arguments!");
+if (!$run_git && count($argv) > 1)
+{
+	usage("Too many arguments!");
+}
 
 function usage($err=null)
 {
@@ -144,9 +150,15 @@ 
 	}
 }
 
-if ($verbose) echo "Using following binaries: ".json_encode ($bins, JSON_UNESCAPED_SLASHES)."\n";
+if ($verbose)
+{
+	echo "Using following binaries: ".json_encode ($bins, JSON_UNESCAPED_SLASHES)."\n";
+}
 
-if (!extension_loaded('curl')) die("Required PHP extesion 'curl' missing! You need to install php-curl package.\n\n");
+if (!extension_loaded('curl'))
+{
+	die("Required PHP extesion 'curl' missing! You need to install php-curl package.\n\n");
+}
 
 // check if we are on a git clone
 $output = array();
@@ -188,7 +200,10 @@ 
 {
 	$channel = isset($matches[1]) ? 'release' : 'bugfix';
 }
-if ($verbose) echo "Currently using branch: $branch --> $channel channel\n";
+if ($verbose)
+{
+	echo "Currently using branch: $branch --> $channel channel\n";
+}
 
 if ($argv)
 {
@@ -239,24 +254,36 @@ 
 			$cmd .= "; $git pull --rebase";
 		}
 		$cmd .= "; test -z \"$($git stash list)\" || $git stash pop";
-		if ($verbose) echo "$cmd\n";
+		if ($verbose)
+		{
+			echo "$cmd\n";
+		}
 		system($cmd);
 	}
 }
 
 // update composer managed dependencies
 $cmd = $composer.' install';
-if ($verbose) echo "$cmd\n";
+if ($verbose)
+{
+	echo "$cmd\n";
+}
 system($cmd);
 
 // update npm dependencies and run grunt to minify javascript and css
 if ($npm && $grunt)
 {
 	$cmd = $npm.' install';
-	if ($verbose) echo "$cmd\n";
+	if ($verbose)
+	{
+		echo "$cmd\n";
+	}
 	system($cmd);
 
-	if ($verbose) echo "$grunt\n";
+	if ($verbose)
+	{
+		echo "$grunt\n";
+	}
 	system($grunt);
 }
 
@@ -284,7 +311,10 @@ 
 			error_log("\n>>> ".$cmd."\n");
 			system($cmd, $ret);
 			// break if command is not successful
-			if ($ret) return $ret;
+			if ($ret)
+			{
+				return $ret;
+			}
 		}
 	}
 	return $ret;
@@ -336,25 +366,40 @@ 
 	{
 		case 'POST':
 			curl_setopt($c, CURLOPT_POST, true);
-			if (is_array($data)) $data = json_encode($data, JSON_FORCE_OBJECT);
+			if (is_array($data))
+			{
+				$data = json_encode($data, JSON_FORCE_OBJECT);
+			}
 			curl_setopt($c, CURLOPT_POSTFIELDS, $data);
 			break;
 		case 'GET':
-			if(count($data)) $url .= '?' . http_build_query($data);
+			if(count($data))
+			{
+				$url .= '?' . http_build_query($data);
+			}
 			break;
 		case 'FILE':
 			curl_setopt($c, CURLOPT_HTTPHEADER, array("Content-type: $content_type"));
 			curl_setopt($c, CURLOPT_POST, true);
 			curl_setopt($c, CURLOPT_POSTFIELDS, file_get_contents($upload));
-			if(count($data)) $url .= '?' . http_build_query($data);
+			if(count($data))
+			{
+				$url .= '?' . http_build_query($data);
+			}
 			break;
 		default:
 			throw new Exception(__FUNCTION__.": Unknown/unimplemented method=$method!");
 	}
 	curl_setopt($c, CURLOPT_URL, $url);
 
-	if (is_string($data)) $short_data = strlen($data) > 100 ? substr($data, 0, 100).' ...' : $data;
-	if ($verbose) echo "Sending $method request to $url ".(isset($short_data)&&$method!='GET'?$short_data:'')."\n";
+	if (is_string($data))
+	{
+		$short_data = strlen($data) > 100 ? substr($data, 0, 100).' ...' : $data;
+	}
+	if ($verbose)
+	{
+		echo "Sending $method request to $url ".(isset($short_data)&&$method!='GET'?$short_data:'')."\n";
+	}
 
 	if (($response = curl_exec($c)) === false)
 	{
@@ -365,7 +410,10 @@ 
 		throw new Exception("$method request to $url failed ".(isset($short_data)&&$method!='GET'?$short_data:''));
 	}
 
-	if ($verbose) echo (strlen($response) > 200 ? substr($response, 0, 200).' ...' : $response)."\n";
+	if ($verbose)
+	{
+		echo (strlen($response) > 200 ? substr($response, 0, 200).' ...' : $response)."\n";
+	}
 
 	curl_close($c);