Completed
Pull Request — master (#526)
by Stig
03:13
created
code/model/steps/SmokeTestPipelineStep.php 2 patches
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.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -282,7 +282,7 @@
 block discarded – undo
282 282
 	 */
283 283
 	public function startApproval() {
284 284
 		$this->Status = 'Started';
285
-		$this->log("Starting {$this->Title}...");
285
+		$this->log("starting {$this->Title}...");
286 286
 		// Determine if we should use delayed notification
287 287
 		$recipientGroup = 'all';
288 288
 		if($this->getConfigSetting('RecipientsDelay')) {
Please login to merge, or discard this patch.
code/model/steps/UserConfirmationStep.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -282,7 +282,7 @@
 block discarded – undo
282 282
 	 */
283 283
 	public function startApproval() {
284 284
 		$this->Status = 'Started';
285
-		$this->log("Starting {$this->Title}...");
285
+		$this->log("starting {$this->Title}...");
286 286
 		// Determine if we should use delayed notification
287 287
 		$recipientGroup = 'all';
288 288
 		if($this->getConfigSetting('RecipientsDelay')) {
Please login to merge, or discard this patch.
code/tasks/DNMigrate1_1to1_2.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Will convert the Filename to the version 1.2 of deploynaut where it
4
- * more or less is exactly is the same as the Name but with .rb
5
- */
3
+	 * Will convert the Filename to the version 1.2 of deploynaut where it
4
+	 * more or less is exactly is the same as the Name but with .rb
5
+	 */
6 6
 class DNMigrate1_1to1_2 extends BuildTask {
7 7
 	/**
8 8
 	 * @param SS_HTTPRequest $request
Please login to merge, or discard this patch.
code/tasks/FilesystemSyncTask.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Surface Filesystem::sync() as a dev task in case CMS has not been included.
4
- */
3
+	 * Surface Filesystem::sync() as a dev task in case CMS has not been included.
4
+	 */
5 5
 class CMSFilesystemSyncTask extends BuildTask {
6 6
 	public function run($request = null) {
7 7
 		Filesystem::sync();
Please login to merge, or discard this patch.
code/model/steps/TriggerDeployStep.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -282,7 +282,7 @@
 block discarded – undo
282 282
 	 */
283 283
 	public function startApproval() {
284 284
 		$this->Status = 'Started';
285
-		$this->log("Starting {$this->Title}...");
285
+		$this->log("starting {$this->Title}...");
286 286
 		// Determine if we should use delayed notification
287 287
 		$recipientGroup = 'all';
288 288
 		if($this->getConfigSetting('RecipientsDelay')) {
Please login to merge, or discard this patch.
code/model/jobs/DNPing.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -1,14 +1,14 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * This class will queue a ping job and also proxy to the log file of that output
4
- *
5
- * @property string $ResqueToken
6
- *
7
- * @method DNEnvironment Environment()
8
- * @property int EnvironmentID
9
- * @method Member Deployer()
10
- * @property int DeployerID
11
- */
3
+	 * This class will queue a ping job and also proxy to the log file of that output
4
+	 *
5
+	 * @property string $ResqueToken
6
+	 *
7
+	 * @method DNEnvironment Environment()
8
+	 * @property int EnvironmentID
9
+	 * @method Member Deployer()
10
+	 * @property int DeployerID
11
+	 */
12 12
 class DNPing extends DataObject {
13 13
 
14 14
 	/**
Please login to merge, or discard this patch.
code/control/DNRoot.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -186,8 +186,8 @@  discard block
 block discarded – undo
186 186
 		Requirements::javascript('deploynaut/javascript/material.js');
187 187
 
188 188
 		// Load the buildable dependencies only if not loaded centrally.
189
-		if (!is_dir(BASE_PATH . DIRECTORY_SEPARATOR . 'static')) {
190
-			if (\Director::isDev()) {
189
+		if(!is_dir(BASE_PATH . DIRECTORY_SEPARATOR . 'static')) {
190
+			if(\Director::isDev()) {
191 191
 				\Requirements::javascript('deploynaut/static/bundle-debug.js');
192 192
 			} else {
193 193
 				\Requirements::javascript('deploynaut/static/bundle.js');
@@ -1046,7 +1046,7 @@  discard block
 block discarded – undo
1046 1046
 	 */
1047 1047
 	public function getPlatformSpecificStrings() {
1048 1048
 		$strings = $this->config()->platform_specific_strings;
1049
-		if ($strings) {
1049
+		if($strings) {
1050 1050
 			return new ArrayList($strings);
1051 1051
 		}
1052 1052
 	}
@@ -1111,7 +1111,7 @@  discard block
 block discarded – undo
1111 1111
 
1112 1112
 				$isCurrentEnvironment = false;
1113 1113
 				if($project && $currentEnvironment) {
1114
-					$isCurrentEnvironment = (bool) $project->DNEnvironmentList()->find('ID', $currentEnvironment->ID);
1114
+					$isCurrentEnvironment = (bool)$project->DNEnvironmentList()->find('ID', $currentEnvironment->ID);
1115 1115
 				}
1116 1116
 
1117 1117
 				$navigation->push(array(
@@ -2345,7 +2345,7 @@  discard block
 block discarded – undo
2345 2345
 	public function AmbientMenu() {
2346 2346
 		$list = new ArrayList();
2347 2347
 
2348
-		if (Member::currentUserID()) {
2348
+		if(Member::currentUserID()) {
2349 2349
 			$list->push(new ArrayData(array(
2350 2350
 				'Classes' => 'logout',
2351 2351
 				'FaIcon' => 'sign-out',
Please login to merge, or discard this patch.
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -2319,8 +2319,12 @@
 block discarded – undo
2319 2319
 	 * @return bool
2320 2320
 	 */
2321 2321
 	public function canCreateProjects($member = null) {
2322
-		if(!$member) $member = Member::currentUser();
2323
-		if(!$member) return false;
2322
+		if(!$member) {
2323
+			$member = Member::currentUser();
2324
+		}
2325
+		if(!$member) {
2326
+			return false;
2327
+		}
2324 2328
 
2325 2329
 		return singleton('DNProject')->canCreate($member);
2326 2330
 	}
Please login to merge, or discard this patch.