@@ -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 | ) { |
@@ -963,7 +963,7 @@ discard block |
||
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 |
||
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()) { |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | ) |
186 | 186 | ); |
187 | 187 | |
188 | - if (\Director::isDev()) { |
|
188 | + if(\Director::isDev()) { |
|
189 | 189 | \Requirements::javascript('deploynaut/static/bundle-debug.js'); |
190 | 190 | } else { |
191 | 191 | \Requirements::javascript('deploynaut/static/bundle.js'); |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | } |
248 | 248 | |
249 | 249 | // Block framework jquery |
250 | - Requirements::block(FRAMEWORK_DIR . '/thirdparty/jquery/jquery.js'); |
|
250 | + Requirements::block(FRAMEWORK_DIR.'/thirdparty/jquery/jquery.js'); |
|
251 | 251 | |
252 | 252 | self::include_requirements(); |
253 | 253 | } |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | * @return \SS_HTTPResponse |
267 | 267 | */ |
268 | 268 | public function index(SS_HTTPRequest $request) { |
269 | - return $this->redirect($this->Link() . 'projects/'); |
|
269 | + return $this->redirect($this->Link().'projects/'); |
|
270 | 270 | } |
271 | 271 | |
272 | 272 | /** |
@@ -424,7 +424,7 @@ discard block |
||
424 | 424 | $form->disableSecurityToken(); |
425 | 425 | $form->addExtraClass('fields-wide'); |
426 | 426 | // Tweak the action so it plays well with our fake URL structure. |
427 | - $form->setFormAction($project->Link() . '/UploadSnapshotForm'); |
|
427 | + $form->setFormAction($project->Link().'/UploadSnapshotForm'); |
|
428 | 428 | |
429 | 429 | return $form; |
430 | 430 | } |
@@ -474,7 +474,7 @@ discard block |
||
474 | 474 | $dataArchive->DataTransfers()->add($dataTransfer); |
475 | 475 | $form->saveInto($dataArchive); |
476 | 476 | $dataArchive->write(); |
477 | - $workingDir = TEMP_FOLDER . DIRECTORY_SEPARATOR . 'deploynaut-transfer-' . $dataTransfer->ID; |
|
477 | + $workingDir = TEMP_FOLDER.DIRECTORY_SEPARATOR.'deploynaut-transfer-'.$dataTransfer->ID; |
|
478 | 478 | |
479 | 479 | $cleanupFn = function() use($workingDir, $dataTransfer, $dataArchive) { |
480 | 480 | $process = new Process(sprintf('rm -rf %s', escapeshellarg($workingDir))); |
@@ -574,7 +574,7 @@ discard block |
||
574 | 574 | $form->disableSecurityToken(); |
575 | 575 | $form->addExtraClass('fields-wide'); |
576 | 576 | // Tweak the action so it plays well with our fake URL structure. |
577 | - $form->setFormAction($project->Link() . '/PostSnapshotForm'); |
|
577 | + $form->setFormAction($project->Link().'/PostSnapshotForm'); |
|
578 | 578 | |
579 | 579 | return $form; |
580 | 580 | } |
@@ -712,7 +712,7 @@ discard block |
||
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(array( |
@@ -946,7 +946,7 @@ discard block |
||
946 | 946 | ); |
947 | 947 | |
948 | 948 | // Tweak the action so it plays well with our fake URL structure. |
949 | - $form->setFormAction($project->Link() . '/CreateEnvironmentForm'); |
|
949 | + $form->setFormAction($project->Link().'/CreateEnvironmentForm'); |
|
950 | 950 | |
951 | 951 | return $form; |
952 | 952 | } |
@@ -979,7 +979,7 @@ discard block |
||
979 | 979 | $job->write(); |
980 | 980 | $job->start(); |
981 | 981 | |
982 | - return $this->redirect($project->Link('createenv') . '/' . $job->ID); |
|
982 | + return $this->redirect($project->Link('createenv').'/'.$job->ID); |
|
983 | 983 | } |
984 | 984 | |
985 | 985 | /** |
@@ -1037,7 +1037,7 @@ discard block |
||
1037 | 1037 | */ |
1038 | 1038 | public function getPlatformSpecificStrings() { |
1039 | 1039 | $strings = $this->config()->platform_specific_strings; |
1040 | - if ($strings) { |
|
1040 | + if($strings) { |
|
1041 | 1041 | return new ArrayList($strings); |
1042 | 1042 | } |
1043 | 1043 | } |
@@ -1161,7 +1161,7 @@ discard block |
||
1161 | 1161 | return $body; |
1162 | 1162 | } |
1163 | 1163 | |
1164 | - $form->setFormAction($this->getRequest()->getURL() . '/DeployForm'); |
|
1164 | + $form->setFormAction($this->getRequest()->getURL().'/DeployForm'); |
|
1165 | 1165 | return $form; |
1166 | 1166 | } |
1167 | 1167 | |
@@ -1435,7 +1435,7 @@ discard block |
||
1435 | 1435 | $deployment->start(); |
1436 | 1436 | |
1437 | 1437 | return json_encode(array( |
1438 | - 'url' => Director::absoluteBaseURL() . $deployment->Link() |
|
1438 | + 'url' => Director::absoluteBaseURL().$deployment->Link() |
|
1439 | 1439 | ), JSON_PRETTY_PRINT); |
1440 | 1440 | } |
1441 | 1441 | |
@@ -1542,7 +1542,7 @@ discard block |
||
1542 | 1542 | ->addExtraClass('btn') |
1543 | 1543 | ) |
1544 | 1544 | ); |
1545 | - $form->setFormAction($this->getRequest()->getURL() . '/DataTransferForm'); |
|
1545 | + $form->setFormAction($this->getRequest()->getURL().'/DataTransferForm'); |
|
1546 | 1546 | |
1547 | 1547 | return $form; |
1548 | 1548 | } |
@@ -1744,7 +1744,7 @@ discard block |
||
1744 | 1744 | ->addExtraClass('btn') |
1745 | 1745 | ) |
1746 | 1746 | ); |
1747 | - $form->setFormAction($project->Link() . '/DataTransferRestoreForm'); |
|
1747 | + $form->setFormAction($project->Link().'/DataTransferRestoreForm'); |
|
1748 | 1748 | |
1749 | 1749 | return $form; |
1750 | 1750 | } |
@@ -1842,7 +1842,7 @@ discard block |
||
1842 | 1842 | ->addExtraClass('btn') |
1843 | 1843 | ) |
1844 | 1844 | ); |
1845 | - $form->setFormAction($project->Link() . '/DeleteForm'); |
|
1845 | + $form->setFormAction($project->Link().'/DeleteForm'); |
|
1846 | 1846 | |
1847 | 1847 | return $form; |
1848 | 1848 | } |
@@ -1948,7 +1948,7 @@ discard block |
||
1948 | 1948 | ->addExtraClass('btn') |
1949 | 1949 | ) |
1950 | 1950 | ); |
1951 | - $form->setFormAction($this->getCurrentProject()->Link() . '/MoveForm'); |
|
1951 | + $form->setFormAction($this->getCurrentProject()->Link().'/MoveForm'); |
|
1952 | 1952 | |
1953 | 1953 | return $form; |
1954 | 1954 | } |
@@ -2247,7 +2247,7 @@ discard block |
||
2247 | 2247 | */ |
2248 | 2248 | protected function project404Response() { |
2249 | 2249 | return new SS_HTTPResponse( |
2250 | - "Project '" . Convert::raw2xml($this->getRequest()->param('Project')) . "' not found.", |
|
2250 | + "Project '".Convert::raw2xml($this->getRequest()->param('Project'))."' not found.", |
|
2251 | 2251 | 404 |
2252 | 2252 | ); |
2253 | 2253 | } |
@@ -2257,7 +2257,7 @@ discard block |
||
2257 | 2257 | */ |
2258 | 2258 | protected function environment404Response() { |
2259 | 2259 | $envName = Convert::raw2xml($this->getRequest()->param('Environment')); |
2260 | - return new SS_HTTPResponse("Environment '" . $envName . "' not found.", 404); |
|
2260 | + return new SS_HTTPResponse("Environment '".$envName."' not found.", 404); |
|
2261 | 2261 | } |
2262 | 2262 | |
2263 | 2263 | /** |
@@ -2326,7 +2326,7 @@ discard block |
||
2326 | 2326 | public function AmbientMenu() { |
2327 | 2327 | $list = new ArrayList(); |
2328 | 2328 | |
2329 | - if (Member::currentUserID()) { |
|
2329 | + if(Member::currentUserID()) { |
|
2330 | 2330 | $list->push(new ArrayData(array( |
2331 | 2331 | 'Classes' => 'logout', |
2332 | 2332 | 'FaIcon' => 'sign-out', |
@@ -2432,7 +2432,7 @@ discard block |
||
2432 | 2432 | } else { |
2433 | 2433 | $form->sessionMessage('Unable to write the project to the database.', 'bad'); |
2434 | 2434 | } |
2435 | - } catch (ValidationException $e) { |
|
2435 | + } catch(ValidationException $e) { |
|
2436 | 2436 | $form->sessionMessage($e->getMessage(), 'bad'); |
2437 | 2437 | } |
2438 | 2438 | return $this->redirectBack(); |
@@ -3,7 +3,7 @@ |
||
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 »</a>', |
9 | 9 | $this->owner->record->Link() |
@@ -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 | } |
@@ -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 | /** |
@@ -29,7 +29,7 @@ discard block |
||
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 |
||
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 | } |
@@ -74,7 +74,7 @@ |
||
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() { |
@@ -7,7 +7,7 @@ |
||
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 | } |