Completed
Push — master ( 330f5f...7ecc89 )
by Stig
05:58 queued 13s
created
code/backends/DeploymentStrategy.php 3 patches
Doc Comments   +2 added lines patch added patch discarded remove patch
@@ -75,6 +75,7 @@  discard block
 block discarded – undo
75 75
 	}
76 76
 
77 77
 	/**
78
+	 * @param string $code
78 79
 	 */
79 80
 	public function setActionCode($code) {
80 81
 		$this->actionCode = $code;
@@ -89,6 +90,7 @@  discard block
 block discarded – undo
89 90
 
90 91
 	/**
91 92
 	 * @param int
93
+	 * @param string $seconds
92 94
 	 */
93 95
 	public function setEstimatedTime($seconds) {
94 96
 		$this->estimatedTime = $seconds;
Please login to merge, or discard this patch.
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -110,8 +110,12 @@
 block discarded – undo
110 110
 		// Normalise "empty" values into dashes so comparisons are done properly.
111 111
 		// This means there is no diference between an empty string and a null
112 112
 		// but "0" is considered to be non-empty.
113
-		if(empty($from) && !strlen($from)) $from = '-';
114
-		if(empty($to) && !strlen($to)) $to = '-';
113
+		if(empty($from) && !strlen($from)) {
114
+			$from = '-';
115
+		}
116
+		if(empty($to) && !strlen($to)) {
117
+			$to = '-';
118
+		}
115 119
 
116 120
 		return $this->changes[$title] = array(
117 121
 			'from' => $from,
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -110,8 +110,8 @@  discard block
 block discarded – undo
110 110
 		// Normalise "empty" values into dashes so comparisons are done properly.
111 111
 		// This means there is no diference between an empty string and a null
112 112
 		// but "0" is considered to be non-empty.
113
-		if(empty($from) && !strlen($from)) $from = '-';
114
-		if(empty($to) && !strlen($to)) $to = '-';
113
+		if (empty($from) && !strlen($from)) $from = '-';
114
+		if (empty($to) && !strlen($to)) $to = '-';
115 115
 
116 116
 		return $this->changes[$title] = array(
117 117
 			'from' => $from,
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 	 */
171 171
 	public function getChange($key) {
172 172
 		$changes = $this->getChanges();
173
-		if(array_key_exists($key, $changes)) {
173
+		if (array_key_exists($key, $changes)) {
174 174
 			return new ArrayData($changes[$key]);
175 175
 		}
176 176
 		return null;
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
 	 * @return string|null
190 190
 	 */
191 191
 	public function getOption($option) {
192
-		if(!empty($this->options[$option])) {
192
+		if (!empty($this->options[$option])) {
193 193
 			return $this->options[$option];
194 194
 		}
195 195
 	}
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
 			DeploymentStrategy::WARNING_CODE => 1,
231 231
 			DeploymentStrategy::ERROR_CODE => 2
232 232
 		];
233
-		if($map[$current] < $map[$code]) {
233
+		if ($map[$current] < $map[$code]) {
234 234
 			$this->setValidationCode($code);
235 235
 		}
236 236
 	}
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
 		);
260 260
 
261 261
 		$output = array();
262
-		foreach($fields as $field) {
262
+		foreach ($fields as $field) {
263 263
 			$output[$field] = $this->$field;
264 264
 		}
265 265
 		return $output;
@@ -300,8 +300,8 @@  discard block
 block discarded – undo
300 300
 			'messages'
301 301
 		);
302 302
 
303
-		foreach($fields as $field) {
304
-			if(!empty($data[$field])) {
303
+		foreach ($fields as $field) {
304
+			if (!empty($data[$field])) {
305 305
 				$this->$field = $data[$field];
306 306
 			}
307 307
 		}
Please login to merge, or discard this patch.
code/model/DNEnvironment.php 3 patches
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -954,7 +954,7 @@
 block discarded – undo
954 954
 to other environments, alongside the "Who can restore" permission.<br>
955 955
 Should include all users with upload permissions, otherwise they can't download
956 956
 their own uploads.
957
-PHP
957
+php
958 958
 				),
959 959
 
960 960
 			// The Main.PipelineApprovers
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -578,7 +578,7 @@
 block discarded – undo
578 578
 	 * Dear people of the future: If you are looking to optimize this, simply create a CurrentBuildSHA(), which can be
579 579
 	 * a lot faster. I presume you came here because of the Project display template, which only needs a SHA.
580 580
 	 *
581
-	 * @return false|DNDeployment
581
+	 * @return DNDeployment
582 582
 	 */
583 583
 	public function CurrentBuild() {
584 584
 		// The DeployHistory function is far too slow to use for this
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -774,7 +774,7 @@  discard block
 block discarded – undo
774 774
 				->buildPermissionField('ArchiveUploaderGroups', 'ArchiveUploaders', $groups, $members)
775 775
 				->setTitle('Who can upload?')
776 776
 				->setDescription(
777
-					'Users who can upload archives linked to this environment into Deploynaut.<br />' .
777
+					'Users who can upload archives linked to this environment into Deploynaut.<br />'.
778 778
 					'Linking them to an environment allows limiting download permissions (see below).'
779 779
 				),
780 780
 
@@ -821,7 +821,7 @@  discard block
 block discarded – undo
821 821
 		// Add actions
822 822
 		$action = new FormAction('check', 'Check Connection');
823 823
 		$action->setUseButtonTag(true);
824
-		$dataURL = Director::absoluteBaseURL() . 'naut/api/' . $this->Project()->Name . '/' . $this->Name . '/ping';
824
+		$dataURL = Director::absoluteBaseURL().'naut/api/'.$this->Project()->Name.'/'.$this->Name.'/ping';
825 825
 		$action->setAttribute('data-url', $dataURL);
826 826
 		$fields->insertBefore($action, 'Name');
827 827
 
@@ -834,8 +834,8 @@  discard block
 block discarded – undo
834 834
 	 */
835 835
 	public function onBeforeWrite() {
836 836
 		parent::onBeforeWrite();
837
-		if ($this->Name && $this->Name . '.rb' != $this->Filename) {
838
-			$this->Filename = $this->Name . '.rb';
837
+		if ($this->Name && $this->Name.'.rb' != $this->Filename) {
838
+			$this->Filename = $this->Name.'.rb';
839 839
 		}
840 840
 		$this->checkEnvironmentPath();
841 841
 		$this->writeConfigFile();
@@ -885,7 +885,7 @@  discard block
 block discarded – undo
885 885
 		if (!$this->Filename) {
886 886
 			return '';
887 887
 		}
888
-		return $this->DNData()->getEnvironmentDir() . '/' . $this->Project()->Name . '/' . $this->Filename;
888
+		return $this->DNData()->getEnvironmentDir().'/'.$this->Project()->Name.'/'.$this->Filename;
889 889
 	}
890 890
 
891 891
 	/**
@@ -1039,7 +1039,7 @@  discard block
 block discarded – undo
1039 1039
 			&& $this->Filename
1040 1040
 			&& $this->CreateEnvConfig
1041 1041
 		) {
1042
-			$templateFile = $this->config()->template_file ?: BASE_PATH . '/deploynaut/environment.template';
1042
+			$templateFile = $this->config()->template_file ?: BASE_PATH.'/deploynaut/environment.template';
1043 1043
 			file_put_contents($this->getConfigFilename(), file_get_contents($templateFile));
1044 1044
 		} else if ($this->envFileExists() && $this->DeployConfig) {
1045 1045
 			file_put_contents($this->getConfigFilename(), $this->DeployConfig);
Please login to merge, or discard this patch.
code/control/DNRoot.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -961,7 +961,7 @@
 block discarded – undo
961 961
 	 * @param array $data
962 962
 	 * @param Form $form
963 963
 	 *
964
-	 * @return bool|HTMLText|SS_HTTPResponse
964
+	 * @return SS_HTTPResponse|null
965 965
 	 */
966 966
 	public function doCreateEnvironment($data, Form $form) {
967 967
 		$this->setCurrentActionType(self::ACTION_ENVIRONMENTS);
Please login to merge, or discard this patch.
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 		Requirements::javascript('deploynaut/javascript/material.js');
179 179
 
180 180
 		// Load the buildable dependencies only if not loaded centrally.
181
-		if (!is_dir(BASE_PATH . DIRECTORY_SEPARATOR . 'static')) {
181
+		if (!is_dir(BASE_PATH.DIRECTORY_SEPARATOR.'static')) {
182 182
 			if (\Director::isDev()) {
183 183
 				\Requirements::javascript('deploynaut/static/bundle-debug.js');
184 184
 			} else {
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
 		}
243 243
 
244 244
 		// Block framework jquery
245
-		Requirements::block(FRAMEWORK_DIR . '/thirdparty/jquery/jquery.js');
245
+		Requirements::block(FRAMEWORK_DIR.'/thirdparty/jquery/jquery.js');
246 246
 
247 247
 		self::include_requirements();
248 248
 	}
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
 	 * @return \SS_HTTPResponse
262 262
 	 */
263 263
 	public function index(SS_HTTPRequest $request) {
264
-		return $this->redirect($this->Link() . 'projects/');
264
+		return $this->redirect($this->Link().'projects/');
265 265
 	}
266 266
 
267 267
 	/**
@@ -389,7 +389,7 @@  discard block
 block discarded – undo
389 389
 		// Framing an environment as a "group of people with download access"
390 390
 		// makes more sense to the user here, while still allowing us to enforce
391 391
 		// environment specific restrictions on downloading the file later on.
392
-		$envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
392
+		$envs = $project->DNEnvironmentList()->filterByCallback(function($item) {
393 393
 			return $item->canUploadArchive();
394 394
 		});
395 395
 		$envsMap = [];
@@ -421,7 +421,7 @@  discard block
 block discarded – undo
421 421
 		$form->disableSecurityToken();
422 422
 		$form->addExtraClass('fields-wide');
423 423
 		// Tweak the action so it plays well with our fake URL structure.
424
-		$form->setFormAction($project->Link() . '/UploadSnapshotForm');
424
+		$form->setFormAction($project->Link().'/UploadSnapshotForm');
425 425
 
426 426
 		return $form;
427 427
 	}
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
442 442
 		}
443 443
 
444 444
 		$validEnvs = $project->DNEnvironmentList()
445
-			->filterByCallback(function ($item) {
445
+			->filterByCallback(function($item) {
446 446
 				return $item->canUploadArchive();
447 447
 			});
448 448
 
@@ -471,9 +471,9 @@  discard block
 block discarded – undo
471 471
 		$dataArchive->DataTransfers()->add($dataTransfer);
472 472
 		$form->saveInto($dataArchive);
473 473
 		$dataArchive->write();
474
-		$workingDir = TEMP_FOLDER . DIRECTORY_SEPARATOR . 'deploynaut-transfer-' . $dataTransfer->ID;
474
+		$workingDir = TEMP_FOLDER.DIRECTORY_SEPARATOR.'deploynaut-transfer-'.$dataTransfer->ID;
475 475
 
476
-		$cleanupFn = function () use ($workingDir, $dataTransfer, $dataArchive) {
476
+		$cleanupFn = function() use ($workingDir, $dataTransfer, $dataArchive) {
477 477
 			$process = new AbortableProcess(sprintf('rm -rf %s', escapeshellarg($workingDir)));
478 478
 			$process->setTimeout(120);
479 479
 			$process->run();
@@ -547,7 +547,7 @@  discard block
 block discarded – undo
547 547
 		// Framing an environment as a "group of people with download access"
548 548
 		// makes more sense to the user here, while still allowing us to enforce
549 549
 		// environment specific restrictions on downloading the file later on.
550
-		$envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
550
+		$envs = $project->DNEnvironmentList()->filterByCallback(function($item) {
551 551
 			return $item->canUploadArchive();
552 552
 		});
553 553
 		$envsMap = [];
@@ -573,7 +573,7 @@  discard block
 block discarded – undo
573 573
 		$form->disableSecurityToken();
574 574
 		$form->addExtraClass('fields-wide');
575 575
 		// Tweak the action so it plays well with our fake URL structure.
576
-		$form->setFormAction($project->Link() . '/PostSnapshotForm');
576
+		$form->setFormAction($project->Link().'/PostSnapshotForm');
577 577
 
578 578
 		return $form;
579 579
 	}
@@ -592,7 +592,7 @@  discard block
 block discarded – undo
592 592
 			return $this->project404Response();
593 593
 		}
594 594
 
595
-		$validEnvs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
595
+		$validEnvs = $project->DNEnvironmentList()->filterByCallback(function($item) {
596 596
 			return $item->canUploadArchive();
597 597
 		});
598 598
 
@@ -712,7 +712,7 @@  discard block
 block discarded – undo
712 712
 		$branchName = $request->getVar('name');
713 713
 		$branch = $project->DNBranchList()->byName($branchName);
714 714
 		if (!$branch) {
715
-			return new SS_HTTPResponse("Branch '" . Convert::raw2xml($branchName) . "' not found.", 404);
715
+			return new SS_HTTPResponse("Branch '".Convert::raw2xml($branchName)."' not found.", 404);
716 716
 		}
717 717
 
718 718
 		return $this->render([
@@ -849,7 +849,7 @@  discard block
 block discarded – undo
849 849
 		);
850 850
 
851 851
 		// Tweak the action so it plays well with our fake URL structure.
852
-		$form->setFormAction($project->Link() . '/CreateEnvironmentForm');
852
+		$form->setFormAction($project->Link().'/CreateEnvironmentForm');
853 853
 
854 854
 		return $form;
855 855
 	}
@@ -882,7 +882,7 @@  discard block
 block discarded – undo
882 882
 		$job->write();
883 883
 		$job->start();
884 884
 
885
-		return $this->redirect($project->Link('createenv') . '/' . $job->ID);
885
+		return $this->redirect($project->Link('createenv').'/'.$job->ID);
886 886
 	}
887 887
 
888 888
 	/**
@@ -1080,7 +1080,7 @@  discard block
 block discarded – undo
1080 1080
 			return $body;
1081 1081
 		}
1082 1082
 
1083
-		$form->setFormAction($this->getRequest()->getURL() . '/DeployForm');
1083
+		$form->setFormAction($this->getRequest()->getURL().'/DeployForm');
1084 1084
 		return $form;
1085 1085
 	}
1086 1086
 
@@ -1346,7 +1346,7 @@  discard block
 block discarded – undo
1346 1346
 		$deployment->getMachine()->apply(DNDeployment::TR_QUEUE);
1347 1347
 
1348 1348
 		return json_encode([
1349
-			'url' => Director::absoluteBaseURL() . $deployment->Link()
1349
+			'url' => Director::absoluteBaseURL().$deployment->Link()
1350 1350
 		], JSON_PRETTY_PRINT);
1351 1351
 	}
1352 1352
 
@@ -1469,7 +1469,7 @@  discard block
 block discarded – undo
1469 1469
 	 */
1470 1470
 	public function getDataTransferForm(SS_HTTPRequest $request = null) {
1471 1471
 		// Performs canView permission check by limiting visible projects
1472
-		$envs = $this->getCurrentProject()->DNEnvironmentList()->filterByCallback(function ($item) {
1472
+		$envs = $this->getCurrentProject()->DNEnvironmentList()->filterByCallback(function($item) {
1473 1473
 			return $item->canBackup();
1474 1474
 		});
1475 1475
 
@@ -1491,7 +1491,7 @@  discard block
 block discarded – undo
1491 1491
 					->addExtraClass('btn')
1492 1492
 			)
1493 1493
 		);
1494
-		$form->setFormAction($this->getRequest()->getURL() . '/DataTransferForm');
1494
+		$form->setFormAction($this->getRequest()->getURL().'/DataTransferForm');
1495 1495
 
1496 1496
 		return $form;
1497 1497
 	}
@@ -1517,12 +1517,12 @@  discard block
 block discarded – undo
1517 1517
 		// Validate direction.
1518 1518
 		if ($data['Direction'] == 'get') {
1519 1519
 			$validEnvs = $this->getCurrentProject()->DNEnvironmentList()
1520
-				->filterByCallback(function ($item) {
1520
+				->filterByCallback(function($item) {
1521 1521
 					return $item->canBackup();
1522 1522
 				});
1523 1523
 		} else if ($data['Direction'] == 'push') {
1524 1524
 			$validEnvs = $this->getCurrentProject()->DNEnvironmentList()
1525
-				->filterByCallback(function ($item) {
1525
+				->filterByCallback(function($item) {
1526 1526
 					return $item->canRestore();
1527 1527
 				});
1528 1528
 		} else {
@@ -1653,7 +1653,7 @@  discard block
 block discarded – undo
1653 1653
 
1654 1654
 		// Performs canView permission check by limiting visible projects
1655 1655
 		$project = $this->getCurrentProject();
1656
-		$envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
1656
+		$envs = $project->DNEnvironmentList()->filterByCallback(function($item) {
1657 1657
 			return $item->canRestore();
1658 1658
 		});
1659 1659
 
@@ -1692,7 +1692,7 @@  discard block
 block discarded – undo
1692 1692
 					->addExtraClass('btn')
1693 1693
 			)
1694 1694
 		);
1695
-		$form->setFormAction($project->Link() . '/DataTransferRestoreForm');
1695
+		$form->setFormAction($project->Link().'/DataTransferRestoreForm');
1696 1696
 
1697 1697
 		return $form;
1698 1698
 	}
@@ -1790,7 +1790,7 @@  discard block
 block discarded – undo
1790 1790
 					->addExtraClass('btn')
1791 1791
 			)
1792 1792
 		);
1793
-		$form->setFormAction($project->Link() . '/DeleteForm');
1793
+		$form->setFormAction($project->Link().'/DeleteForm');
1794 1794
 
1795 1795
 		return $form;
1796 1796
 	}
@@ -1896,7 +1896,7 @@  discard block
 block discarded – undo
1896 1896
 					->addExtraClass('btn')
1897 1897
 			)
1898 1898
 		);
1899
-		$form->setFormAction($this->getCurrentProject()->Link() . '/MoveForm');
1899
+		$form->setFormAction($this->getCurrentProject()->Link().'/MoveForm');
1900 1900
 
1901 1901
 		return $form;
1902 1902
 	}
@@ -2157,7 +2157,7 @@  discard block
 block discarded – undo
2157 2157
 		$transfers = DNDataTransfer::get()
2158 2158
 			->filter('EnvironmentID', $environments)
2159 2159
 			->filterByCallback(
2160
-				function ($record) {
2160
+				function($record) {
2161 2161
 					return
2162 2162
 						$record->Environment()->canRestore() || // Ensure member can perform an action on the transfers env
2163 2163
 						$record->Environment()->canBackup() ||
@@ -2282,7 +2282,7 @@  discard block
 block discarded – undo
2282 2282
 	 */
2283 2283
 	protected function project404Response() {
2284 2284
 		return new SS_HTTPResponse(
2285
-			"Project '" . Convert::raw2xml($this->getRequest()->param('Project')) . "' not found.",
2285
+			"Project '".Convert::raw2xml($this->getRequest()->param('Project'))."' not found.",
2286 2286
 			404
2287 2287
 		);
2288 2288
 	}
@@ -2292,7 +2292,7 @@  discard block
 block discarded – undo
2292 2292
 	 */
2293 2293
 	protected function environment404Response() {
2294 2294
 		$envName = Convert::raw2xml($this->getRequest()->param('Environment'));
2295
-		return new SS_HTTPResponse("Environment '" . $envName . "' not found.", 404);
2295
+		return new SS_HTTPResponse("Environment '".$envName."' not found.", 404);
2296 2296
 	}
2297 2297
 
2298 2298
 	/**
Please login to merge, or discard this patch.
code/jobs/PingJob.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
 	 * Do the actual job by calling the appropiate backend
32 32
 	 */
33 33
 	public function perform() {
34
-		echo "[-] PingJob starting" . PHP_EOL;
34
+		echo "[-] PingJob starting".PHP_EOL;
35 35
 		$log = new DeploynautLogFile($this->args['logfile']);
36 36
 
37 37
 		$ping = DNPing::get()->byID($this->args['pingID']);
Please login to merge, or discard this patch.
code/model/jobs/DNDeployment.php 3 patches
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -205,12 +205,16 @@
 block discarded – undo
205 205
 	 */
206 206
 	public function getFullDeployMessages() {
207 207
 		$strategy = $this->getDeploymentStrategy();
208
-		if ($strategy->getActionCode()!=='full') return null;
208
+		if ($strategy->getActionCode()!=='full') {
209
+			return null;
210
+		}
209 211
 
210 212
 		$changes = $strategy->getChangesModificationNeeded();
211 213
 		$messages = [];
212 214
 		foreach ($changes as $change => $details) {
213
-			if ($change==='Code version') continue;
215
+			if ($change==='Code version') {
216
+				continue;
217
+			}
214 218
 
215 219
 			$messages[] = [
216 220
 				'Flag' => sprintf(
Please login to merge, or discard this patch.
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -82,6 +82,9 @@
 block discarded – undo
82 82
 		'Deployer.Name' => 'Deployer'
83 83
 	);
84 84
 
85
+	/**
86
+	 * @param false|string $token
87
+	 */
85 88
 	public function setResqueToken($token) {
86 89
 		$this->ResqueToken = $token;
87 90
 	}
Please login to merge, or discard this patch.
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 	}
109 109
 
110 110
 	public function LogLink() {
111
-		return $this->Link() . '/log';
111
+		return $this->Link().'/log';
112 112
 	}
113 113
 
114 114
 	public function canView($member = null) {
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 	 * @return \Gitonomy\Git\Repository|null
155 155
 	 */
156 156
 	public function getRepository() {
157
-		if(!$this->SHA) {
157
+		if (!$this->SHA) {
158 158
 			return null;
159 159
 		}
160 160
 		return $this->Environment()->Project()->getRepository();
@@ -167,10 +167,10 @@  discard block
 block discarded – undo
167 167
 	 */
168 168
 	public function getCommit() {
169 169
 		$repo = $this->getRepository();
170
-		if($repo) {
170
+		if ($repo) {
171 171
 			try {
172 172
 				return $this->Environment()->getCommit($this->SHA);
173
-			} catch(Gitonomy\Git\Exception\ReferenceNotFoundException $ex) {
173
+			} catch (Gitonomy\Git\Exception\ReferenceNotFoundException $ex) {
174 174
 				return null;
175 175
 			}
176 176
 		}
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
 		if (!$interface) {
196 196
 			return null;
197 197
 		}
198
-		return $interface->CommitURL . '/' . $this->SHA;
198
+		return $interface->CommitURL.'/'.$this->SHA;
199 199
 	}
200 200
 
201 201
 	/**
@@ -205,10 +205,10 @@  discard block
 block discarded – undo
205 205
 	 */
206 206
 	public function getCommitMessage() {
207 207
 		$commit = $this->getCommit();
208
-		if($commit) {
208
+		if ($commit) {
209 209
 			try {
210 210
 				return Convert::raw2xml($this->Environment()->getCommitMessage($commit));
211
-			} catch(Gitonomy\Git\Exception\ReferenceNotFoundException $e) {
211
+			} catch (Gitonomy\Git\Exception\ReferenceNotFoundException $e) {
212 212
 				return null;
213 213
 			}
214 214
 		}
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 		$this->Environment()->getCommitTags($commit);
226 226
 		$returnTags = [];
227 227
 		if (!empty($tags)) {
228
-			foreach($tags as $tag) {
228
+			foreach ($tags as $tag) {
229 229
 				$field = Varchar::create('Tag', '255');
230 230
 				$field->setValue($tag->getName());
231 231
 				$returnTags[] = $field;
@@ -242,12 +242,12 @@  discard block
 block discarded – undo
242 242
 	 */
243 243
 	public function getFullDeployMessages() {
244 244
 		$strategy = $this->getDeploymentStrategy();
245
-		if ($strategy->getActionCode()!=='full') return null;
245
+		if ($strategy->getActionCode() !== 'full') return null;
246 246
 
247 247
 		$changes = $strategy->getChangesModificationNeeded();
248 248
 		$messages = [];
249 249
 		foreach ($changes as $change => $details) {
250
-			if ($change==='Code version') continue;
250
+			if ($change === 'Code version') continue;
251 251
 
252 252
 			$messages[] = [
253 253
 				'Flag' => sprintf(
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
 	 */
276 276
 	public function getTag() {
277 277
 		$tags = $this->getTags();
278
-		if($tags->count() > 0) {
278
+		if ($tags->count() > 0) {
279 279
 			return $tags->last();
280 280
 		}
281 281
 		return null;
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
 	public function getChanges() {
301 301
 		$list = new ArrayList();
302 302
 		$strategy = $this->getDeploymentStrategy();
303
-		foreach($strategy->getChanges() as $name => $change) {
303
+		foreach ($strategy->getChanges() as $name => $change) {
304 304
 			$changed = (isset($change['from']) && isset($change['to'])) ? $change['from'] != $change['to'] : null;
305 305
 			$description = isset($change['description']) ? $change['description'] : '';
306 306
 			$compareUrl = null;
@@ -350,11 +350,11 @@  discard block
 block discarded – undo
350 350
 		// Make sure we use the SHA as it was written into this DNDeployment.
351 351
 		$args['sha'] = $this->SHA;
352 352
 
353
-		if(!$this->DeployerID) {
353
+		if (!$this->DeployerID) {
354 354
 			$this->DeployerID = Member::currentUserID();
355 355
 		}
356 356
 
357
-		if($this->DeployerID) {
357
+		if ($this->DeployerID) {
358 358
 			$deployer = $this->Deployer();
359 359
 			$message = sprintf(
360 360
 				'Deploy to %s initiated by %s (%s), with IP address %s',
Please login to merge, or discard this patch.
code/control/DeployForm.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 				substr($sha, 0, 8),
74 74
 				$branch->LastUpdated()->TimeDiff()
75 75
 			);
76
-			$branches[$sha . '-' . $name] = $branchValue;
76
+			$branches[$sha.'-'.$name] = $branchValue;
77 77
 		}
78 78
 
79 79
 		// Tags
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 				substr($sha, 0, 8),
87 87
 				$branch->LastUpdated()->TimeDiff()
88 88
 			);
89
-			$tags[$sha . '-' . $tag] = $tagValue;
89
+			$tags[$sha.'-'.$tag] = $tagValue;
90 90
 		}
91 91
 		$tags = array_reverse($tags);
92 92
 
Please login to merge, or discard this patch.
code/model/StateMachineFactory.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,9 @@
 block discarded – undo
58 58
 
59 59
 	protected function addHandlers($machine) {
60 60
 		$class = get_class($machine->getObject());
61
-		if (empty($this->config()->handlers[$class])) return;
61
+		if (empty($this->config()->handlers[$class])) {
62
+			return;
63
+		}
62 64
 
63 65
 		$transitions = $this->config()->handlers[$class];
64 66
 		foreach ($transitions as $transName => $handlers) {
Please login to merge, or discard this patch.
code/control/DeployDispatcher.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
 	 *
47 47
 	 * @param \SS_HTTPRequest $request
48 48
 	 *
49
-	 * @return \HTMLText|\SS_HTTPResponse
49
+	 * @return SS_HTTPResponse|null
50 50
 	 */
51 51
 	public function index(\SS_HTTPRequest $request) {
52 52
 		return $this->redirect(\Controller::join_links($this->Link(), 'history'), 302);
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -263,12 +263,12 @@
 block discarded – undo
263 263
 
264 264
 		// failover for older deployments
265 265
 		$started = $deployment->Created;
266
-		if($deployment->DeployStarted) {
266
+		if ($deployment->DeployStarted) {
267 267
 			$started = $deployment->DeployStarted;
268 268
 		}
269 269
 
270 270
 		$requested = $deployment->Created;
271
-		if($deployment->DeployRequested) {
271
+		if ($deployment->DeployRequested) {
272 272
 			$requested = $deployment->DeployRequested;
273 273
 		}
274 274
 
Please login to merge, or discard this patch.
code/control/GitDispatcher.php 2 patches
Doc Comments   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 	 *
48 48
 	 * @param \SS_HTTPRequest $request
49 49
 	 *
50
-	 * @return \HTMLText|\SS_HTTPResponse
50
+	 * @return SS_HTTPResponse|null
51 51
 	 */
52 52
 	public function index(\SS_HTTPRequest $request) {
53 53
 		return $this->redirect(\Controller::join_links($this->Link(), 'show'), 302);
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	/**
73 73
 	 * @param SS_HTTPRequest $request
74 74
 	 *
75
-	 * @return string
75
+	 * @return SS_HTTPResponse
76 76
 	 */
77 77
 	public function show(\SS_HTTPRequest $request) {
78 78
 
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 	}
167 167
 
168 168
 	/**
169
-	 * @param $project
169
+	 * @param DNProject $project
170 170
 	 *
171 171
 	 * @return array
172 172
 	 */
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 	}
183 183
 
184 184
 	/**
185
-	 * @param $project
185
+	 * @param DNProject $project
186 186
 	 *
187 187
 	 * @return array
188 188
 	 */
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
 	}
199 199
 
200 200
 	/**
201
-	 * @param $project
201
+	 * @param DNProject $project
202 202
 	 *
203 203
 	 * @return array
204 204
 	 */
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 	protected function getUpdateStatus($ID) {
134 134
 		$ping = DNGitFetch::get()->byID($ID);
135 135
 		if (!$ping) {
136
-			return $this->getAPIResponse(['message' => 'GIT update (' . $ID . ') not found'], 404);
136
+			return $this->getAPIResponse(['message' => 'GIT update ('.$ID.') not found'], 404);
137 137
 		}
138 138
 		$output = [
139 139
 			'id' => $ID,
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 		$fetch->write();
155 155
 		$fetch->start();
156 156
 
157
-		$location = Director::absoluteBaseURL() . $this->Link() . '/update/' . $fetch->ID;
157
+		$location = Director::absoluteBaseURL().$this->Link().'/update/'.$fetch->ID;
158 158
 		$output = [
159 159
 			'message' => 'git fetch has been queued',
160 160
 			'id' => $fetch->ID,
Please login to merge, or discard this patch.