Completed
Push — master ( d37947...f5a873 )
by Mateusz
1297:50 queued 1294:31
created
code/backends/DeploymentStrategy.php 2 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.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -130,10 +130,10 @@
 block discarded – undo
130 130
 	 */
131 131
 	public function getChangesModificationNeeded() {
132 132
 		$filtered = [];
133
-		foreach ($this->changes as $change => $details) {
134
-			if (array_key_exists('description', $details)) {
133
+		foreach($this->changes as $change => $details) {
134
+			if(array_key_exists('description', $details)) {
135 135
 				$filtered[$change] = $details;
136
-			} else if (
136
+			} else if(
137 137
 				(array_key_exists('from', $details) || array_key_exists('to', $details))
138 138
 				&& $details['from'] !== $details['to']
139 139
 			) {
Please login to merge, or discard this patch.
code/control/DNRoot.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -963,7 +963,7 @@  discard block
 block discarded – undo
963 963
 	 * @param array $data
964 964
 	 * @param Form $form
965 965
 	 *
966
-	 * @return bool|HTMLText|SS_HTTPResponse
966
+	 * @return SS_HTTPResponse|null
967 967
 	 */
968 968
 	public function doCreateEnvironment($data, Form $form) {
969 969
 		$this->setCurrentActionType(self::ACTION_ENVIRONMENTS);
@@ -2351,7 +2351,7 @@  discard block
 block discarded – undo
2351 2351
 	/**
2352 2352
 	 * Create project action.
2353 2353
 	 *
2354
-	 * @return SS_HTTPResponse
2354
+	 * @return HTMLText
2355 2355
 	 */
2356 2356
 	public function createproject(SS_HTTPRequest $request) {
2357 2357
 		if($this->canCreateProjects()) {
Please login to merge, or discard this patch.
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
 			)
190 190
 		);
191 191
 
192
-		if (\Director::isDev()) {
192
+		if(\Director::isDev()) {
193 193
 			\Requirements::javascript('deploynaut/static/bundle-debug.js');
194 194
 		} else {
195 195
 			\Requirements::javascript('deploynaut/static/bundle.js');
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
 		}
252 252
 
253 253
 		// Block framework jquery
254
-		Requirements::block(FRAMEWORK_DIR . '/thirdparty/jquery/jquery.js');
254
+		Requirements::block(FRAMEWORK_DIR.'/thirdparty/jquery/jquery.js');
255 255
 
256 256
 		self::include_requirements();
257 257
 	}
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
 	 * @return \SS_HTTPResponse
271 271
 	 */
272 272
 	public function index(SS_HTTPRequest $request) {
273
-		return $this->redirect($this->Link() . 'projects/');
273
+		return $this->redirect($this->Link().'projects/');
274 274
 	}
275 275
 
276 276
 	/**
@@ -428,7 +428,7 @@  discard block
 block discarded – undo
428 428
 		$form->disableSecurityToken();
429 429
 		$form->addExtraClass('fields-wide');
430 430
 		// Tweak the action so it plays well with our fake URL structure.
431
-		$form->setFormAction($project->Link() . '/UploadSnapshotForm');
431
+		$form->setFormAction($project->Link().'/UploadSnapshotForm');
432 432
 
433 433
 		return $form;
434 434
 	}
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
478 478
 		$dataArchive->DataTransfers()->add($dataTransfer);
479 479
 		$form->saveInto($dataArchive);
480 480
 		$dataArchive->write();
481
-		$workingDir = TEMP_FOLDER . DIRECTORY_SEPARATOR . 'deploynaut-transfer-' . $dataTransfer->ID;
481
+		$workingDir = TEMP_FOLDER.DIRECTORY_SEPARATOR.'deploynaut-transfer-'.$dataTransfer->ID;
482 482
 
483 483
 		$cleanupFn = function() use($workingDir, $dataTransfer, $dataArchive) {
484 484
 			$process = new Process(sprintf('rm -rf %s', escapeshellarg($workingDir)));
@@ -578,7 +578,7 @@  discard block
 block discarded – undo
578 578
 		$form->disableSecurityToken();
579 579
 		$form->addExtraClass('fields-wide');
580 580
 		// Tweak the action so it plays well with our fake URL structure.
581
-		$form->setFormAction($project->Link() . '/PostSnapshotForm');
581
+		$form->setFormAction($project->Link().'/PostSnapshotForm');
582 582
 
583 583
 		return $form;
584 584
 	}
@@ -716,7 +716,7 @@  discard block
 block discarded – undo
716 716
 		$branchName = $request->getVar('name');
717 717
 		$branch = $project->DNBranchList()->byName($branchName);
718 718
 		if(!$branch) {
719
-			return new SS_HTTPResponse("Branch '" . Convert::raw2xml($branchName) . "' not found.", 404);
719
+			return new SS_HTTPResponse("Branch '".Convert::raw2xml($branchName)."' not found.", 404);
720 720
 		}
721 721
 
722 722
 		return $this->render(array(
@@ -950,7 +950,7 @@  discard block
 block discarded – undo
950 950
 		);
951 951
 
952 952
 		// Tweak the action so it plays well with our fake URL structure.
953
-		$form->setFormAction($project->Link() . '/CreateEnvironmentForm');
953
+		$form->setFormAction($project->Link().'/CreateEnvironmentForm');
954 954
 
955 955
 		return $form;
956 956
 	}
@@ -983,7 +983,7 @@  discard block
 block discarded – undo
983 983
 		$job->write();
984 984
 		$job->start();
985 985
 
986
-		return $this->redirect($project->Link('createenv') . '/' . $job->ID);
986
+		return $this->redirect($project->Link('createenv').'/'.$job->ID);
987 987
 	}
988 988
 
989 989
 	/**
@@ -1041,7 +1041,7 @@  discard block
 block discarded – undo
1041 1041
 	 */
1042 1042
 	public function getPlatformSpecificStrings() {
1043 1043
 		$strings = $this->config()->platform_specific_strings;
1044
-		if ($strings) {
1044
+		if($strings) {
1045 1045
 			return new ArrayList($strings);
1046 1046
 		}
1047 1047
 	}
@@ -1165,7 +1165,7 @@  discard block
 block discarded – undo
1165 1165
 			return $body;
1166 1166
 		}
1167 1167
 
1168
-		$form->setFormAction($this->getRequest()->getURL() . '/DeployForm');
1168
+		$form->setFormAction($this->getRequest()->getURL().'/DeployForm');
1169 1169
 		return $form;
1170 1170
 	}
1171 1171
 
@@ -1439,7 +1439,7 @@  discard block
 block discarded – undo
1439 1439
 		$deployment->start();
1440 1440
 
1441 1441
 		return json_encode(array(
1442
-			'url' => Director::absoluteBaseURL() . $deployment->Link()
1442
+			'url' => Director::absoluteBaseURL().$deployment->Link()
1443 1443
 		), JSON_PRETTY_PRINT);
1444 1444
 	}
1445 1445
 
@@ -1546,7 +1546,7 @@  discard block
 block discarded – undo
1546 1546
 					->addExtraClass('btn')
1547 1547
 			)
1548 1548
 		);
1549
-		$form->setFormAction($this->getRequest()->getURL() . '/DataTransferForm');
1549
+		$form->setFormAction($this->getRequest()->getURL().'/DataTransferForm');
1550 1550
 
1551 1551
 		return $form;
1552 1552
 	}
@@ -1748,7 +1748,7 @@  discard block
 block discarded – undo
1748 1748
 					->addExtraClass('btn')
1749 1749
 			)
1750 1750
 		);
1751
-		$form->setFormAction($project->Link() . '/DataTransferRestoreForm');
1751
+		$form->setFormAction($project->Link().'/DataTransferRestoreForm');
1752 1752
 
1753 1753
 		return $form;
1754 1754
 	}
@@ -1846,7 +1846,7 @@  discard block
 block discarded – undo
1846 1846
 					->addExtraClass('btn')
1847 1847
 			)
1848 1848
 		);
1849
-		$form->setFormAction($project->Link() . '/DeleteForm');
1849
+		$form->setFormAction($project->Link().'/DeleteForm');
1850 1850
 
1851 1851
 		return $form;
1852 1852
 	}
@@ -1952,7 +1952,7 @@  discard block
 block discarded – undo
1952 1952
 					->addExtraClass('btn')
1953 1953
 			)
1954 1954
 		);
1955
-		$form->setFormAction($this->getCurrentProject()->Link() . '/MoveForm');
1955
+		$form->setFormAction($this->getCurrentProject()->Link().'/MoveForm');
1956 1956
 
1957 1957
 		return $form;
1958 1958
 	}
@@ -2251,7 +2251,7 @@  discard block
 block discarded – undo
2251 2251
 	 */
2252 2252
 	protected function project404Response() {
2253 2253
 		return new SS_HTTPResponse(
2254
-			"Project '" . Convert::raw2xml($this->getRequest()->param('Project')) . "' not found.",
2254
+			"Project '".Convert::raw2xml($this->getRequest()->param('Project'))."' not found.",
2255 2255
 			404
2256 2256
 		);
2257 2257
 	}
@@ -2261,7 +2261,7 @@  discard block
 block discarded – undo
2261 2261
 	 */
2262 2262
 	protected function environment404Response() {
2263 2263
 		$envName = Convert::raw2xml($this->getRequest()->param('Environment'));
2264
-		return new SS_HTTPResponse("Environment '" . $envName . "' not found.", 404);
2264
+		return new SS_HTTPResponse("Environment '".$envName."' not found.", 404);
2265 2265
 	}
2266 2266
 
2267 2267
 	/**
@@ -2328,7 +2328,7 @@  discard block
 block discarded – undo
2328 2328
 	public function AmbientMenu() {
2329 2329
 		$list = new ArrayList();
2330 2330
 
2331
-		if (Member::currentUserID()) {
2331
+		if(Member::currentUserID()) {
2332 2332
 			$list->push(new ArrayData(array(
2333 2333
 				'Classes' => 'logout',
2334 2334
 				'FaIcon' => 'sign-out',
@@ -2434,7 +2434,7 @@  discard block
 block discarded – undo
2434 2434
 			} else {
2435 2435
 				$form->sessionMessage('Unable to write the stack to the database.', 'bad');
2436 2436
 			}
2437
-		} catch (ValidationException $e) {
2437
+		} catch(ValidationException $e) {
2438 2438
 			$form->sessionMessage($e->getMessage(), 'bad');
2439 2439
 		}
2440 2440
 		return $this->redirectBack();
@@ -2514,7 +2514,7 @@  discard block
 block discarded – undo
2514 2514
 			try {
2515 2515
 				$clone->perform();
2516 2516
 				$canAccessRepo = true;
2517
-			} catch (RuntimeException $e) {
2517
+			} catch(RuntimeException $e) {
2518 2518
 				$canAccessRepo = false;
2519 2519
 			}
2520 2520
 			$data = ['canAccessRepo' => $canAccessRepo];
Please login to merge, or discard this patch.
code/extensions/FrontendLink.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
 class FrontendLink extends DataExtension {
4 4
 
5 5
 	public function updateItemEditForm($form) {
6
-		if ($this->owner->record->hasMethod('Link')) {
6
+		if($this->owner->record->hasMethod('Link')) {
7 7
 			$link = sprintf(
8 8
 				'<a style="margin: 0.5em" target="deploynaut-frontend" href="%s">Preview &raquo;</a>',
9 9
 				$this->owner->record->Link()
Please login to merge, or discard this patch.
code/model/steps/SmokeTestPipelineStep.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -127,7 +127,7 @@
 block discarded – undo
127 127
 		curl_setopt($ch, CURLOPT_URL, $test['URL']);
128 128
 
129 129
 		// Allow individual tests to override number of attempts
130
-		$attempts = (int) $this->getConfigSetting('Attempts');
130
+		$attempts = (int)$this->getConfigSetting('Attempts');
131 131
 		if(!empty($test['Attempts'])) {
132 132
 			$attempts = $test['Attempts'];
133 133
 		}
Please login to merge, or discard this patch.
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.