silverstripe / deploynaut

code/tasks/SyncProjectsAndEnvironments.php

Spacing +33 added lines, -33 removed lines

@@ -9,19 +9,19 @@ 
 		$remove = true;
 		$dryRun = true;
 
-		if($request && $request->requestVar('remove') !== null) {
-			$remove = (bool)$request->requestVar('remove');
+		if ($request && $request->requestVar('remove') !== null) {
+			$remove = (bool) $request->requestVar('remove');
 		}
 
-		if($request && $request->requestVar('dryrun') !== null) {
-			$dryRun = (bool)$request->requestVar('dryrun');
+		if ($request && $request->requestVar('dryrun') !== null) {
+			$dryRun = (bool) $request->requestVar('dryrun');
 		}
 
-		if($dryRun) {
+		if ($dryRun) {
 			echo "Running in dry run mode, no changes commited, ";
-			echo "the output shows a prediction on what will happen." . PHP_EOL;
-			echo "To skip dryrun, run the task like this:" . PHP_EOL;
-			echo "./framework/sake dev/tasks/SyncProjectsAndEnvironments dryrun=0" . PHP_EOL . PHP_EOL;
+			echo "the output shows a prediction on what will happen.".PHP_EOL;
+			echo "To skip dryrun, run the task like this:".PHP_EOL;
+			echo "./framework/sake dev/tasks/SyncProjectsAndEnvironments dryrun=0".PHP_EOL.PHP_EOL;
 			sleep(3);
 		}
 
@@ -30,7 +30,7 @@ 
 
 		// Sync projects
 		$projects = DNProject::get();
-		if($remove) {
+		if ($remove) {
 			$this->echoHeader('Removing obsolete projects');
 			$this->removeObsoleteProjects($projectPaths, $dryRun);
 		}
@@ -38,7 +38,7 @@ 
 		$this->syncProjectPaths($projectPaths, $dryRun);
 
 		$this->echoHeader('Syncing environment files');
-		foreach($projects as $project) {
+		foreach ($projects as $project) {
 			$this->echoHeader($project->Name);
 			// Sync environments for each project
 			$environmentPaths = $data->getEnvironmentPaths($project->Name);
@@ -62,13 +62,13 @@ 
 		}, $paths);
 
 		$removeList = $list->filter('Filename:not', $basePaths);
-		if($removeList->count() === 0) {
+		if ($removeList->count() === 0) {
 			return;
 		}
 
-		foreach($removeList as $remove) {
-			$this->message('Removing "' . basename($remove->Name) . '" from db');
-			if(!$dryRun) {
+		foreach ($removeList as $remove) {
+			$this->message('Removing "'.basename($remove->Name).'" from db');
+			if (!$dryRun) {
 				$removeList->remove($remove);
 			}
 		}
@@ -83,13 +83,13 @@ 
 	 */
 	protected function removeObsoleteProjects($paths, $dryrun = false) {
 		$removeList = DNProject::get()->filter('Name:not', $paths);
-		if($removeList->count() == 0) {
+		if ($removeList->count() == 0) {
 			return;
 		}
 
-		foreach($removeList as $remove) {
-			$this->message($remove->Name . ' ' . $remove->Path);
-			if(!$dryrun) {
+		foreach ($removeList as $remove) {
+			$this->message($remove->Name.' '.$remove->Path);
+			if (!$dryrun) {
 				$removeList->remove($remove);
 			}
 		}
@@ -106,22 +106,22 @@ 
 		$list = $project->Environments();
 
 		// Normalise paths in DB
-		foreach($list as $item) {
+		foreach ($list as $item) {
 			$real = realpath($item->Filename);
-			if($real && $real != $item->Filename) {
+			if ($real && $real != $item->Filename) {
 				$item->Filename = $real;
 				$item->write();
 			}
 		}
 
-		foreach($paths as $path) {
+		foreach ($paths as $path) {
 			$path = basename($path);
-			if($list->filter('Filename', $path)->count()) {
+			if ($list->filter('Filename', $path)->count()) {
 				continue;
 			}
 
-			$this->message('Adding "' . basename($path) . '" to db');
-			if(!$dryRun) {
+			$this->message('Adding "'.basename($path).'" to db');
+			if (!$dryRun) {
 				$environment = DNEnvironment::create_from_path($path);
 				$environment->ProjectID = $project->ID;
 				$environment->write();
@@ -136,10 +136,10 @@ 
 	 * @param boolean $dryRun
 	 */
 	public function syncProjectPaths($paths, $dryRun = false) {
-		foreach($paths as $path) {
-			if(!DNProject::get()->filter('Name', $path)->count()) {
+		foreach ($paths as $path) {
+			if (!DNProject::get()->filter('Name', $path)->count()) {
 				$this->message($path);
-				if(!$dryRun) {
+				if (!$dryRun) {
 					DNProject::create_from_path($path)->write();
 				}
 			}
@@ -150,20 +150,20 @@ 
 	 * @param string $text
 	 */
 	protected function message($text) {
-		if(PHP_SAPI !== 'cli') {
-			$text = '<p>' . $text . '</p>' . PHP_EOL;
+		if (PHP_SAPI !== 'cli') {
+			$text = '<p>'.$text.'</p>'.PHP_EOL;
 		}
-		echo ' - ' . $text . PHP_EOL;
+		echo ' - '.$text.PHP_EOL;
 	}
 
 	/**
 	 * @param string $text
 	 */
 	protected function echoHeader($text) {
-		if(PHP_SAPI !== 'cli') {
-			echo '<h2>' . $text . '</h2>' . PHP_EOL;
+		if (PHP_SAPI !== 'cli') {
+			echo '<h2>'.$text.'</h2>'.PHP_EOL;
 		} else {
-			echo '# ' . $text . PHP_EOL;
+			echo '# '.$text.PHP_EOL;
 		}
 	}
 }

code/model/DNBranch.php

Spacing +6 added lines, -6 removed lines

@@ -50,19 +50,19 @@ 
 	 * @return string
 	 */
 	public function Name() {
-		return (string)htmlentities($this->branch->getName());
+		return (string) htmlentities($this->branch->getName());
 	}
 
 	public function Link() {
 		// Use a get-var for branch so that it can handle unsafe chars better
-		return Controller::join_links($this->project->Link(), 'branch?name=' . urlencode($this->Name()));
+		return Controller::join_links($this->project->Link(), 'branch?name='.urlencode($this->Name()));
 	}
 
 	/**
 	 * @return string
 	 */
 	public function SHA() {
-		return (string)htmlentities($this->branch->getCommit()->getHash());
+		return (string) htmlentities($this->branch->getCommit()->getHash());
 	}
 
 	/**
@@ -78,12 +78,12 @@ 
 	 */
 	public function LastUpdated() {
 
-		if($this->_lastUpdatedCache) {
+		if ($this->_lastUpdatedCache) {
 			return $this->_lastUpdatedCache;
 		}
 		try {
 			$created = $this->branch->getCommit()->getCommitterDate();
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			//occasionally parsing will fail this is a fallback to make it still work
 			return new SS_Datetime();
 		}
@@ -103,7 +103,7 @@ 
 	 * @return string
 	 */
 	public function IsOpenByDefault() {
-		if($this->Name() == 'master') {
+		if ($this->Name() == 'master') {
 			return " open";
 		} else {
 			return "";

code/model/DNProject.php

Spacing +23 added lines, -23 removed lines

@@ -160,7 +160,7 @@ 
 		$cache = self::get_git_cache();
 		// we only need to clear the tag cache since everything else is cached by SHA, that is for commit and
 		// commit message.
-		$cache->clean(Zend_Cache::CLEANING_MODE_MATCHING_TAG, ['gitonomy', 'tags', 'project_' . $this->ID]);
+		$cache->clean(Zend_Cache::CLEANING_MODE_MATCHING_TAG, ['gitonomy', 'tags', 'project_'.$this->ID]);
 	}
 
 	/**
@@ -331,7 +331,7 @@ 
 			return true;
 		}
 
-		return (bool) $this->Environments()->filterByCallback(function ($env) use ($member) {
+		return (bool) $this->Environments()->filterByCallback(function($env) use ($member) {
 			return $env->canRestore($member);
 		})->Count();
 	}
@@ -352,7 +352,7 @@ 
 			return true;
 		}
 
-		return (bool) $this->Environments()->filterByCallback(function ($env) use ($member) {
+		return (bool) $this->Environments()->filterByCallback(function($env) use ($member) {
 			return $env->canBackup($member);
 		})->Count();
 	}
@@ -373,7 +373,7 @@ 
 			return true;
 		}
 
-		return (bool) $this->Environments()->filterByCallback(function ($env) use ($member) {
+		return (bool) $this->Environments()->filterByCallback(function($env) use ($member) {
 			return $env->canUploadArchive($member);
 		})->Count();
 	}
@@ -394,7 +394,7 @@ 
 			return true;
 		}
 
-		return (bool) $this->Environments()->filterByCallback(function ($env) use ($member) {
+		return (bool) $this->Environments()->filterByCallback(function($env) use ($member) {
 			return $env->canDownloadArchive($member);
 		})->Count();
 	}
@@ -453,7 +453,7 @@ 
 			// Key-pair is available, use it.
 			$processEnv = [
 				'IDENT_KEY' => $this->getPrivateKeyPath(),
-				'GIT_SSH' => BASE_PATH . "/deploynaut/git-deploy.sh"
+				'GIT_SSH' => BASE_PATH."/deploynaut/git-deploy.sh"
 			];
 		} else {
 			$processEnv = [];
@@ -541,7 +541,7 @@ 
 
 		$currentMember = self::$_current_member_cache;
 		return $this->Environments()
-			->filterByCallBack(function ($item) use ($currentMember) {
+			->filterByCallBack(function($item) use ($currentMember) {
 				return $item->canView($currentMember);
 			});
 	}
@@ -560,14 +560,14 @@ 
 	 * @return false|DNDeployment
 	 */
 	public function currentBuilds() {
-		if (!isset(self::$relation_cache['currentBuilds.' . $this->ID])) {
+		if (!isset(self::$relation_cache['currentBuilds.'.$this->ID])) {
 			$currentBuilds = [];
 			foreach ($this->Environments() as $env) {
 				$currentBuilds[$env->Name] = $env->CurrentBuild();
 			}
-			self::$relation_cache['currentBuilds.' . $this->ID] = $currentBuilds;
+			self::$relation_cache['currentBuilds.'.$this->ID] = $currentBuilds;
 		}
-		return self::$relation_cache['currentBuilds.' . $this->ID];
+		return self::$relation_cache['currentBuilds.'.$this->ID];
 	}
 
 	/**
@@ -808,7 +808,7 @@ 
 	 */
 	public function getPublicKeyPath() {
 		if ($privateKey = $this->getPrivateKeyPath()) {
-			return $privateKey . '.pub';
+			return $privateKey.'.pub';
 		}
 		return null;
 	}
@@ -823,7 +823,7 @@ 
 		if (!empty($keyDir)) {
 			$filter = FileNameFilter::create();
 			$name = $filter->filter($this->Name);
-			return $keyDir . '/' . $name;
+			return $keyDir.'/'.$name;
 		}
 		return null;
 	}
@@ -842,7 +842,7 @@ 
 		$filter = FileNameFilter::create();
 		$name = $filter->filter($this->Name);
 
-		return $this->DNData()->getKeyDir() . '/' . $name;
+		return $this->DNData()->getKeyDir().'/'.$name;
 	}
 
 	/**
@@ -868,7 +868,7 @@ 
 		/* Look for each whitelisted hostname */
 		foreach ($interfaces as $host => $interface) {
 			/* See if the CVS Path is for this hostname, followed by some junk (maybe a port), then the path */
-			if (preg_match('{^[^.]*' . $host . '(.*?)([/a-zA-Z].+)}', $this->CVSPath, $match)) {
+			if (preg_match('{^[^.]*'.$host.'(.*?)([/a-zA-Z].+)}', $this->CVSPath, $match)) {
 
 				$path = $match[2];
 
@@ -879,10 +879,10 @@ 
 				$components = explode('.', $host);
 
 				foreach ($regex as $pattern => $replacement) {
-					$path = preg_replace('/' . $pattern . '/', $replacement, $path);
+					$path = preg_replace('/'.$pattern.'/', $replacement, $path);
 				}
 
-				$uxurl = Controller::join_links($scheme . '://', $host, $path);
+				$uxurl = Controller::join_links($scheme.'://', $host, $path);
 
 				if (array_key_exists('commit', $interface) && $interface['commit'] == false) {
 					$commiturl = false;
@@ -1009,7 +1009,7 @@ 
 		// {@see DataObject::extendedCan()}
 		$isDone = $this->extend('isProjectReady');
 		if ($isDone && is_array($isDone)) {
-			$isDone = array_filter($isDone, function ($val) {
+			$isDone = array_filter($isDone, function($val) {
 				return !is_null($val);
 			});
 
@@ -1094,11 +1094,11 @@ 
 			return false;
 		}
 
-		$cachekey = $this->ID . '_commit_' . $sha;
+		$cachekey = $this->ID.'_commit_'.$sha;
 		$cache = self::get_git_cache();
 		if (!($result = $cache->load($cachekey))) {
 			$result = $repo->getCommit($sha);
-			$cache->save($result, $cachekey, ['gitonomy', 'commit', 'project_' . $this->ID]);
+			$cache->save($result, $cachekey, ['gitonomy', 'commit', 'project_'.$this->ID]);
 		}
 		return $result;
 	}
@@ -1108,11 +1108,11 @@ 
 	 * @return string
 	 */
 	public function getCommitMessage(\Gitonomy\Git\Commit $commit) {
-		$cachekey = $this->ID . '_message_' . $commit->getRevision();
+		$cachekey = $this->ID.'_message_'.$commit->getRevision();
 		$cache = self::get_git_cache();
 		if (!($result = $cache->load($cachekey))) {
 			$result = $commit->getMessage();
-			$cache->save($result, $cachekey, ['gitonomy', 'message', 'project_' . $this->ID]);
+			$cache->save($result, $cachekey, ['gitonomy', 'message', 'project_'.$this->ID]);
 		}
 		return $result;
 	}
@@ -1122,14 +1122,14 @@ 
 	 * @return mixed
 	 */
 	public function getCommitTags(\Gitonomy\Git\Commit $commit) {
-		$cachekey = $this->ID . '_tags_' . $commit->getRevision();
+		$cachekey = $this->ID.'_tags_'.$commit->getRevision();
 		$cache = self::get_git_cache();
 		$result = $cache->load($cachekey);
 		// we check against false, because in many cases the tag list is an empty array
 		if ($result === false) {
 			$repo = $this->getRepository();
 			$result = $tags = $repo->getReferences()->resolveTags($commit->getRevision());
-			$cache->save($result, $cachekey, ['gitonomy', 'tags', 'project_' . $this->ID]);
+			$cache->save($result, $cachekey, ['gitonomy', 'tags', 'project_'.$this->ID]);
 		}
 		return $result;
 	}

code/SS_Datetimezone.php

Indentation +2 added lines, -2 removed lines

@@ -6,8 +6,8 @@
  */
 class SS_Datetimezone extends SS_Datetime {
 	/**
-	* Returns the date in the raw SQL-format specific to a given timezone passed from the Member class, e.g. “2006-01-18 16:32:04”
-	*/
+	 * Returns the date in the raw SQL-format specific to a given timezone passed from the Member class, e.g. “2006-01-18 16:32:04”
+	 */
 	public function Nice() {
 		//instantiate new DateTime object based off received timestamp in the default timezone
 		$timestamp = new DateTime($this->value, new DateTimeZone(date_default_timezone_get()));

Braces +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 	* Returns the date in the raw SQL-format specific to a given timezone passed from the Member class, e.g. “2006-01-18 16:32:04”
 	*/
 	public function Format($format) {
-		if($this->value){
+		if($this->value) {
 			$date = new DateTime($this->value);
 			//if the current user has set a timezone that is not the default then use that
 			$member = Member::currentUser();

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
 	* Returns the date in the raw SQL-format specific to a given timezone passed from the Member class, e.g. “2006-01-18 16:32:04”
 	*/
 	public function Format($format) {
-		if($this->value){
+		if ($this->value) {
 			$date = new DateTime($this->value);
 			//if the current user has set a timezone that is not the default then use that
 			$member = $this->getCurrentCachedUser();
@@ -34,10 +34,10 @@ 
 	 */
 	protected function getCurrentCachedUser() {
 		$memberID = \Member::currentUserID();
-		if(!$memberID) {
+		if (!$memberID) {
 			return null;
 		}
-		if(!isset(self::$_cache_members[$memberID])) {
+		if (!isset(self::$_cache_members[$memberID])) {
 			self::$_cache_members[$memberID] = Member::get()->byId($memberID);
 		}
 		return self::$_cache_members[$memberID];

code/extensions/TimezoneMemberExtension.php

Braces +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 		return array_combine($timezones, $timezones);
 	}
 
-	public function updateCMSFields(FieldList $fields) {   
+	public function updateCMSFields(FieldList $fields) {
 		$fields->removeFieldFromTab('Root', 'Timezone');
 		$field = DropdownField::create(
 		  'Timezone',

code/backends/CapistranoDeploymentBackend.php

Spacing +41 added lines, -41 removed lines

@@ -25,7 +25,7 @@ 
 
 		$currentBuild = $environment->CurrentBuild();
 		$currentSha = $currentBuild ? $currentBuild->SHA : '-';
-		if($currentSha !== $options['sha']) {
+		if ($currentSha !== $options['sha']) {
 			$strategy->setChange('Code version', $currentSha, $options['sha']);
 		}
 		$strategy->setActionTitle('Confirm deployment');
@@ -66,7 +66,7 @@ 
 
 		// Use a package generator if specified, otherwise run a direct deploy, which is the default behaviour
 		// if build_filename isn't specified
-		if($this->packageGenerator) {
+		if ($this->packageGenerator) {
 			$log->write(sprintf('Using package generator "%s"', get_class($this->packageGenerator)));
 
 			try {
@@ -76,7 +76,7 @@ 
 				throw $e;
 			}
 
-			if(empty($args['build_filename'])) {
+			if (empty($args['build_filename'])) {
 				throw new RuntimeException('Failed to generate package.');
 			}
 		}
@@ -94,7 +94,7 @@ 
 				$log->write($buffer);
 			});
 
-			if(!$command->isSuccessful()) {
+			if (!$command->isSuccessful()) {
 				$self->extend('cleanupFailure', $environment, $sha, $log, $project);
 				$log->write('Warning: Cleanup failed, but fine to continue. Needs manual cleanup sometime.');
 			}
@@ -105,7 +105,7 @@ 
 		$this->enableMaintenance($environment, $log, $project);
 
 		$rolledBack = null;
-		if(!$command->isSuccessful() || !$this->smokeTest($environment, $log)) {
+		if (!$command->isSuccessful() || !$this->smokeTest($environment, $log)) {
 			$cleanupFn();
 			$this->extend('deployFailure', $environment, $sha, $log, $project);
 
@@ -171,7 +171,7 @@ 
 		$command->run(function($type, $buffer) use($log) {
 			$log->write($buffer);
 		});
-		if(!$command->isSuccessful()) {
+		if (!$command->isSuccessful()) {
 			$this->extend('maintenanceEnableFailure', $environment, $log);
 			throw new RuntimeException($command->getErrorOutput());
 		}
@@ -187,7 +187,7 @@ 
 		$command->run(function($type, $buffer) use($log) {
 			$log->write($buffer);
 		});
-		if(!$command->isSuccessful()) {
+		if (!$command->isSuccessful()) {
 			$this->extend('maintenanceDisableFailure', $environment, $log);
 			throw new RuntimeException($command->getErrorOutput());
 		}
@@ -209,25 +209,25 @@ 
 	 * @inheritdoc
 	 */
 	public function dataTransfer(DNDataTransfer $dataTransfer, DeploynautLogFile $log) {
-		if($dataTransfer->Direction == 'get') {
+		if ($dataTransfer->Direction == 'get') {
 			$this->dataTransferBackup($dataTransfer, $log);
 		} else {
 			$environment = $dataTransfer->Environment();
 			$project = $environment->Project();
-			$workingDir = TEMP_FOLDER . DIRECTORY_SEPARATOR . 'deploynaut-transfer-' . $dataTransfer->ID;
+			$workingDir = TEMP_FOLDER.DIRECTORY_SEPARATOR.'deploynaut-transfer-'.$dataTransfer->ID;
 			$archive = $dataTransfer->DataArchive();
 
 			// extract the sspak contents, we'll need these so capistrano can restore that content
 			try {
 				$archive->extractArchive($workingDir);
-			} catch(Exception $e) {
+			} catch (Exception $e) {
 				$log->write($e->getMessage());
 				throw new RuntimeException($e->getMessage());
 			}
 
 			// validate the contents match the requested transfer mode
 			$result = $archive->validateArchiveContents($dataTransfer->Mode);
-			if(!$result->valid()) {
+			if (!$result->valid()) {
 				// do some cleaning, get rid of the extracted archive lying around
 				$process = new AbortableProcess(sprintf('rm -rf %s', escapeshellarg($workingDir)));
 				$process->setTimeout(120);
@@ -257,41 +257,41 @@ 
 		$name = $environment->getFullName();
 		$env = $environment->Project()->getProcessEnv();
 
-		if(!$args) {
+		if (!$args) {
 			$args = array();
 		}
-		$args['history_path'] = realpath(DEPLOYNAUT_LOG_PATH . '/');
+		$args['history_path'] = realpath(DEPLOYNAUT_LOG_PATH.'/');
 		$args['environment_id'] = $environment->ID;
 
 		// Inject env string directly into the command.
 		// Capistrano doesn't like the $process->setEnv($env) we'd normally do below.
 		$envString = '';
-		if(!empty($env)) {
+		if (!empty($env)) {
 			$envString .= 'env ';
-			foreach($env as $key => $value) {
+			foreach ($env as $key => $value) {
 				$envString .= "$key=\"$value\" ";
 			}
 		}
 
 		$data = DNData::inst();
 		// Generate a capfile from a template
-		$capTemplate = file_get_contents(BASE_PATH . '/deploynaut/Capfile.template');
+		$capTemplate = file_get_contents(BASE_PATH.'/deploynaut/Capfile.template');
 		$cap = str_replace(
 			array('<config root>', '<ssh key>', '<base path>'),
 			array($data->getEnvironmentDir(), DEPLOYNAUT_SSH_KEY, BASE_PATH),
 			$capTemplate
 		);
 
-		if(defined('DEPLOYNAUT_CAPFILE')) {
+		if (defined('DEPLOYNAUT_CAPFILE')) {
 			$capFile = DEPLOYNAUT_CAPFILE;
 		} else {
-			$capFile = ASSETS_PATH . '/Capfile';
+			$capFile = ASSETS_PATH.'/Capfile';
 		}
 		file_put_contents($capFile, $cap);
 
-		$command = "{$envString}cap -f " . escapeshellarg($capFile) . " -vv $name $action ROLES=$roles";
-		foreach($args as $argName => $argVal) {
-			$command .= ' -s ' . escapeshellarg($argName) . '=' . escapeshellarg($argVal);
+		$command = "{$envString}cap -f ".escapeshellarg($capFile)." -vv $name $action ROLES=$roles";
+		foreach ($args as $argName => $argVal) {
+			$command .= ' -s '.escapeshellarg($argName).'='.escapeshellarg($argVal);
 		}
 
 		$log->write(sprintf('Running command: %s', $command));
@@ -325,16 +325,16 @@ 
 		$filepathBase = $dataArchive->generateFilepath($dataTransfer);
 		mkdir($filepathBase, 0700, true);
 
-		$databasePath = $filepathBase . DIRECTORY_SEPARATOR . 'database.sql.gz';
+		$databasePath = $filepathBase.DIRECTORY_SEPARATOR.'database.sql.gz';
 
 		// Backup database
-		if(in_array($dataTransfer->Mode, array('all', 'db'))) {
+		if (in_array($dataTransfer->Mode, array('all', 'db'))) {
 			$log->write(sprintf('Backup of database from "%s" started', $name));
 			$command = $this->getCommand('data:getdb', 'db', $environment, array('data_path' => $databasePath), $log);
 			$command->run(function($type, $buffer) use($log) {
 				$log->write($buffer);
 			});
-			if(!$command->isSuccessful()) {
+			if (!$command->isSuccessful()) {
 				$this->extend('dataTransferFailure', $environment, $log);
 				throw new RuntimeException($command->getErrorOutput());
 			}
@@ -342,13 +342,13 @@ 
 		}
 
 		// Backup assets
-		if(in_array($dataTransfer->Mode, array('all', 'assets'))) {
+		if (in_array($dataTransfer->Mode, array('all', 'assets'))) {
 			$log->write(sprintf('Backup of assets from "%s" started', $name));
 			$command = $this->getCommand('data:getassets', 'web', $environment, array('data_path' => $filepathBase), $log);
 			$command->run(function($type, $buffer) use($log) {
 				$log->write($buffer);
 			});
-			if(!$command->isSuccessful()) {
+			if (!$command->isSuccessful()) {
 				$this->extend('dataTransferFailure', $environment, $log);
 				throw new RuntimeException($command->getErrorOutput());
 			}
@@ -363,12 +363,12 @@ 
 		$log->write('Creating sspak...');
 
 		$sspakFilename = sprintf('%s.sspak', $dataArchive->generateFilename($dataTransfer));
-		$sspakFilepath = $filepathBase . DIRECTORY_SEPARATOR . $sspakFilename;
+		$sspakFilepath = $filepathBase.DIRECTORY_SEPARATOR.$sspakFilename;
 
 		try {
 			$dataArchive->attachFile($sspakFilepath, $dataTransfer);
 			$dataArchive->setArchiveFromFiles($filepathBase);
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			$log->write($e->getMessage());
 			throw new RuntimeException($e->getMessage());
 		}
@@ -379,7 +379,7 @@ 
 		$process = new AbortableProcess(sprintf('rm -rf %s/assets && rm -f %s', escapeshellarg($filepathBase), escapeshellarg($databasePath)));
 		$process->setTimeout(120);
 		$process->run();
-		if(!$process->isSuccessful()) {
+		if (!$process->isSuccessful()) {
 			$log->write('Could not delete temporary files');
 			throw new RuntimeException($process->getErrorOutput());
 		}
@@ -398,7 +398,7 @@ 
 		$command->run(function($type, $buffer) use($log) {
 			$log->write($buffer);
 		});
-		if(!$command->isSuccessful()) {
+		if (!$command->isSuccessful()) {
 			$log->write(sprintf('Rebuild of "%s" failed: %s', $name, $command->getErrorOutput()));
 			throw new RuntimeException($command->getErrorOutput());
 		}
@@ -428,14 +428,14 @@ 
 		};
 
 		// Restore database into target environment
-		if(in_array($dataTransfer->Mode, array('all', 'db'))) {
+		if (in_array($dataTransfer->Mode, array('all', 'db'))) {
 			$log->write(sprintf('Restore of database to "%s" started', $name));
-			$args = array('data_path' => $workingDir . DIRECTORY_SEPARATOR . 'database.sql');
+			$args = array('data_path' => $workingDir.DIRECTORY_SEPARATOR.'database.sql');
 			$command = $this->getCommand('data:pushdb', 'db', $environment, $args, $log);
 			$command->run(function($type, $buffer) use($log) {
 				$log->write($buffer);
 			});
-			if(!$command->isSuccessful()) {
+			if (!$command->isSuccessful()) {
 				$cleanupFn();
 				$log->write(sprintf('Restore of database to "%s" failed: %s', $name, $command->getErrorOutput()));
 				$this->extend('dataTransferFailure', $environment, $log);
@@ -445,14 +445,14 @@ 
 		}
 
 		// Restore assets into target environment
-		if(in_array($dataTransfer->Mode, array('all', 'assets'))) {
+		if (in_array($dataTransfer->Mode, array('all', 'assets'))) {
 			$log->write(sprintf('Restore of assets to "%s" started', $name));
-			$args = array('data_path' => $workingDir . DIRECTORY_SEPARATOR . 'assets');
+			$args = array('data_path' => $workingDir.DIRECTORY_SEPARATOR.'assets');
 			$command = $this->getCommand('data:pushassets', 'web', $environment, $args, $log);
 			$command->run(function($type, $buffer) use($log) {
 				$log->write($buffer);
 			});
-			if(!$command->isSuccessful()) {
+			if (!$command->isSuccessful()) {
 				$cleanupFn();
 				$log->write(sprintf('Restore of assets to "%s" failed: %s', $name, $command->getErrorOutput()));
 				$this->extend('dataTransferFailure', $environment, $log);
@@ -477,7 +477,7 @@ 
 		$timeout = 600;
 		$tick = 60;
 
-		if(!$url) {
+		if (!$url) {
 			$log->write('Skipping site accessible check: no URL found.');
 			return true;
 		}
@@ -508,7 +508,7 @@ 
 		// query the site every second. Note that if the URL doesn't respond,
 		// curl_exec will take 5 seconds to timeout (see CURLOPT_CONNECTTIMEOUT and CURLOPT_TIMEOUT above)
 		do {
-			if(time() > $start + $timeout) {
+			if (time() > $start + $timeout) {
 				$log->write(sprintf(' * Failed: check for %s timed out after %smin', $url, $timeout / 60));
 				return false;
 			}
@@ -517,13 +517,13 @@ 
 
 			// check the HTTP response code for HTTP protocols
 			$status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-			if($status && !in_array($status, [500, 501, 502, 503, 504])) {
+			if ($status && !in_array($status, [500, 501, 502, 503, 504])) {
 				$success = true;
 			}
 
 			// check for any curl errors, mostly for checking the response state of non-HTTP protocols,
 			// but applies to checks of any protocol
-			if($response && !curl_errno($ch)) {
+			if ($response && !curl_errno($ch)) {
 				$success = true;
 			}
 
@@ -551,7 +551,7 @@ 
 			}
 
 			sleep(1);
-		} while(!$success);
+		} while (!$success);
 
 		curl_close($ch);
 		$log->write(' * Success: site is accessible!');

code/jobs/CreateEnvJob.php

Spacing +5 added lines, -5 removed lines

@@ -19,27 +19,27 @@
 	 *
 	 */
 	public function perform() {
-		echo "[-] CreateEnvJob starting" . PHP_EOL;
+		echo "[-] CreateEnvJob starting".PHP_EOL;
 
 		$log = new DeploynautLogFile($this->args['logfile']);
 		$envCreate = DNCreateEnvironment::get()->byId($this->args['createID']);
 
 		// This is a bit icky, but there is no easy way of capturing a failed deploy by using the PHP Resque
 		try {
-			if(!($envCreate && $envCreate->exists())) {
+			if (!($envCreate && $envCreate->exists())) {
 				throw new RuntimeException(sprintf('Could not find create environment record %s', $args['createID']));
 			}
 
 			// This will throw and exception if it fails.
 			$envCreate->createEnvironment();
 
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			$log->write($e->getMessage());
-			echo "[-] CreateEnvJob failed" . PHP_EOL;
+			echo "[-] CreateEnvJob failed".PHP_EOL;
 			throw $e;
 		}
 		$this->updateStatus('Finished');
-		echo "[-] CreateEnvJob finished" . PHP_EOL;
+		echo "[-] CreateEnvJob finished".PHP_EOL;
 	}
 
 	/**

code/model/DNDataArchive.php

Spacing +31 added lines, -31 removed lines

@@ -121,7 +121,7 @@ 
 	}
 
 	public function onBeforeWrite() {
-		if(!$this->AuthorID) {
+		if (!$this->AuthorID) {
 			$this->AuthorID = Member::currentUserID();
 		}
 
@@ -179,7 +179,7 @@ 
 	 * @return string The human-readable size of this archive file
 	 */
 	public function FileSize() {
-		if($this->ArchiveFile()->exists()) {
+		if ($this->ArchiveFile()->exists()) {
 			return $this->ArchiveFile()->getSize();
 		} else {
 			return "N/A";
@@ -187,7 +187,7 @@ 
 	}
 
 	public function getModeNice() {
-		if($this->Mode == 'all') {
+		if ($this->Mode == 'all') {
 			return 'database and assets';
 		} else {
 			return $this->Mode;
@@ -223,12 +223,12 @@ 
 	 */
 	public function canRestore($member = null) {
 		$memberID = $member ? $member->ID : Member::currentUserID();
-		if(!$memberID) {
+		if (!$memberID) {
 			return false;
 		}
 
-		$key = $memberID . '-' . $this->EnvironmentID;
-		if(!isset(self::$_cache_can_restore[$key])) {
+		$key = $memberID.'-'.$this->EnvironmentID;
+		if (!isset(self::$_cache_can_restore[$key])) {
 			self::$_cache_can_restore[$key] = $this->Environment()->canUploadArchive($member);
 		}
 
@@ -244,12 +244,12 @@ 
 	 */
 	public function canDownload($member = null) {
 		$memberID = $member ? $member->ID : Member::currentUserID();
-		if(!$memberID) {
+		if (!$memberID) {
 			return false;
 		}
 
-		$key = $memberID . '-' . $this->EnvironmentID;
-		if(!isset(self::$_cache_can_download[$key])) {
+		$key = $memberID.'-'.$this->EnvironmentID;
+		if (!isset(self::$_cache_can_download[$key])) {
 			self::$_cache_can_download[$key] = $this->Environment()->canDownloadArchive($member);
 		}
 		return self::$_cache_can_download[$key];
@@ -274,27 +274,27 @@ 
 	 * @return boolean true if $member can upload archives linked to this environment, false if they can't.
 	 */
 	public function canMoveTo($targetEnv, $member = null) {
-		if($this->Environment()->Project()->ID != $targetEnv->Project()->ID) {
+		if ($this->Environment()->Project()->ID != $targetEnv->Project()->ID) {
 			// We don't permit moving snapshots between projects at this stage.
 			return false;
 		}
 
-		if(!$member) {
+		if (!$member) {
 			$member = Member::currentUser();
 		}
 
 		// Must be logged in to check permissions
-		if(!$member) {
+		if (!$member) {
 			return false;
 		}
 
 		// Admin can always move.
-		if(Permission::checkMember($member, 'ADMIN')) {
+		if (Permission::checkMember($member, 'ADMIN')) {
 			return true;
 		}
 
 		// Checks if the user can actually access the archive.
-		if(!$this->canDownload($member)) {
+		if (!$this->canDownload($member)) {
 			return false;
 		}
 
@@ -403,7 +403,7 @@ 
 	 * @return bool
 	 */
 	public function extractArchive($workingDir = null) {
-		if(!is_dir($workingDir)) {
+		if (!is_dir($workingDir)) {
 			mkdir($workingDir, 0700, true);
 		}
 
@@ -422,28 +422,28 @@ 
 		));
 		$process->setTimeout(3600);
 		$process->run();
-		if(!$process->isSuccessful()) {
+		if (!$process->isSuccessful()) {
 			$cleanupFn();
 			throw new RuntimeException(sprintf('Could not extract the sspak file: %s', $process->getErrorOutput()));
 		}
 
 		// Extract database.sql.gz to <workingdir>/database.sql
-		if(file_exists($workingDir . DIRECTORY_SEPARATOR . 'database.sql.gz')) {
+		if (file_exists($workingDir.DIRECTORY_SEPARATOR.'database.sql.gz')) {
 			$process = new AbortableProcess('gunzip database.sql.gz', $workingDir);
 			$process->setTimeout(3600);
 			$process->run();
-			if(!$process->isSuccessful()) {
+			if (!$process->isSuccessful()) {
 				$cleanupFn();
 				throw new RuntimeException(sprintf('Could not extract the db archive: %s', $process->getErrorOutput()));
 			}
 		}
 
 		// Extract assets.tar.gz to <workingdir>/assets/
-		if(file_exists($workingDir . DIRECTORY_SEPARATOR . 'assets.tar.gz')) {
+		if (file_exists($workingDir.DIRECTORY_SEPARATOR.'assets.tar.gz')) {
 			$process = new AbortableProcess('tar xzf assets.tar.gz', $workingDir);
 			$process->setTimeout(3600);
 			$process->run();
-			if(!$process->isSuccessful()) {
+			if (!$process->isSuccessful()) {
 				$cleanupFn();
 				throw new RuntimeException(sprintf('Could not extract the assets archive: %s', $process->getErrorOutput()));
 			}
@@ -467,7 +467,7 @@ 
 
 		$file = $this->ArchiveFile()->FullPath;
 
-		if(!is_readable($file)) {
+		if (!is_readable($file)) {
 			$result->error(sprintf('SSPak file "%s" cannot be read.', $file));
 			return $result;
 		}
@@ -475,19 +475,19 @@ 
 		$process = new AbortableProcess(sprintf('tar -tf %s', escapeshellarg($file)));
 		$process->setTimeout(120);
 		$process->run();
-		if(!$process->isSuccessful()) {
+		if (!$process->isSuccessful()) {
 			throw new RuntimeException(sprintf('Could not list files in archive: %s', $process->getErrorOutput()));
 		}
 
 		$output = explode(PHP_EOL, $process->getOutput());
 		$files = array_filter($output);
 
-		if(in_array($mode, array('all', 'db')) && !in_array('database.sql.gz', $files)) {
+		if (in_array($mode, array('all', 'db')) && !in_array('database.sql.gz', $files)) {
 			$result->error('The snapshot is missing the database.');
 			return $result;
 		}
 
-		if(in_array($mode, array('all', 'assets')) && !in_array('assets.tar.gz', $files)) {
+		if (in_array($mode, array('all', 'assets')) && !in_array('assets.tar.gz', $files)) {
 			$result->error('The snapshot is missing assets.');
 			return $result;
 		}
@@ -517,11 +517,11 @@ 
 			sprintf('find %s -type f -exec chmod 644 {} +', escapeshellarg($workingDir))
 		);
 
-		foreach($fixCmds as $cmd) {
+		foreach ($fixCmds as $cmd) {
 			$process = new AbortableProcess($cmd);
 			$process->setTimeout(3600);
 			$process->run();
-			if(!$process->isSuccessful()) {
+			if (!$process->isSuccessful()) {
 				throw new RuntimeException($process->getErrorOutput());
 			}
 		}
@@ -540,18 +540,18 @@ 
 	 */
 	public function setArchiveFromFiles($workingDir) {
 		$commands = array();
-		if($this->Mode == 'db') {
-			if (file_exists($workingDir . '/database.sql')) {
+		if ($this->Mode == 'db') {
+			if (file_exists($workingDir.'/database.sql')) {
 				$commands[] = 'gzip database.sql';
 			}
 			$commands[] = sprintf('tar -cf %s database.sql.gz', $this->ArchiveFile()->FullPath);
 			$commands[] = 'rm -f database.sql.gz';
-		} elseif($this->Mode == 'assets') {
+		} elseif ($this->Mode == 'assets') {
 			$commands[] = 'GZIP=-1 tar --dereference -czf assets.tar.gz assets';
 			$commands[] = sprintf('tar -cf %s assets.tar.gz', $this->ArchiveFile()->FullPath);
 			$commands[] = 'rm -f assets.tar.gz';
 		} else {
-			if (file_exists($workingDir . '/database.sql')) {
+			if (file_exists($workingDir.'/database.sql')) {
 				$commands[] = 'gzip database.sql';
 			}
 			$commands[] = 'GZIP=-1 tar --dereference -czf assets.tar.gz assets';
@@ -562,7 +562,7 @@ 
 		$process = new AbortableProcess(implode(' && ', $commands), $workingDir);
 		$process->setTimeout(3600);
 		$process->run();
-		if(!$process->isSuccessful()) {
+		if (!$process->isSuccessful()) {
 			throw new RuntimeException($process->getErrorOutput());
 		}
 

code/tasks/CleanupOrphanedRecordsTask.php

Spacing +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
 
 	public function run($request) {
 		$log = function($message) {
-			$message = sprintf('[%s] ', date('Y-m-d H:i:s')) . $message;
-			echo $message . PHP_EOL;
+			$message = sprintf('[%s] ', date('Y-m-d H:i:s')).$message;
+			echo $message.PHP_EOL;
 		};
 
 		if (!Director::is_cli()) {