Completed
Pull Request — master (#575)
by Mateusz
12:05
created
code/model/DNDataArchive.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
 			return false;
230 230
 		}
231 231
 
232
-		$key = $memberID . '-' . $this->EnvironmentID;
232
+		$key = $memberID.'-'.$this->EnvironmentID;
233 233
 		if(!isset(self::$_cache_can_restore[$key])) {
234 234
 			self::$_cache_can_restore[$key] = $this->Environment()->canUploadArchive($member);
235 235
 		}
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
250 250
 			return false;
251 251
 		}
252 252
 
253
-		$key = $memberID . '-' . $this->EnvironmentID;
253
+		$key = $memberID.'-'.$this->EnvironmentID;
254 254
 		if(!isset(self::$_cache_can_download[$key])) {
255 255
 			self::$_cache_can_download[$key] = $this->Environment()->canDownloadArchive($member);
256 256
 		}
@@ -437,7 +437,7 @@  discard block
 block discarded – undo
437 437
 		}
438 438
 
439 439
 		// Extract database.sql.gz to <workingdir>/database.sql
440
-		if(file_exists($workingDir . DIRECTORY_SEPARATOR . 'database.sql.gz')) {
440
+		if(file_exists($workingDir.DIRECTORY_SEPARATOR.'database.sql.gz')) {
441 441
 			$process = new Process('gunzip database.sql.gz', $workingDir);
442 442
 			$process->setTimeout(3600);
443 443
 			$process->run();
@@ -448,7 +448,7 @@  discard block
 block discarded – undo
448 448
 		}
449 449
 
450 450
 		// Extract assets.tar.gz to <workingdir>/assets/
451
-		if(file_exists($workingDir . DIRECTORY_SEPARATOR . 'assets.tar.gz')) {
451
+		if(file_exists($workingDir.DIRECTORY_SEPARATOR.'assets.tar.gz')) {
452 452
 			$process = new Process('tar xzf assets.tar.gz', $workingDir);
453 453
 			$process->setTimeout(3600);
454 454
 			$process->run();
Please login to merge, or discard this patch.
code/model/steps/RollbackStep.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@
 block discarded – undo
44 44
 	 */
45 45
 	public function getTitle() {
46 46
 		// Make sure the title includes the subtask
47
-		return parent::getTitle() . ":{$this->Doing}";
47
+		return parent::getTitle().":{$this->Doing}";
48 48
 	}
49 49
 
50 50
 	/**
Please login to merge, or discard this patch.
code/model/steps/DeploymentPipelineStep.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 
30 30
 	public function getTitle() {
31 31
 		// Make sure the title includes the subtask
32
-		return parent::getTitle() . ":{$this->Doing}";
32
+		return parent::getTitle().":{$this->Doing}";
33 33
 	}
34 34
 
35 35
 	public function start() {
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 
85 85
 		// Skip deployment for dry run
86 86
 		if($this->Pipeline()->DryRun) {
87
-			$this->log("[Skipped] Create DNDeployment for SHA " . $pipeline->SHA);
87
+			$this->log("[Skipped] Create DNDeployment for SHA ".$pipeline->SHA);
88 88
 			$this->write();
89 89
 			return true;
90 90
 		}
Please login to merge, or discard this patch.
code/model/steps/PipelineStep.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@
 block discarded – undo
74 74
 	}
75 75
 
76 76
 	public function getTreeTitle() {
77
-		return $this->Title . ' (Status: ' . $this->Status . ')';
77
+		return $this->Title.' (Status: '.$this->Status.')';
78 78
 	}
79 79
 
80 80
 	public function getNiceName() {
Please login to merge, or discard this patch.
code/model/GitonomyCache.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@
 block discarded – undo
7 7
 	public static $cache = array();
8 8
 
9 9
 	public static function getIncludingBranches($commit) {
10
-		$cacheKey = 'getIncludingBranches-' . $commit->getRepository()->getPath() . '-' . $commit->gethash();
10
+		$cacheKey = 'getIncludingBranches-'.$commit->getRepository()->getPath().'-'.$commit->gethash();
11 11
 		if(!isset(self::$cache[$cacheKey])) {
12 12
 			self::$cache[$cacheKey] = $commit->getIncludingBranches();
13 13
 		}
Please login to merge, or discard this patch.
code/model/DNBranch.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
 
56 56
 	public function Link() {
57 57
 		// Use a get-var for branch so that it can handle unsafe chars better
58
-		return Controller::join_links($this->project->Link(), 'branch?name=' . urlencode($this->Name()));
58
+		return Controller::join_links($this->project->Link(), 'branch?name='.urlencode($this->Name()));
59 59
 	}
60 60
 
61 61
 	/**
Please login to merge, or discard this patch.
code/model/jobs/DNPing.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
 	 * @return string
38 38
 	 */
39 39
 	public function LogLink() {
40
-		return $this->Link() . '/log';
40
+		return $this->Link().'/log';
41 41
 	}
42 42
 
43 43
 	/**
Please login to merge, or discard this patch.
code/model/jobs/DNDataTransfer.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 	}
113 113
 
114 114
 	public function getTitle() {
115
-		return $this->dbObject('Created')->Nice() . " (Status: {$this->Status})";
115
+		return $this->dbObject('Created')->Nice()." (Status: {$this->Status})";
116 116
 	}
117 117
 
118 118
 	public function Link() {
@@ -233,14 +233,14 @@  discard block
 block discarded – undo
233 233
 		$envName = $this->Environment()->getFullName();
234 234
 		if($this->Direction == 'get') {
235 235
 			if($this->Origin == 'ManualUpload') {
236
-				$description = 'Manual upload of ' . $this->getModeNice() . ' to ' . $envName;
236
+				$description = 'Manual upload of '.$this->getModeNice().' to '.$envName;
237 237
 			} elseif($this->IsBackupDataTransfer()) {
238
-				$description = 'Automated backup of ' . $this->getModeNice() . ' from ' . $envName;
238
+				$description = 'Automated backup of '.$this->getModeNice().' from '.$envName;
239 239
 			} else {
240
-				$description = 'Backup of ' . $this->getModeNice() . ' to ' . $envName;
240
+				$description = 'Backup of '.$this->getModeNice().' to '.$envName;
241 241
 			}
242 242
 		} else {
243
-			$description = 'Restore ' . $this->getModeNice() . ' to ' . $envName;
243
+			$description = 'Restore '.$this->getModeNice().' to '.$envName;
244 244
 		}
245 245
 
246 246
 		return $description;
Please login to merge, or discard this patch.
code/model/jobs/DNCreateEnvironment.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 	 * @return string
69 69
 	 */
70 70
 	public function LogLink() {
71
-		return $this->Link() . '/log';
71
+		return $this->Link().'/log';
72 72
 	}
73 73
 
74 74
 	/**
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 			if($env instanceof EnvironmentCreateBackend) {
191 191
 				return $env;
192 192
 			} else {
193
-				throw new Exception("Invalid backend: " . $data['EnvironmentType']);
193
+				throw new Exception("Invalid backend: ".$data['EnvironmentType']);
194 194
 			}
195 195
 		}
196 196
 		return null;
Please login to merge, or discard this patch.