@@ -75,6 +75,7 @@ discard block |
||
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 |
||
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; |
@@ -130,10 +130,10 @@ |
||
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 | ) { |
@@ -386,9 +386,13 @@ discard block |
||
386 | 386 | // Must be logged in to check permissions |
387 | 387 | |
388 | 388 | if ($this->Usage==='Production' || $this->Usage==='Unspecified') { |
389 | - if ($this->Project()->allowed(DNRoot::ALLOW_PROD_DEPLOYMENT, $member)) return true; |
|
389 | + if ($this->Project()->allowed(DNRoot::ALLOW_PROD_DEPLOYMENT, $member)) { |
|
390 | + return true; |
|
391 | + } |
|
390 | 392 | } else { |
391 | - if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_DEPLOYMENT, $member)) return true; |
|
393 | + if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_DEPLOYMENT, $member)) { |
|
394 | + return true; |
|
395 | + } |
|
392 | 396 | } |
393 | 397 | |
394 | 398 | return $this->Deployers()->byID($member->ID) |
@@ -412,9 +416,13 @@ discard block |
||
412 | 416 | // Must be logged in to check permissions |
413 | 417 | |
414 | 418 | if ($this->Usage==='Production' || $this->Usage==='Unspecified') { |
415 | - if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true; |
|
419 | + if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) { |
|
420 | + return true; |
|
421 | + } |
|
416 | 422 | } else { |
417 | - if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true; |
|
423 | + if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) { |
|
424 | + return true; |
|
425 | + } |
|
418 | 426 | } |
419 | 427 | |
420 | 428 | return $this->CanRestoreMembers()->byID($member->ID) |
@@ -443,9 +451,13 @@ discard block |
||
443 | 451 | } |
444 | 452 | |
445 | 453 | if ($this->Usage==='Production' || $this->Usage==='Unspecified') { |
446 | - if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true; |
|
454 | + if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) { |
|
455 | + return true; |
|
456 | + } |
|
447 | 457 | } else { |
448 | - if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true; |
|
458 | + if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) { |
|
459 | + return true; |
|
460 | + } |
|
449 | 461 | } |
450 | 462 | |
451 | 463 | return $this->CanBackupMembers()->byID($member->ID) |
@@ -478,9 +490,13 @@ discard block |
||
478 | 490 | // Must be logged in to check permissions |
479 | 491 | |
480 | 492 | if ($this->Usage==='Production' || $this->Usage==='Unspecified') { |
481 | - if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true; |
|
493 | + if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) { |
|
494 | + return true; |
|
495 | + } |
|
482 | 496 | } else { |
483 | - if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true; |
|
497 | + if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) { |
|
498 | + return true; |
|
499 | + } |
|
484 | 500 | } |
485 | 501 | |
486 | 502 | return $this->ArchiveUploaders()->byID($member->ID) |
@@ -504,9 +520,13 @@ discard block |
||
504 | 520 | // Must be logged in to check permissions |
505 | 521 | |
506 | 522 | if ($this->Usage==='Production' || $this->Usage==='Unspecified') { |
507 | - if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true; |
|
523 | + if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) { |
|
524 | + return true; |
|
525 | + } |
|
508 | 526 | } else { |
509 | - if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true; |
|
527 | + if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) { |
|
528 | + return true; |
|
529 | + } |
|
510 | 530 | } |
511 | 531 | |
512 | 532 | return $this->ArchiveDownloaders()->byID($member->ID) |
@@ -573,9 +593,13 @@ discard block |
||
573 | 593 | // Must be logged in to check permissions |
574 | 594 | |
575 | 595 | if ($this->Usage==='Production' || $this->Usage==='Unspecified') { |
576 | - if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true; |
|
596 | + if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) { |
|
597 | + return true; |
|
598 | + } |
|
577 | 599 | } else { |
578 | - if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true; |
|
600 | + if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) { |
|
601 | + return true; |
|
602 | + } |
|
579 | 603 | } |
580 | 604 | |
581 | 605 | return $this->ArchiveDeleters()->byID($member->ID) |
@@ -954,7 +954,7 @@ |
||
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 |
@@ -408,10 +408,10 @@ discard block |
||
408 | 408 | } |
409 | 409 | // Must be logged in to check permissions |
410 | 410 | |
411 | - if ($this->Usage==='Production' || $this->Usage==='Unspecified') { |
|
412 | - if ($this->Project()->allowed(DNRoot::ALLOW_PROD_DEPLOYMENT, $member)) return true; |
|
411 | + if($this->Usage === 'Production' || $this->Usage === 'Unspecified') { |
|
412 | + if($this->Project()->allowed(DNRoot::ALLOW_PROD_DEPLOYMENT, $member)) return true; |
|
413 | 413 | } else { |
414 | - if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_DEPLOYMENT, $member)) return true; |
|
414 | + if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_DEPLOYMENT, $member)) return true; |
|
415 | 415 | } |
416 | 416 | |
417 | 417 | return $this->Deployers()->byID($member->ID) |
@@ -443,10 +443,10 @@ discard block |
||
443 | 443 | } |
444 | 444 | // Must be logged in to check permissions |
445 | 445 | |
446 | - if ($this->Usage==='Production' || $this->Usage==='Unspecified') { |
|
447 | - if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true; |
|
446 | + if($this->Usage === 'Production' || $this->Usage === 'Unspecified') { |
|
447 | + if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true; |
|
448 | 448 | } else { |
449 | - if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true; |
|
449 | + if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true; |
|
450 | 450 | } |
451 | 451 | |
452 | 452 | return $this->CanRestoreMembers()->byID($member->ID) |
@@ -474,10 +474,10 @@ discard block |
||
474 | 474 | return false; |
475 | 475 | } |
476 | 476 | |
477 | - if ($this->Usage==='Production' || $this->Usage==='Unspecified') { |
|
478 | - if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true; |
|
477 | + if($this->Usage === 'Production' || $this->Usage === 'Unspecified') { |
|
478 | + if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true; |
|
479 | 479 | } else { |
480 | - if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true; |
|
480 | + if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true; |
|
481 | 481 | } |
482 | 482 | |
483 | 483 | return $this->CanBackupMembers()->byID($member->ID) |
@@ -509,10 +509,10 @@ discard block |
||
509 | 509 | } |
510 | 510 | // Must be logged in to check permissions |
511 | 511 | |
512 | - if ($this->Usage==='Production' || $this->Usage==='Unspecified') { |
|
513 | - if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true; |
|
512 | + if($this->Usage === 'Production' || $this->Usage === 'Unspecified') { |
|
513 | + if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true; |
|
514 | 514 | } else { |
515 | - if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true; |
|
515 | + if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true; |
|
516 | 516 | } |
517 | 517 | |
518 | 518 | return $this->ArchiveUploaders()->byID($member->ID) |
@@ -535,10 +535,10 @@ discard block |
||
535 | 535 | } |
536 | 536 | // Must be logged in to check permissions |
537 | 537 | |
538 | - if ($this->Usage==='Production' || $this->Usage==='Unspecified') { |
|
539 | - if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true; |
|
538 | + if($this->Usage === 'Production' || $this->Usage === 'Unspecified') { |
|
539 | + if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true; |
|
540 | 540 | } else { |
541 | - if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true; |
|
541 | + if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true; |
|
542 | 542 | } |
543 | 543 | |
544 | 544 | return $this->ArchiveDownloaders()->byID($member->ID) |
@@ -604,10 +604,10 @@ discard block |
||
604 | 604 | } |
605 | 605 | // Must be logged in to check permissions |
606 | 606 | |
607 | - if ($this->Usage==='Production' || $this->Usage==='Unspecified') { |
|
608 | - if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true; |
|
607 | + if($this->Usage === 'Production' || $this->Usage === 'Unspecified') { |
|
608 | + if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true; |
|
609 | 609 | } else { |
610 | - if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true; |
|
610 | + if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true; |
|
611 | 611 | } |
612 | 612 | |
613 | 613 | return $this->ArchiveDeleters()->byID($member->ID) |
@@ -827,7 +827,7 @@ discard block |
||
827 | 827 | * @return string |
828 | 828 | */ |
829 | 829 | public function Link() { |
830 | - return $this->Project()->Link() . "/environment/" . $this->Name; |
|
830 | + return $this->Project()->Link()."/environment/".$this->Name; |
|
831 | 831 | } |
832 | 832 | |
833 | 833 | /** |
@@ -972,7 +972,7 @@ discard block |
||
972 | 972 | ->buildPermissionField('ArchiveUploaderGroups', 'ArchiveUploaders', $groups, $members) |
973 | 973 | ->setTitle('Who can upload?') |
974 | 974 | ->setDescription( |
975 | - 'Users who can upload archives linked to this environment into Deploynaut.<br />' . |
|
975 | + 'Users who can upload archives linked to this environment into Deploynaut.<br />'. |
|
976 | 976 | 'Linking them to an environment allows limiting download permissions (see below).' |
977 | 977 | ), |
978 | 978 | |
@@ -1044,7 +1044,7 @@ discard block |
||
1044 | 1044 | // Add actions |
1045 | 1045 | $action = new FormAction('check', 'Check Connection'); |
1046 | 1046 | $action->setUseButtonTag(true); |
1047 | - $dataURL = Director::absoluteBaseURL() . 'naut/api/' . $this->Project()->Name . '/' . $this->Name . '/ping'; |
|
1047 | + $dataURL = Director::absoluteBaseURL().'naut/api/'.$this->Project()->Name.'/'.$this->Name.'/ping'; |
|
1048 | 1048 | $action->setAttribute('data-url', $dataURL); |
1049 | 1049 | $fields->insertBefore($action, 'Name'); |
1050 | 1050 | |
@@ -1110,8 +1110,8 @@ discard block |
||
1110 | 1110 | */ |
1111 | 1111 | public function onBeforeWrite() { |
1112 | 1112 | parent::onBeforeWrite(); |
1113 | - if($this->Name && $this->Name . '.rb' != $this->Filename) { |
|
1114 | - $this->Filename = $this->Name . '.rb'; |
|
1113 | + if($this->Name && $this->Name.'.rb' != $this->Filename) { |
|
1114 | + $this->Filename = $this->Name.'.rb'; |
|
1115 | 1115 | } |
1116 | 1116 | $this->checkEnvironmentPath(); |
1117 | 1117 | $this->writeConfigFile(); |
@@ -1159,7 +1159,7 @@ discard block |
||
1159 | 1159 | && $this->Filename |
1160 | 1160 | && $this->CreateEnvConfig |
1161 | 1161 | ) { |
1162 | - $templateFile = $this->config()->template_file ?: BASE_PATH . '/deploynaut/environment.template'; |
|
1162 | + $templateFile = $this->config()->template_file ?: BASE_PATH.'/deploynaut/environment.template'; |
|
1163 | 1163 | file_put_contents($this->getConfigFilename(), file_get_contents($templateFile)); |
1164 | 1164 | } else if($this->envFileExists() && $this->DeployConfig) { |
1165 | 1165 | file_put_contents($this->getConfigFilename(), $this->DeployConfig); |
@@ -1231,7 +1231,7 @@ discard block |
||
1231 | 1231 | if(!$this->Filename) { |
1232 | 1232 | return ''; |
1233 | 1233 | } |
1234 | - return $this->DNData()->getEnvironmentDir() . '/' . $this->Project()->Name . '/' . $this->Filename; |
|
1234 | + return $this->DNData()->getEnvironmentDir().'/'.$this->Project()->Name.'/'.$this->Filename; |
|
1235 | 1235 | } |
1236 | 1236 | |
1237 | 1237 | /** |
@@ -1247,7 +1247,7 @@ discard block |
||
1247 | 1247 | } |
1248 | 1248 | $path = pathinfo($name); |
1249 | 1249 | if($path) { |
1250 | - return $path['dirname'] . '/' . $path['filename'] . '.yml'; |
|
1250 | + return $path['dirname'].'/'.$path['filename'].'.yml'; |
|
1251 | 1251 | } |
1252 | 1252 | } |
1253 | 1253 |
@@ -257,7 +257,7 @@ |
||
257 | 257 | * @return string |
258 | 258 | */ |
259 | 259 | public function getTitle() { |
260 | - return "Pipeline {$this->ID} (Status: {$this->Status})"; |
|
260 | + return "pipeline {$this->ID} (Status: {$this->Status})"; |
|
261 | 261 | } |
262 | 262 | |
263 | 263 | /** |
@@ -127,7 +127,7 @@ |
||
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 | } |
@@ -282,7 +282,7 @@ |
||
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')) { |
@@ -282,7 +282,7 @@ |
||
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')) { |
@@ -282,7 +282,7 @@ |
||
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')) { |
@@ -961,7 +961,7 @@ |
||
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); |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | ) |
184 | 184 | ); |
185 | 185 | |
186 | - if (\Director::isDev()) { |
|
186 | + if(\Director::isDev()) { |
|
187 | 187 | \Requirements::javascript('deploynaut/static/bundle-debug.js'); |
188 | 188 | } else { |
189 | 189 | \Requirements::javascript('deploynaut/static/bundle.js'); |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | } |
246 | 246 | |
247 | 247 | // Block framework jquery |
248 | - Requirements::block(FRAMEWORK_DIR . '/thirdparty/jquery/jquery.js'); |
|
248 | + Requirements::block(FRAMEWORK_DIR.'/thirdparty/jquery/jquery.js'); |
|
249 | 249 | |
250 | 250 | self::include_requirements(); |
251 | 251 | } |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | * @return \SS_HTTPResponse |
265 | 265 | */ |
266 | 266 | public function index(SS_HTTPRequest $request) { |
267 | - return $this->redirect($this->Link() . 'projects/'); |
|
267 | + return $this->redirect($this->Link().'projects/'); |
|
268 | 268 | } |
269 | 269 | |
270 | 270 | /** |
@@ -422,7 +422,7 @@ discard block |
||
422 | 422 | $form->disableSecurityToken(); |
423 | 423 | $form->addExtraClass('fields-wide'); |
424 | 424 | // Tweak the action so it plays well with our fake URL structure. |
425 | - $form->setFormAction($project->Link() . '/UploadSnapshotForm'); |
|
425 | + $form->setFormAction($project->Link().'/UploadSnapshotForm'); |
|
426 | 426 | |
427 | 427 | return $form; |
428 | 428 | } |
@@ -472,7 +472,7 @@ discard block |
||
472 | 472 | $dataArchive->DataTransfers()->add($dataTransfer); |
473 | 473 | $form->saveInto($dataArchive); |
474 | 474 | $dataArchive->write(); |
475 | - $workingDir = TEMP_FOLDER . DIRECTORY_SEPARATOR . 'deploynaut-transfer-' . $dataTransfer->ID; |
|
475 | + $workingDir = TEMP_FOLDER.DIRECTORY_SEPARATOR.'deploynaut-transfer-'.$dataTransfer->ID; |
|
476 | 476 | |
477 | 477 | $cleanupFn = function() use($workingDir, $dataTransfer, $dataArchive) { |
478 | 478 | $process = new Process(sprintf('rm -rf %s', escapeshellarg($workingDir))); |
@@ -572,7 +572,7 @@ discard block |
||
572 | 572 | $form->disableSecurityToken(); |
573 | 573 | $form->addExtraClass('fields-wide'); |
574 | 574 | // Tweak the action so it plays well with our fake URL structure. |
575 | - $form->setFormAction($project->Link() . '/PostSnapshotForm'); |
|
575 | + $form->setFormAction($project->Link().'/PostSnapshotForm'); |
|
576 | 576 | |
577 | 577 | return $form; |
578 | 578 | } |
@@ -710,7 +710,7 @@ discard block |
||
710 | 710 | $branchName = $request->getVar('name'); |
711 | 711 | $branch = $project->DNBranchList()->byName($branchName); |
712 | 712 | if(!$branch) { |
713 | - return new SS_HTTPResponse("Branch '" . Convert::raw2xml($branchName) . "' not found.", 404); |
|
713 | + return new SS_HTTPResponse("Branch '".Convert::raw2xml($branchName)."' not found.", 404); |
|
714 | 714 | } |
715 | 715 | |
716 | 716 | return $this->render(array( |
@@ -944,7 +944,7 @@ discard block |
||
944 | 944 | ); |
945 | 945 | |
946 | 946 | // Tweak the action so it plays well with our fake URL structure. |
947 | - $form->setFormAction($project->Link() . '/CreateEnvironmentForm'); |
|
947 | + $form->setFormAction($project->Link().'/CreateEnvironmentForm'); |
|
948 | 948 | |
949 | 949 | return $form; |
950 | 950 | } |
@@ -977,7 +977,7 @@ discard block |
||
977 | 977 | $job->write(); |
978 | 978 | $job->start(); |
979 | 979 | |
980 | - return $this->redirect($project->Link('createenv') . '/' . $job->ID); |
|
980 | + return $this->redirect($project->Link('createenv').'/'.$job->ID); |
|
981 | 981 | } |
982 | 982 | |
983 | 983 | /** |
@@ -1035,7 +1035,7 @@ discard block |
||
1035 | 1035 | */ |
1036 | 1036 | public function getPlatformSpecificStrings() { |
1037 | 1037 | $strings = $this->config()->platform_specific_strings; |
1038 | - if ($strings) { |
|
1038 | + if($strings) { |
|
1039 | 1039 | return new ArrayList($strings); |
1040 | 1040 | } |
1041 | 1041 | } |
@@ -1159,7 +1159,7 @@ discard block |
||
1159 | 1159 | return $body; |
1160 | 1160 | } |
1161 | 1161 | |
1162 | - $form->setFormAction($this->getRequest()->getURL() . '/DeployForm'); |
|
1162 | + $form->setFormAction($this->getRequest()->getURL().'/DeployForm'); |
|
1163 | 1163 | return $form; |
1164 | 1164 | } |
1165 | 1165 | |
@@ -1433,7 +1433,7 @@ discard block |
||
1433 | 1433 | $deployment->start(); |
1434 | 1434 | |
1435 | 1435 | return json_encode(array( |
1436 | - 'url' => Director::absoluteBaseURL() . $deployment->Link() |
|
1436 | + 'url' => Director::absoluteBaseURL().$deployment->Link() |
|
1437 | 1437 | ), JSON_PRETTY_PRINT); |
1438 | 1438 | } |
1439 | 1439 | |
@@ -1540,7 +1540,7 @@ discard block |
||
1540 | 1540 | ->addExtraClass('btn') |
1541 | 1541 | ) |
1542 | 1542 | ); |
1543 | - $form->setFormAction($this->getRequest()->getURL() . '/DataTransferForm'); |
|
1543 | + $form->setFormAction($this->getRequest()->getURL().'/DataTransferForm'); |
|
1544 | 1544 | |
1545 | 1545 | return $form; |
1546 | 1546 | } |
@@ -1742,7 +1742,7 @@ discard block |
||
1742 | 1742 | ->addExtraClass('btn') |
1743 | 1743 | ) |
1744 | 1744 | ); |
1745 | - $form->setFormAction($project->Link() . '/DataTransferRestoreForm'); |
|
1745 | + $form->setFormAction($project->Link().'/DataTransferRestoreForm'); |
|
1746 | 1746 | |
1747 | 1747 | return $form; |
1748 | 1748 | } |
@@ -1840,7 +1840,7 @@ discard block |
||
1840 | 1840 | ->addExtraClass('btn') |
1841 | 1841 | ) |
1842 | 1842 | ); |
1843 | - $form->setFormAction($project->Link() . '/DeleteForm'); |
|
1843 | + $form->setFormAction($project->Link().'/DeleteForm'); |
|
1844 | 1844 | |
1845 | 1845 | return $form; |
1846 | 1846 | } |
@@ -1946,7 +1946,7 @@ discard block |
||
1946 | 1946 | ->addExtraClass('btn') |
1947 | 1947 | ) |
1948 | 1948 | ); |
1949 | - $form->setFormAction($this->getCurrentProject()->Link() . '/MoveForm'); |
|
1949 | + $form->setFormAction($this->getCurrentProject()->Link().'/MoveForm'); |
|
1950 | 1950 | |
1951 | 1951 | return $form; |
1952 | 1952 | } |
@@ -2245,7 +2245,7 @@ discard block |
||
2245 | 2245 | */ |
2246 | 2246 | protected function project404Response() { |
2247 | 2247 | return new SS_HTTPResponse( |
2248 | - "Project '" . Convert::raw2xml($this->getRequest()->param('Project')) . "' not found.", |
|
2248 | + "Project '".Convert::raw2xml($this->getRequest()->param('Project'))."' not found.", |
|
2249 | 2249 | 404 |
2250 | 2250 | ); |
2251 | 2251 | } |
@@ -2255,7 +2255,7 @@ discard block |
||
2255 | 2255 | */ |
2256 | 2256 | protected function environment404Response() { |
2257 | 2257 | $envName = Convert::raw2xml($this->getRequest()->param('Environment')); |
2258 | - return new SS_HTTPResponse("Environment '" . $envName . "' not found.", 404); |
|
2258 | + return new SS_HTTPResponse("Environment '".$envName."' not found.", 404); |
|
2259 | 2259 | } |
2260 | 2260 | |
2261 | 2261 | /** |
@@ -2324,7 +2324,7 @@ discard block |
||
2324 | 2324 | public function AmbientMenu() { |
2325 | 2325 | $list = new ArrayList(); |
2326 | 2326 | |
2327 | - if (Member::currentUserID()) { |
|
2327 | + if(Member::currentUserID()) { |
|
2328 | 2328 | $list->push(new ArrayData(array( |
2329 | 2329 | 'Classes' => 'logout', |
2330 | 2330 | 'FaIcon' => 'sign-out', |
@@ -926,7 +926,9 @@ |
||
926 | 926 | } |
927 | 927 | |
928 | 928 | $fields = $backend->getCreateEnvironmentFields($project); |
929 | - if(!$fields) return null; |
|
929 | + if(!$fields) { |
|
930 | + return null; |
|
931 | + } |
|
930 | 932 | |
931 | 933 | if(!$project->canCreateEnvironments()) { |
932 | 934 | return new SS_HTTPResponse('Not allowed to create environments for this project', 401); |
@@ -229,7 +229,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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(); |
@@ -44,7 +44,7 @@ |
||
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 | /** |