silverstripe / deploynaut

code/backends/DeploymentStrategy.php

Doc Comments +2 added lines

@@ -75,6 +75,7 @@ 
 	}
 
 	/**
+	 * @param string $code
 	 */
 	public function setActionCode($code) {
 		$this->actionCode = $code;
@@ -89,6 +90,7 @@ 
 
 	/**
 	 * @param int
+	 * @param string $seconds
 	 */
 	public function setEstimatedTime($seconds) {
 		$this->estimatedTime = $seconds;

Braces +6 added lines, -2 removed lines

@@ -110,8 +110,12 @@
 		// Normalise "empty" values into dashes so comparisons are done properly.
 		// This means there is no diference between an empty string and a null
 		// but "0" is considered to be non-empty.
-		if(empty($from) && !strlen($from)) $from = '-';
-		if(empty($to) && !strlen($to)) $to = '-';
+		if(empty($from) && !strlen($from)) {
+			$from = '-';
+		}
+		if(empty($to) && !strlen($to)) {
+			$to = '-';
+		}
 
 		return $this->changes[$title] = array(
 			'from' => $from,

Spacing +8 added lines, -8 removed lines

@@ -110,8 +110,8 @@ 
 		// Normalise "empty" values into dashes so comparisons are done properly.
 		// This means there is no diference between an empty string and a null
 		// but "0" is considered to be non-empty.
-		if(empty($from) && !strlen($from)) $from = '-';
-		if(empty($to) && !strlen($to)) $to = '-';
+		if (empty($from) && !strlen($from)) $from = '-';
+		if (empty($to) && !strlen($to)) $to = '-';
 
 		return $this->changes[$title] = array(
 			'from' => $from,
@@ -170,7 +170,7 @@ 
 	 */
 	public function getChange($key) {
 		$changes = $this->getChanges();
-		if(array_key_exists($key, $changes)) {
+		if (array_key_exists($key, $changes)) {
 			return new ArrayData($changes[$key]);
 		}
 		return null;
@@ -189,7 +189,7 @@ 
 	 * @return string|null
 	 */
 	public function getOption($option) {
-		if(!empty($this->options[$option])) {
+		if (!empty($this->options[$option])) {
 			return $this->options[$option];
 		}
 	}
@@ -230,7 +230,7 @@ 
 			DeploymentStrategy::WARNING_CODE => 1,
 			DeploymentStrategy::ERROR_CODE => 2
 		];
-		if($map[$current] < $map[$code]) {
+		if ($map[$current] < $map[$code]) {
 			$this->setValidationCode($code);
 		}
 	}
@@ -259,7 +259,7 @@ 
 		);
 
 		$output = array();
-		foreach($fields as $field) {
+		foreach ($fields as $field) {
 			$output[$field] = $this->$field;
 		}
 		return $output;
@@ -300,8 +300,8 @@ 
 			'messages'
 		);
 
-		foreach($fields as $field) {
-			if(!empty($data[$field])) {
+		foreach ($fields as $field) {
+			if (!empty($data[$field])) {
 				$this->$field = $data[$field];
 			}
 		}

code/model/DNEnvironment.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -954,7 +954,7 @@
 to other environments, alongside the "Who can restore" permission.<br>
 Should include all users with upload permissions, otherwise they can't download
 their own uploads.
-PHP
+php
 				),
 
 			// The Main.PipelineApprovers

Doc Comments +1 added lines, -1 removed lines

@@ -578,7 +578,7 @@
 	 * Dear people of the future: If you are looking to optimize this, simply create a CurrentBuildSHA(), which can be
 	 * a lot faster. I presume you came here because of the Project display template, which only needs a SHA.
 	 *
-	 * @return false|DNDeployment
+	 * @return DNDeployment
 	 */
 	public function CurrentBuild() {
 		// The DeployHistory function is far too slow to use for this

Spacing +6 added lines, -6 removed lines

@@ -774,7 +774,7 @@ 
 				->buildPermissionField('ArchiveUploaderGroups', 'ArchiveUploaders', $groups, $members)
 				->setTitle('Who can upload?')
 				->setDescription(
-					'Users who can upload archives linked to this environment into Deploynaut.<br />' .
+					'Users who can upload archives linked to this environment into Deploynaut.<br />'.
 					'Linking them to an environment allows limiting download permissions (see below).'
 				),
 
@@ -821,7 +821,7 @@ 
 		// Add actions
 		$action = new FormAction('check', 'Check Connection');
 		$action->setUseButtonTag(true);
-		$dataURL = Director::absoluteBaseURL() . 'naut/api/' . $this->Project()->Name . '/' . $this->Name . '/ping';
+		$dataURL = Director::absoluteBaseURL().'naut/api/'.$this->Project()->Name.'/'.$this->Name.'/ping';
 		$action->setAttribute('data-url', $dataURL);
 		$fields->insertBefore($action, 'Name');
 
@@ -834,8 +834,8 @@ 
 	 */
 	public function onBeforeWrite() {
 		parent::onBeforeWrite();
-		if ($this->Name && $this->Name . '.rb' != $this->Filename) {
-			$this->Filename = $this->Name . '.rb';
+		if ($this->Name && $this->Name.'.rb' != $this->Filename) {
+			$this->Filename = $this->Name.'.rb';
 		}
 		$this->checkEnvironmentPath();
 		$this->writeConfigFile();
@@ -885,7 +885,7 @@ 
 		if (!$this->Filename) {
 			return '';
 		}
-		return $this->DNData()->getEnvironmentDir() . '/' . $this->Project()->Name . '/' . $this->Filename;
+		return $this->DNData()->getEnvironmentDir().'/'.$this->Project()->Name.'/'.$this->Filename;
 	}
 
 	/**
@@ -1039,7 +1039,7 @@ 
 			&& $this->Filename
 			&& $this->CreateEnvConfig
 		) {
-			$templateFile = $this->config()->template_file ?: BASE_PATH . '/deploynaut/environment.template';
+			$templateFile = $this->config()->template_file ?: BASE_PATH.'/deploynaut/environment.template';
 			file_put_contents($this->getConfigFilename(), file_get_contents($templateFile));
 		} else if ($this->envFileExists() && $this->DeployConfig) {
 			file_put_contents($this->getConfigFilename(), $this->DeployConfig);

code/model/DNProject.php

Braces +15 added lines, -5 removed lines

@@ -929,7 +929,9 @@ 
 	 * @return SS_List
 	 */
 	public function whoIsAllowedAny($codes) {
-		if(!is_array($codes)) $codes = array($codes);
+		if(!is_array($codes)) {
+			$codes = array($codes);
+		}
 
 		$SQLa_codes = Convert::raw2sql($codes);
 		$SQL_codes = join("','", $SQLa_codes);
@@ -991,7 +993,9 @@ 
 			$member = Member::currentUser();
 		}
 
-		if(Permission::checkMember($member, 'ADMIN')) return true;
+		if(Permission::checkMember($member, 'ADMIN')) {
+			return true;
+		}
 
 		$hits = $this->whoIsAllowedAny($codes)->filter('Member.ID', $member->ID)->count();
 		return ($hits>0 ? true : false);
@@ -1018,7 +1022,9 @@ 
 			});
 
 			// If anything returns false then we're not ready.
-			if($isDone) return min($isDone);
+			if($isDone) {
+				return min($isDone);
+			}
 		}
 
 		return true;
@@ -1099,8 +1105,12 @@ 
 	 * @return bool
 	 */
 	public function canCreate($member = null) {
-		if(!$member) $member = Member::currentUser();
-		if(!$member) return false;
+		if(!$member) {
+			$member = Member::currentUser();
+		}
+		if(!$member) {
+			return false;
+		}
 
 		if(Permission::checkMember($member, 'ADMIN')) {
 			return true;

Doc Comments +1 added lines, -1 removed lines

@@ -1134,7 +1134,7 @@
 	 * This is a proxy call to gitonmy that caches the information per project and sha
 	 *
 	 * @param string $sha
-	 * @return false|\Gitonomy\Git\Commit
+	 * @return Gitonomy\Git\Commit
 	 */
 	public function getCommit($sha) {
 		$repo = $this->getRepository();

Spacing +72 added lines, -72 removed lines

@@ -109,7 +109,7 @@ 
 
 		// add the administrators group as the viewers of the new project
 		$adminGroup = Group::get()->filter('Code', 'administrators')->first();
-		if($adminGroup && $adminGroup->exists()) {
+		if ($adminGroup && $adminGroup->exists()) {
 			$project->Viewers()->add($adminGroup);
 		}
 		return $project;
@@ -131,7 +131,7 @@ 
 	public static function get_git_cache() {
 		return SS_Cache::factory('gitonomy', 'Output', [
 			'automatic_serialization' => true,
-			'lifetime' => 60*60*24*7 // seven days
+			'lifetime' => 60 * 60 * 24 * 7 // seven days
 		]);
 	}
 
@@ -144,8 +144,8 @@ 
 	public function getUsedQuotaMB($round = 2) {
 		$size = 0;
 
-		foreach($this->Environments() as $environment) {
-			foreach($environment->DataArchives()->filter('IsBackup', 0) as $archive) {
+		foreach ($this->Environments() as $environment) {
+			foreach ($environment->DataArchives()->filter('IsBackup', 0) as $archive) {
 				$size += $archive->ArchiveFile()->getAbsoluteSize();
 			}
 		}
@@ -164,7 +164,7 @@ 
 	public function getDiskQuotaMB() {
 		$size = $this->getField('DiskQuotaMB');
 
-		if(empty($size)) {
+		if (empty($size)) {
 			$defaults = $this->config()->get('defaults');
 			$size = (isset($defaults['DiskQuotaMB'])) ? $defaults['DiskQuotaMB'] : 0;
 		}
@@ -197,7 +197,7 @@ 
 	 */
 	public function DiskQuotaUsagePercent() {
 		$quota = $this->getDiskQuotaMB();
-		if($quota > 0) {
+		if ($quota > 0) {
 			return $this->getUsedQuotaMB() * 100 / $quota;
 		}
 		return 100;
@@ -214,7 +214,7 @@ 
 		$controller = Controller::curr();
 		$actionType = $controller->getField('CurrentActionType');
 
-		if(DNRoot::FlagSnapshotsEnabled() && $this->isProjectReady()) {
+		if (DNRoot::FlagSnapshotsEnabled() && $this->isProjectReady()) {
 			$list->push(new ArrayData(array(
 				'Link' => sprintf('naut/project/%s/snapshots', $this->Name),
 				'Title' => 'Snapshots',
@@ -265,11 +265,11 @@ 
 	 * @return boolean
 	 */
 	public function canView($member = null) {
-		if(!$member) {
+		if (!$member) {
 			$member = Member::currentUser();
 		}
 
-		if(Permission::checkMember($member, 'ADMIN')) {
+		if (Permission::checkMember($member, 'ADMIN')) {
 			return true;
 		}
 
@@ -292,7 +292,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();
 	}
@@ -312,7 +312,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();
 	}
@@ -332,7 +332,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();
 	}
@@ -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->canDownloadArchive($member);
 		})->Count();
 	}
@@ -369,9 +369,9 @@ 
 	 */
 	public function canCreateEnvironments($member = null) {
 		$envType = $this->AllowedEnvironmentType;
-		if($envType) {
+		if ($envType) {
 			$env = Injector::inst()->get($envType);
-			if($env instanceof EnvironmentCreateBackend) {
+			if ($env instanceof EnvironmentCreateBackend) {
 				return $this->allowed(DNRoot::ALLOW_CREATE_ENVIRONMENT, $member);
 			}
 		}
@@ -407,11 +407,11 @@ 
 	 * @return array
 	 */
 	public function getProcessEnv() {
-		if(file_exists($this->getPrivateKeyPath())) {
+		if (file_exists($this->getPrivateKeyPath())) {
 			// Key-pair is available, use it.
 			$processEnv = array(
 				'IDENT_KEY' => $this->getPrivateKeyPath(),
-				'GIT_SSH' => BASE_PATH . "/deploynaut/git-deploy.sh"
+				'GIT_SSH' => BASE_PATH."/deploynaut/git-deploy.sh"
 			);
 		} else {
 			$processEnv = array();
@@ -452,7 +452,7 @@ 
 	 * @return DNBranchList
 	 */
 	public function DNBranchList() {
-		if($this->CVSPath && !$this->repoExists()) {
+		if ($this->CVSPath && !$this->repoExists()) {
 			$this->cloneRepo();
 		}
 		return DNBranchList::create($this, $this->DNData());
@@ -464,7 +464,7 @@ 
 	 * @return DNReferenceList
 	 */
 	public function DNTagList() {
-		if($this->CVSPath && !$this->repoExists()) {
+		if ($this->CVSPath && !$this->repoExists()) {
 			$this->cloneRepo();
 		}
 		return DNReferenceList::create($this, $this->DNData(), null, null, true);
@@ -474,7 +474,7 @@ 
 	 * @return false|Gitonomy\Git\Repository
 	 */
 	public function getRepository() {
-		if(!$this->repoExists()) {
+		if (!$this->repoExists()) {
 			return false;
 		}
 
@@ -489,11 +489,11 @@ 
 	 */
 	public function DNEnvironmentList() {
 
-		if(!self::$_current_member_cache) {
+		if (!self::$_current_member_cache) {
 			self::$_current_member_cache = Member::currentUser();
 		}
 
-		if(self::$_current_member_cache === false) {
+		if (self::$_current_member_cache === false) {
 			return new ArrayList();
 		}
 
@@ -518,9 +518,9 @@ 
 	 * @return false|DNDeployment
 	 */
 	public function currentBuilds() {
-		if(!isset(self::$relation_cache['currentBuilds.'.$this->ID])) {
+		if (!isset(self::$relation_cache['currentBuilds.'.$this->ID])) {
 			$currentBuilds = array();
-			foreach($this->Environments() as $env) {
+			foreach ($this->Environments() as $env) {
 				$currentBuilds[$env->Name] = $env->CurrentBuild();
 			}
 			self::$relation_cache['currentBuilds.'.$this->ID] = $currentBuilds;
@@ -540,7 +540,7 @@ 
 	 * @return string|null
 	 */
 	public function CreateEnvironmentLink() {
-		if($this->canCreateEnvironments()) {
+		if ($this->canCreateEnvironments()) {
 			return $this->Link('createenv');
 		}
 		return null;
@@ -558,11 +558,11 @@ 
 	 */
 	public function IsStarred() {
 		$member = Member::currentUser();
-		if($member === null) {
+		if ($member === null) {
 			return false;
 		}
 		$favourited = $this->StarredBy()->filter('MemberID', $member->ID);
-		if($favourited->count() == 0) {
+		if ($favourited->count() == 0) {
 			return false;
 		}
 		return true;
@@ -617,7 +617,7 @@ 
 
 		$environmentTypes = ClassInfo::implementorsOf('EnvironmentCreateBackend');
 		$types = array();
-		foreach($environmentTypes as $type) {
+		foreach ($environmentTypes as $type) {
 			$types[$type] = $type;
 		}
 
@@ -641,11 +641,11 @@ 
 	 */
 	public function setCreateProjectFolderField(&$fields) {
 		// Check if the capistrano project folder exists
-		if(!$this->Name) {
+		if (!$this->Name) {
 			return;
 		}
 
-		if($this->projectFolderExists()) {
+		if ($this->projectFolderExists()) {
 			return;
 		}
 
@@ -677,7 +677,7 @@ 
 	 */
 	public function cloneRepo() {
 		// Avoid this being called multiple times in the same request
-		if(!isset(self::$has_cloned_cache[$this->ID])) {
+		if (!isset(self::$has_cloned_cache[$this->ID])) {
 			$fetch = DNGitFetch::create();
 			$fetch->ProjectID = $this->ID;
 			$fetch->write();
@@ -701,7 +701,7 @@ 
 	public function onBeforeWrite() {
 		parent::onBeforeWrite();
 
-		if($this->CreateEnvFolder && !file_exists($this->getProjectFolderPath())) {
+		if ($this->CreateEnvFolder && !file_exists($this->getProjectFolderPath())) {
 			mkdir($this->getProjectFolderPath());
 		}
 	}
@@ -709,12 +709,12 @@ 
 	public function onAfterWrite() {
 		parent::onAfterWrite();
 
-		if(!$this->CVSPath) {
+		if (!$this->CVSPath) {
 			return;
 		}
 
 		$changedFields = $this->getChangedFields(true, 2);
-		if(isset($changedFields['CVSPath']) || isset($changedFields['Name'])) {
+		if (isset($changedFields['CVSPath']) || isset($changedFields['Name'])) {
 			$this->cloneRepo();
 		}
 	}
@@ -726,22 +726,22 @@ 
 		parent::onAfterDelete();
 
 		// Delete related environments
-		foreach($this->Environments() as $env) {
+		foreach ($this->Environments() as $env) {
 			$env->delete();
 		}
 
 		// Delete local repository
-		if(file_exists($this->getLocalCVSPath())) {
+		if (file_exists($this->getLocalCVSPath())) {
 			Filesystem::removeFolder($this->getLocalCVSPath());
 		}
 
 		// Delete project template
-		if(file_exists($this->getProjectFolderPath()) && Config::inst()->get('DNEnvironment', 'allow_web_editing')) {
+		if (file_exists($this->getProjectFolderPath()) && Config::inst()->get('DNEnvironment', 'allow_web_editing')) {
 			Filesystem::removeFolder($this->getProjectFolderPath());
 		}
 
 		// Delete the deploy key
-		if(file_exists($this->getKeyDir())) {
+		if (file_exists($this->getKeyDir())) {
 			Filesystem::removeFolder($this->getKeyDir());
 		}
 	}
@@ -754,7 +754,7 @@ 
 	public function getPublicKey() {
 		$key = $this->getPublicKeyPath();
 
-		if(file_exists($key)) {
+		if (file_exists($key)) {
 			return trim(file_get_contents($key));
 		}
 	}
@@ -765,8 +765,8 @@ 
 	 * @return string|null
 	 */
 	public function getPublicKeyPath() {
-		if($privateKey = $this->getPrivateKeyPath()) {
-			return $privateKey . '.pub';
+		if ($privateKey = $this->getPrivateKeyPath()) {
+			return $privateKey.'.pub';
 		}
 		return null;
 	}
@@ -778,10 +778,10 @@ 
 	 */
 	public function getPrivateKeyPath() {
 		$keyDir = $this->getKeyDir();
-		if(!empty($keyDir)) {
+		if (!empty($keyDir)) {
 			$filter = FileNameFilter::create();
 			$name = $filter->filter($this->Name);
-			return $keyDir . '/' . $name;
+			return $keyDir.'/'.$name;
 		}
 		return null;
 	}
@@ -793,14 +793,14 @@ 
 	 */
 	public function getKeyDir() {
 		$keyDir = $this->DNData()->getKeyDir();
-		if(!$keyDir) {
+		if (!$keyDir) {
 			return null;
 		}
 
 		$filter = FileNameFilter::create();
 		$name = $filter->filter($this->Name);
 
-		return $this->DNData()->getKeyDir() . '/' . $name;
+		return $this->DNData()->getKeyDir().'/'.$name;
 	}
 
 	/**
@@ -810,7 +810,7 @@ 
 	 * @param GridField $environments
 	 */
 	protected function setEnvironmentFields(&$fields, $environments) {
-		if(!$environments) {
+		if (!$environments) {
 			return;
 		}
 
@@ -819,7 +819,7 @@ 
 		$environments->getConfig()->removeComponentsByType('GridFieldAddExistingAutocompleter');
 		$environments->getConfig()->removeComponentsByType('GridFieldDeleteAction');
 		$environments->getConfig()->removeComponentsByType('GridFieldPageCount');
-		if(Config::inst()->get('DNEnvironment', 'allow_web_editing')) {
+		if (Config::inst()->get('DNEnvironment', 'allow_web_editing')) {
 			$addNewRelease = new GridFieldAddNewButton('toolbar-header-right');
 			$addNewRelease->setButtonName('Add');
 			$environments->getConfig()->addComponent($addNewRelease);
@@ -835,7 +835,7 @@ 
 	 */
 	public function getRepositoryURL() {
 		$showUrl = Config::inst()->get($this->class, 'show_repository_url');
-		if($showUrl) {
+		if ($showUrl) {
 			return $this->CVSPath;
 		}
 	}
@@ -887,9 +887,9 @@ 
 		$interfaces = $this->config()->repository_interfaces;
 
 		/* Look for each whitelisted hostname */
-		foreach($interfaces as $host => $interface) {
+		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];
 
@@ -899,13 +899,13 @@ 
 
 				$components = explode('.', $host);
 
-				foreach($regex as $pattern => $replacement) {
-					$path = preg_replace('/' . $pattern . '/', $replacement, $path);
+				foreach ($regex as $pattern => $replacement) {
+					$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) {
+				if (array_key_exists('commit', $interface) && $interface['commit'] == false) {
 					$commiturl = false;
 				} else {
 					$commiturl = Controller::join_links(
@@ -949,7 +949,7 @@ 
 	 * @return SS_List
 	 */
 	public function whoIsAllowedAny($codes) {
-		if(!is_array($codes)) $codes = array($codes);
+		if (!is_array($codes)) $codes = array($codes);
 
 		$SQLa_codes = Convert::raw2sql($codes);
 		$SQL_codes = join("','", $SQLa_codes);
@@ -988,11 +988,11 @@ 
 	 */
 	public function groupAllowed($permissionCode, Group $group) {
 		$viewers = $this->Viewers();
-		if(!$viewers->find('ID', $group->ID)) {
+		if (!$viewers->find('ID', $group->ID)) {
 			return false;
 		}
 		$groups = Permission::get_groups_by_permission($permissionCode);
-		if(!$groups->find('ID', $group->ID)) {
+		if (!$groups->find('ID', $group->ID)) {
 			return false;
 		}
 		return true;
@@ -1011,10 +1011,10 @@ 
 			$member = Member::currentUser();
 		}
 
-		if(Permission::checkMember($member, 'ADMIN')) return true;
+		if (Permission::checkMember($member, 'ADMIN')) return true;
 
 		$hits = $this->whoIsAllowedAny($codes)->filter('Member.ID', $member->ID)->count();
-		return ($hits>0 ? true : false);
+		return ($hits > 0 ? true : false);
 	}
 
 	/**
@@ -1023,7 +1023,7 @@ 
 	 * @return bool
 	 */
 	public function isProjectReady() {
-		if($this->getRunningInitialEnvironmentCreations()->count() > 0) {
+		if ($this->getRunningInitialEnvironmentCreations()->count() > 0) {
 			// We're still creating the initial environments for this project so we're
 			// not quite done
 			return false;
@@ -1032,13 +1032,13 @@ 
 		// Provide a hook for further checks. Logic stolen from
 		// {@see DataObject::extendedCan()}
 		$isDone = $this->extend('isProjectReady');
-		if($isDone && is_array($isDone)) {
+		if ($isDone && is_array($isDone)) {
 			$isDone = array_filter($isDone, function($val) {
 				return !is_null($val);
 			});
 
 			// If anything returns false then we're not ready.
-			if($isDone) return min($isDone);
+			if ($isDone) return min($isDone);
 		}
 
 		return true;
@@ -1088,25 +1088,25 @@ 
 	 */
 	protected function validate() {
 		$validation = parent::validate();
-		if($validation->valid()) {
-			if(empty($this->Name)) {
+		if ($validation->valid()) {
+			if (empty($this->Name)) {
 				return $validation->error('The stack must have a name.');
 			}
 
 			// The name is used to build filepaths so should be restricted
-			if(!preg_match('/^[a-zA-Z0-9][a-zA-Z0-9\-\_]+$/', $this->Name)) {
+			if (!preg_match('/^[a-zA-Z0-9][a-zA-Z0-9\-\_]+$/', $this->Name)) {
 				return $validation->error('Project name can only contain alphanumeric, hyphens and underscores.');
 			}
 
-			if(empty($this->CVSPath)) {
+			if (empty($this->CVSPath)) {
 				return $validation->error('You must provide a repository URL.');
 			}
 
 			$existing = DNProject::get()->filter('Name', $this->Name);
-			if($this->ID) {
+			if ($this->ID) {
 				$existing = $existing->exclude('ID', $this->ID);
 			}
-			if($existing->count() > 0) {
+			if ($existing->count() > 0) {
 				return $validation->error('A stack already exists with that name.');
 			}
 		}
@@ -1119,10 +1119,10 @@ 
 	 * @return bool
 	 */
 	public function canCreate($member = null) {
-		if(!$member) $member = Member::currentUser();
-		if(!$member) return false;
+		if (!$member) $member = Member::currentUser();
+		if (!$member) return false;
 
-		if(Permission::checkMember($member, 'ADMIN')) {
+		if (Permission::checkMember($member, 'ADMIN')) {
 			return true;
 		}
 
@@ -1138,7 +1138,7 @@ 
 	 */
 	public function getCommit($sha) {
 		$repo = $this->getRepository();
-		if(!$repo) {
+		if (!$repo) {
 			return false;
 		}
 

code/control/DNRoot.php

Doc Comments +1 added lines, -1 removed lines

@@ -961,7 +961,7 @@
 	 * @param array $data
 	 * @param Form $form
 	 *
-	 * @return bool|HTMLText|SS_HTTPResponse
+	 * @return SS_HTTPResponse|null
 	 */
 	public function doCreateEnvironment($data, Form $form) {
 		$this->setCurrentActionType(self::ACTION_ENVIRONMENTS);

Spacing +27 added lines, -27 removed lines

@@ -178,7 +178,7 @@ 
 		Requirements::javascript('deploynaut/javascript/material.js');
 
 		// Load the buildable dependencies only if not loaded centrally.
-		if (!is_dir(BASE_PATH . DIRECTORY_SEPARATOR . 'static')) {
+		if (!is_dir(BASE_PATH.DIRECTORY_SEPARATOR.'static')) {
 			if (\Director::isDev()) {
 				\Requirements::javascript('deploynaut/static/bundle-debug.js');
 			} else {
@@ -242,7 +242,7 @@ 
 		}
 
 		// Block framework jquery
-		Requirements::block(FRAMEWORK_DIR . '/thirdparty/jquery/jquery.js');
+		Requirements::block(FRAMEWORK_DIR.'/thirdparty/jquery/jquery.js');
 
 		self::include_requirements();
 	}
@@ -261,7 +261,7 @@ 
 	 * @return \SS_HTTPResponse
 	 */
 	public function index(SS_HTTPRequest $request) {
-		return $this->redirect($this->Link() . 'projects/');
+		return $this->redirect($this->Link().'projects/');
 	}
 
 	/**
@@ -389,7 +389,7 @@ 
 		// Framing an environment as a "group of people with download access"
 		// makes more sense to the user here, while still allowing us to enforce
 		// environment specific restrictions on downloading the file later on.
-		$envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+		$envs = $project->DNEnvironmentList()->filterByCallback(function($item) {
 			return $item->canUploadArchive();
 		});
 		$envsMap = [];
@@ -421,7 +421,7 @@ 
 		$form->disableSecurityToken();
 		$form->addExtraClass('fields-wide');
 		// Tweak the action so it plays well with our fake URL structure.
-		$form->setFormAction($project->Link() . '/UploadSnapshotForm');
+		$form->setFormAction($project->Link().'/UploadSnapshotForm');
 
 		return $form;
 	}
@@ -442,7 +442,7 @@ 
 		}
 
 		$validEnvs = $project->DNEnvironmentList()
-			->filterByCallback(function ($item) {
+			->filterByCallback(function($item) {
 				return $item->canUploadArchive();
 			});
 
@@ -471,9 +471,9 @@ 
 		$dataArchive->DataTransfers()->add($dataTransfer);
 		$form->saveInto($dataArchive);
 		$dataArchive->write();
-		$workingDir = TEMP_FOLDER . DIRECTORY_SEPARATOR . 'deploynaut-transfer-' . $dataTransfer->ID;
+		$workingDir = TEMP_FOLDER.DIRECTORY_SEPARATOR.'deploynaut-transfer-'.$dataTransfer->ID;
 
-		$cleanupFn = function () use ($workingDir, $dataTransfer, $dataArchive) {
+		$cleanupFn = function() use ($workingDir, $dataTransfer, $dataArchive) {
 			$process = new AbortableProcess(sprintf('rm -rf %s', escapeshellarg($workingDir)));
 			$process->setTimeout(120);
 			$process->run();
@@ -547,7 +547,7 @@ 
 		// Framing an environment as a "group of people with download access"
 		// makes more sense to the user here, while still allowing us to enforce
 		// environment specific restrictions on downloading the file later on.
-		$envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+		$envs = $project->DNEnvironmentList()->filterByCallback(function($item) {
 			return $item->canUploadArchive();
 		});
 		$envsMap = [];
@@ -573,7 +573,7 @@ 
 		$form->disableSecurityToken();
 		$form->addExtraClass('fields-wide');
 		// Tweak the action so it plays well with our fake URL structure.
-		$form->setFormAction($project->Link() . '/PostSnapshotForm');
+		$form->setFormAction($project->Link().'/PostSnapshotForm');
 
 		return $form;
 	}
@@ -592,7 +592,7 @@ 
 			return $this->project404Response();
 		}
 
-		$validEnvs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+		$validEnvs = $project->DNEnvironmentList()->filterByCallback(function($item) {
 			return $item->canUploadArchive();
 		});
 
@@ -712,7 +712,7 @@ 
 		$branchName = $request->getVar('name');
 		$branch = $project->DNBranchList()->byName($branchName);
 		if (!$branch) {
-			return new SS_HTTPResponse("Branch '" . Convert::raw2xml($branchName) . "' not found.", 404);
+			return new SS_HTTPResponse("Branch '".Convert::raw2xml($branchName)."' not found.", 404);
 		}
 
 		return $this->render([
@@ -849,7 +849,7 @@ 
 		);
 
 		// Tweak the action so it plays well with our fake URL structure.
-		$form->setFormAction($project->Link() . '/CreateEnvironmentForm');
+		$form->setFormAction($project->Link().'/CreateEnvironmentForm');
 
 		return $form;
 	}
@@ -882,7 +882,7 @@ 
 		$job->write();
 		$job->start();
 
-		return $this->redirect($project->Link('createenv') . '/' . $job->ID);
+		return $this->redirect($project->Link('createenv').'/'.$job->ID);
 	}
 
 	/**
@@ -1080,7 +1080,7 @@ 
 			return $body;
 		}
 
-		$form->setFormAction($this->getRequest()->getURL() . '/DeployForm');
+		$form->setFormAction($this->getRequest()->getURL().'/DeployForm');
 		return $form;
 	}
 
@@ -1346,7 +1346,7 @@ 
 		$deployment->getMachine()->apply(DNDeployment::TR_QUEUE);
 
 		return json_encode([
-			'url' => Director::absoluteBaseURL() . $deployment->Link()
+			'url' => Director::absoluteBaseURL().$deployment->Link()
 		], JSON_PRETTY_PRINT);
 	}
 
@@ -1469,7 +1469,7 @@ 
 	 */
 	public function getDataTransferForm(SS_HTTPRequest $request = null) {
 		// Performs canView permission check by limiting visible projects
-		$envs = $this->getCurrentProject()->DNEnvironmentList()->filterByCallback(function ($item) {
+		$envs = $this->getCurrentProject()->DNEnvironmentList()->filterByCallback(function($item) {
 			return $item->canBackup();
 		});
 
@@ -1491,7 +1491,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($this->getRequest()->getURL() . '/DataTransferForm');
+		$form->setFormAction($this->getRequest()->getURL().'/DataTransferForm');
 
 		return $form;
 	}
@@ -1517,12 +1517,12 @@ 
 		// Validate direction.
 		if ($data['Direction'] == 'get') {
 			$validEnvs = $this->getCurrentProject()->DNEnvironmentList()
-				->filterByCallback(function ($item) {
+				->filterByCallback(function($item) {
 					return $item->canBackup();
 				});
 		} else if ($data['Direction'] == 'push') {
 			$validEnvs = $this->getCurrentProject()->DNEnvironmentList()
-				->filterByCallback(function ($item) {
+				->filterByCallback(function($item) {
 					return $item->canRestore();
 				});
 		} else {
@@ -1653,7 +1653,7 @@ 
 
 		// Performs canView permission check by limiting visible projects
 		$project = $this->getCurrentProject();
-		$envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+		$envs = $project->DNEnvironmentList()->filterByCallback(function($item) {
 			return $item->canRestore();
 		});
 
@@ -1692,7 +1692,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($project->Link() . '/DataTransferRestoreForm');
+		$form->setFormAction($project->Link().'/DataTransferRestoreForm');
 
 		return $form;
 	}
@@ -1790,7 +1790,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($project->Link() . '/DeleteForm');
+		$form->setFormAction($project->Link().'/DeleteForm');
 
 		return $form;
 	}
@@ -1896,7 +1896,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($this->getCurrentProject()->Link() . '/MoveForm');
+		$form->setFormAction($this->getCurrentProject()->Link().'/MoveForm');
 
 		return $form;
 	}
@@ -2157,7 +2157,7 @@ 
 		$transfers = DNDataTransfer::get()
 			->filter('EnvironmentID', $environments)
 			->filterByCallback(
-				function ($record) {
+				function($record) {
 					return
 						$record->Environment()->canRestore() || // Ensure member can perform an action on the transfers env
 						$record->Environment()->canBackup() ||
@@ -2282,7 +2282,7 @@ 
 	 */
 	protected function project404Response() {
 		return new SS_HTTPResponse(
-			"Project '" . Convert::raw2xml($this->getRequest()->param('Project')) . "' not found.",
+			"Project '".Convert::raw2xml($this->getRequest()->param('Project'))."' not found.",
 			404
 		);
 	}
@@ -2292,7 +2292,7 @@ 
 	 */
 	protected function environment404Response() {
 		$envName = Convert::raw2xml($this->getRequest()->param('Environment'));
-		return new SS_HTTPResponse("Environment '" . $envName . "' not found.", 404);
+		return new SS_HTTPResponse("Environment '".$envName."' not found.", 404);
 	}
 
 	/**

code/jobs/PingJob.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 	 * Do the actual job by calling the appropiate backend
 	 */
 	public function perform() {
-		echo "[-] PingJob starting" . PHP_EOL;
+		echo "[-] PingJob starting".PHP_EOL;
 		$log = new DeploynautLogFile($this->args['logfile']);
 
 		$ping = DNPing::get()->byID($this->args['pingID']);

code/model/jobs/DNDeployment.php

Braces +6 added lines, -2 removed lines

@@ -205,12 +205,16 @@
 	 */
 	public function getFullDeployMessages() {
 		$strategy = $this->getDeploymentStrategy();
-		if ($strategy->getActionCode()!=='full') return null;
+		if ($strategy->getActionCode()!=='full') {
+			return null;
+		}
 
 		$changes = $strategy->getChangesModificationNeeded();
 		$messages = [];
 		foreach ($changes as $change => $details) {
-			if ($change==='Code version') continue;
+			if ($change==='Code version') {
+				continue;
+			}
 
 			$messages[] = [
 				'Flag' => sprintf(

Doc Comments +3 added lines

@@ -82,6 +82,9 @@
 		'Deployer.Name' => 'Deployer'
 	);
 
+	/**
+	 * @param false|string $token
+	 */
 	public function setResqueToken($token) {
 		$this->ResqueToken = $token;
 	}

Spacing +14 added lines, -14 removed lines

@@ -108,7 +108,7 @@ 
 	}
 
 	public function LogLink() {
-		return $this->Link() . '/log';
+		return $this->Link().'/log';
 	}
 
 	public function canView($member = null) {
@@ -154,7 +154,7 @@ 
 	 * @return \Gitonomy\Git\Repository|null
 	 */
 	public function getRepository() {
-		if(!$this->SHA) {
+		if (!$this->SHA) {
 			return null;
 		}
 		return $this->Environment()->Project()->getRepository();
@@ -167,10 +167,10 @@ 
 	 */
 	public function getCommit() {
 		$repo = $this->getRepository();
-		if($repo) {
+		if ($repo) {
 			try {
 				return $this->Environment()->getCommit($this->SHA);
-			} catch(Gitonomy\Git\Exception\ReferenceNotFoundException $ex) {
+			} catch (Gitonomy\Git\Exception\ReferenceNotFoundException $ex) {
 				return null;
 			}
 		}
@@ -195,7 +195,7 @@ 
 		if (!$interface) {
 			return null;
 		}
-		return $interface->CommitURL . '/' . $this->SHA;
+		return $interface->CommitURL.'/'.$this->SHA;
 	}
 
 	/**
@@ -205,10 +205,10 @@ 
 	 */
 	public function getCommitMessage() {
 		$commit = $this->getCommit();
-		if($commit) {
+		if ($commit) {
 			try {
 				return Convert::raw2xml($this->Environment()->getCommitMessage($commit));
-			} catch(Gitonomy\Git\Exception\ReferenceNotFoundException $e) {
+			} catch (Gitonomy\Git\Exception\ReferenceNotFoundException $e) {
 				return null;
 			}
 		}
@@ -225,7 +225,7 @@ 
 		$this->Environment()->getCommitTags($commit);
 		$returnTags = [];
 		if (!empty($tags)) {
-			foreach($tags as $tag) {
+			foreach ($tags as $tag) {
 				$field = Varchar::create('Tag', '255');
 				$field->setValue($tag->getName());
 				$returnTags[] = $field;
@@ -242,12 +242,12 @@ 
 	 */
 	public function getFullDeployMessages() {
 		$strategy = $this->getDeploymentStrategy();
-		if ($strategy->getActionCode()!=='full') return null;
+		if ($strategy->getActionCode() !== 'full') return null;
 
 		$changes = $strategy->getChangesModificationNeeded();
 		$messages = [];
 		foreach ($changes as $change => $details) {
-			if ($change==='Code version') continue;
+			if ($change === 'Code version') continue;
 
 			$messages[] = [
 				'Flag' => sprintf(
@@ -275,7 +275,7 @@ 
 	 */
 	public function getTag() {
 		$tags = $this->getTags();
-		if($tags->count() > 0) {
+		if ($tags->count() > 0) {
 			return $tags->last();
 		}
 		return null;
@@ -300,7 +300,7 @@ 
 	public function getChanges() {
 		$list = new ArrayList();
 		$strategy = $this->getDeploymentStrategy();
-		foreach($strategy->getChanges() as $name => $change) {
+		foreach ($strategy->getChanges() as $name => $change) {
 			$changed = (isset($change['from']) && isset($change['to'])) ? $change['from'] != $change['to'] : null;
 			$description = isset($change['description']) ? $change['description'] : '';
 			$compareUrl = null;
@@ -350,11 +350,11 @@ 
 		// Make sure we use the SHA as it was written into this DNDeployment.
 		$args['sha'] = $this->SHA;
 
-		if(!$this->DeployerID) {
+		if (!$this->DeployerID) {
 			$this->DeployerID = Member::currentUserID();
 		}
 
-		if($this->DeployerID) {
+		if ($this->DeployerID) {
 			$deployer = $this->Deployer();
 			$message = sprintf(
 				'Deploy to %s initiated by %s (%s), with IP address %s',

code/control/DeployForm.php

Spacing +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
 				substr($sha, 0, 8),
 				$branch->LastUpdated()->TimeDiff()
 			);
-			$branches[$sha . '-' . $name] = $branchValue;
+			$branches[$sha.'-'.$name] = $branchValue;
 		}
 
 		// Tags
@@ -86,7 +86,7 @@ 
 				substr($sha, 0, 8),
 				$branch->LastUpdated()->TimeDiff()
 			);
-			$tags[$sha . '-' . $tag] = $tagValue;
+			$tags[$sha.'-'.$tag] = $tagValue;
 		}
 		$tags = array_reverse($tags);
 

code/model/StateMachineFactory.php

Braces +3 added lines, -1 removed lines

@@ -58,7 +58,9 @@
 
 	protected function addHandlers($machine) {
 		$class = get_class($machine->getObject());
-		if (empty($this->config()->handlers[$class])) return;
+		if (empty($this->config()->handlers[$class])) {
+			return;
+		}
 
 		$transitions = $this->config()->handlers[$class];
 		foreach ($transitions as $transName => $handlers) {

code/control/DeployDispatcher.php

Doc Comments +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 	 *
 	 * @param \SS_HTTPRequest $request
 	 *
-	 * @return \HTMLText|\SS_HTTPResponse
+	 * @return SS_HTTPResponse|null
 	 */
 	public function index(\SS_HTTPRequest $request) {
 		return $this->redirect(\Controller::join_links($this->Link(), 'history'), 302);

Spacing +2 added lines, -2 removed lines

@@ -263,12 +263,12 @@
 
 		// failover for older deployments
 		$started = $deployment->Created;
-		if($deployment->DeployStarted) {
+		if ($deployment->DeployStarted) {
 			$started = $deployment->DeployStarted;
 		}
 
 		$requested = $deployment->Created;
-		if($deployment->DeployRequested) {
+		if ($deployment->DeployRequested) {
 			$requested = $deployment->DeployRequested;
 		}