silverstripe / sspak

src/Webroot.php

Doc Comments +4 added lines, -2 removed lines

@@ -66,9 +66,8 @@ 
 
 	/**
 	 * Put the database from the given sspak file into this webroot.
-	 * @param array $details The previously sniffed details of this webroot
 	 * @param bool $dropdb Drop the DB prior to install
-	 * @param string $sspakFile Filename
+	 * @param SSPakFile $sspak Filename
 	 */
 	public function putdb($sspak, $dropdb) {
 		$details = $this->details();
@@ -135,6 +134,9 @@ 
 		fclose($stream);
 	}
 
+	/**
+	 * @param SSPakFile $sspak
+	 */
 	public function putassets($sspak) {
 		$details = $this->details();
 		$assetsPath = $details['assets_path'];

Braces +12 added lines, -4 removed lines

@@ -16,7 +16,9 @@ 
 	 * Calls sniff once and then caches
 	 */
 	public function details() {
-		if(!$this->details) $this->details = $this->sniff();
+		if(!$this->details) {
+			$this->details = $this->sniff();
+		}
 		return $this->details;
 	}
 
@@ -26,7 +28,9 @@ 
 	public function sniff() {
 		global $snifferFileContent;
 
-		if(!$snifferFileContent) $snifferFileContent = file_get_contents(PACKAGE_ROOT . 'src/sspak-sniffer.php');
+		if(!$snifferFileContent) {
+			$snifferFileContent = file_get_contents(PACKAGE_ROOT . 'src/sspak-sniffer.php');
+		}
 
 		$remoteSniffer = '/tmp/sspak-sniffer-' . rand(100000,999999) . '.php';
 		$this->uploadContent($snifferFileContent, $remoteSniffer);
@@ -35,7 +39,9 @@ 
 		$this->unlink($remoteSniffer);
 
 		$parsed = @unserialize($result['output']);
-		if(!$parsed) throw new Exception("Could not parse sspak-sniffer content:\n{$result['output']}\n");
+		if(!$parsed) {
+			throw new Exception("Could not parse sspak-sniffer content:\n{$result['output']}\n");
+		}
 		return $parsed;
 	}
 
@@ -45,7 +51,9 @@ 
 	 */
 	public function execSudo($command) {
 		if($this->sudo) {
-			if(is_array($command)) $command = $this->executor->commandArrayToString($command);
+			if(is_array($command)) {
+				$command = $this->executor->commandArrayToString($command);
+			}
 			// Try running sudo without asking for a password
 			try {
 				return $this->exec("sudo -n -u " . escapeshellarg($this->sudo) . " " . $command);

Spacing +19 added lines, -19 removed lines

@@ -16,7 +16,7 @@ 
 	 * Calls sniff once and then caches
 	 */
 	public function details() {
-		if(!$this->details) $this->details = $this->sniff();
+		if (!$this->details) $this->details = $this->sniff();
 		return $this->details;
 	}
 
@@ -26,16 +26,16 @@ 
 	public function sniff() {
 		global $snifferFileContent;
 
-		if(!$snifferFileContent) $snifferFileContent = file_get_contents(PACKAGE_ROOT . 'src/sspak-sniffer.php');
+		if (!$snifferFileContent) $snifferFileContent = file_get_contents(PACKAGE_ROOT.'src/sspak-sniffer.php');
 
-		$remoteSniffer = '/tmp/sspak-sniffer-' . rand(100000,999999) . '.php';
+		$remoteSniffer = '/tmp/sspak-sniffer-'.rand(100000, 999999).'.php';
 		$this->uploadContent($snifferFileContent, $remoteSniffer);
 
 		$result = $this->execSudo(array('/usr/bin/env', 'php', $remoteSniffer, $this->path));
 		$this->unlink($remoteSniffer);
 
 		$parsed = @unserialize($result['output']);
-		if(!$parsed) throw new Exception("Could not parse sspak-sniffer content:\n{$result['output']}\n");
+		if (!$parsed) throw new Exception("Could not parse sspak-sniffer content:\n{$result['output']}\n");
 		return $parsed;
 	}
 
@@ -44,19 +44,19 @@ 
 	 * @param  string $command Shell command, either a fully escaped string or an array
 	 */
 	public function execSudo($command) {
-		if($this->sudo) {
-			if(is_array($command)) $command = $this->executor->commandArrayToString($command);
+		if ($this->sudo) {
+			if (is_array($command)) $command = $this->executor->commandArrayToString($command);
 			// Try running sudo without asking for a password
 			try {
-				return $this->exec("sudo -n -u " . escapeshellarg($this->sudo) . " " . $command);
+				return $this->exec("sudo -n -u ".escapeshellarg($this->sudo)." ".$command);
 
 			// Otherwise capture SUDO password ourselves and pass it in through STDIN
-			} catch(Exception $e) {
+			} catch (Exception $e) {
 				echo "[sspak sudo] Enter your password: ";
-				$stdin = fopen( 'php://stdin', 'r');
+				$stdin = fopen('php://stdin', 'r');
 				$password = fgets($stdin);
 
-				return $this->exec("sudo -S -p '' -u " . escapeshellarg($this->sudo) . " " . $command, array('inputContent' => $password));
+				return $this->exec("sudo -S -p '' -u ".escapeshellarg($this->sudo)." ".$command, array('inputContent' => $password));
 			}
 
 		} else {
@@ -75,8 +75,8 @@ 
 
 		// Check the database type
 		$dbFunction = 'putdb_'.$details['db_type'];
-		if(!method_exists($this,$dbFunction)) {
-			throw new Exception("Can't process database type '" . $details['db_type'] . "'");
+		if (!method_exists($this, $dbFunction)) {
+			throw new Exception("Can't process database type '".$details['db_type']."'");
 		}
 
 		// Extract DB direct from sspak file
@@ -95,7 +95,7 @@ 
 		$hostArg = '';
 		$portArg = '';
 		if (!empty($conf['db_server']) && $conf['db_server'] != 'localhost') {
-			if (strpos($conf['db_server'], ':')!==false) {
+			if (strpos($conf['db_server'], ':') !== false) {
 				// Handle "server:port" format.
 				$server = explode(':', $conf['db_server'], 2);
 				$hostArg = escapeshellarg("--host=".$server[0]);
@@ -104,9 +104,9 @@ 
 				$hostArg = escapeshellarg("--host=".$conf['db_server']);
 			}
 		}
-		$dbCommand = "create database if not exists `" . addslashes($conf['db_database']) . "`";
-		if($dropdb) {
-			$dbCommand = "drop database if exists `" . addslashes($conf['db_database']) . "`; " . $dbCommand;
+		$dbCommand = "create database if not exists `".addslashes($conf['db_database'])."`";
+		if ($dropdb) {
+			$dbCommand = "drop database if exists `".addslashes($conf['db_database'])."`; ".$dbCommand;
 		}
 
 		$this->exec("echo '$dbCommand' | mysql $usernameArg $passwordArg $hostArg $portArg");
@@ -126,7 +126,7 @@ 
 
 		// Create database if needed
 		$result = $this->exec("echo \"select count(*) from pg_catalog.pg_database where datname = $databaseArg\" | $passwordArg psql $usernameArg $hostArg $databaseArg -qt");
-		if(trim($result['output']) == '0') {
+		if (trim($result['output']) == '0') {
 			$this->exec("$passwordArg createdb $usernameArg $hostArg $databaseArg");
 		}
 
@@ -144,7 +144,7 @@ 
 		$assetsPathExec = $this->exec("if [ -L {$assetsPath} ]; then readlink -f {$assetsPath}; else echo {$assetsPath}; fi");
 		$assetsPath = trim($assetsPathExec["output"]);
 
-		$assetsOldPath = $assetsPath . '.old';
+		$assetsOldPath = $assetsPath.'.old';
 		$assetsParentArg = escapeshellarg(dirname($assetsPath));
 
 		// Move existing assets to assets.old
@@ -167,7 +167,7 @@ 
 	 */
 	public function putgit($details) {
 		$this->exec(array('git', 'clone', $details['remote'], $this->path));
-		$this->exec("cd $this->path && git checkout " . escapeshellarg($details['branch']));
+		$this->exec("cd $this->path && git checkout ".escapeshellarg($details['branch']));
 		return true;
 	}
 }