@@ -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 | ) { |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | */ |
64 | 64 | public function asJSONValidatorErrors($code, $validatorErrors) { |
65 | 65 | $fieldErrors = []; |
66 | - foreach ($validatorErrors as $error) { |
|
66 | + foreach($validatorErrors as $error) { |
|
67 | 67 | $fieldErrors[$error['fieldName']] = $error['message']; |
68 | 68 | } |
69 | 69 | return $this->asJSONFormFieldErrors($code, $fieldErrors); |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | // To get around that, upon spotting an active redirect, we change the response code to 200, |
106 | 106 | // and move the redirect into the "RedirectTo" field in the JSON response. Frontend can |
107 | 107 | // then interpret this and trigger a redirect. |
108 | - if ($this->redirectedTo()) { |
|
108 | + if($this->redirectedTo()) { |
|
109 | 109 | $data['RedirectTo'] = $this->response->getHeader('Location'); |
110 | 110 | // Pop off the header - we are no longer redirecting via the usual mechanism. |
111 | 111 | $this->response->removeHeader('Location'); |
@@ -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(); |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | * @return bool |
263 | 263 | */ |
264 | 264 | public function canRestore($member = null) { |
265 | - if ($this->allowedAny( |
|
265 | + if($this->allowedAny( |
|
266 | 266 | array( |
267 | 267 | DNRoot::ALLOW_PROD_SNAPSHOT, |
268 | 268 | DNRoot::ALLOW_NON_PROD_SNAPSHOT |
@@ -282,7 +282,7 @@ discard block |
||
282 | 282 | * @return bool |
283 | 283 | */ |
284 | 284 | public function canBackup($member = null) { |
285 | - if ($this->allowedAny( |
|
285 | + if($this->allowedAny( |
|
286 | 286 | array( |
287 | 287 | DNRoot::ALLOW_PROD_SNAPSHOT, |
288 | 288 | DNRoot::ALLOW_NON_PROD_SNAPSHOT |
@@ -302,7 +302,7 @@ discard block |
||
302 | 302 | * @return bool |
303 | 303 | */ |
304 | 304 | public function canUploadArchive($member = null) { |
305 | - if ($this->allowedAny( |
|
305 | + if($this->allowedAny( |
|
306 | 306 | array( |
307 | 307 | DNRoot::ALLOW_PROD_SNAPSHOT, |
308 | 308 | DNRoot::ALLOW_NON_PROD_SNAPSHOT |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | * @return bool |
323 | 323 | */ |
324 | 324 | public function canDownloadArchive($member = null) { |
325 | - if ($this->allowedAny( |
|
325 | + if($this->allowedAny( |
|
326 | 326 | array( |
327 | 327 | DNRoot::ALLOW_PROD_SNAPSHOT, |
328 | 328 | DNRoot::ALLOW_NON_PROD_SNAPSHOT |
@@ -391,7 +391,7 @@ discard block |
||
391 | 391 | // Key-pair is available, use it. |
392 | 392 | $processEnv = array( |
393 | 393 | 'IDENT_KEY' => $this->getPrivateKeyPath(), |
394 | - 'GIT_SSH' => BASE_PATH . "/deploynaut/git-deploy.sh" |
|
394 | + 'GIT_SSH' => BASE_PATH."/deploynaut/git-deploy.sh" |
|
395 | 395 | ); |
396 | 396 | } else { |
397 | 397 | $processEnv = array(); |
@@ -746,7 +746,7 @@ discard block |
||
746 | 746 | */ |
747 | 747 | public function getPublicKeyPath() { |
748 | 748 | if($privateKey = $this->getPrivateKeyPath()) { |
749 | - return $privateKey . '.pub'; |
|
749 | + return $privateKey.'.pub'; |
|
750 | 750 | } |
751 | 751 | return null; |
752 | 752 | } |
@@ -761,7 +761,7 @@ discard block |
||
761 | 761 | if(!empty($keyDir)) { |
762 | 762 | $filter = FileNameFilter::create(); |
763 | 763 | $name = $filter->filter($this->Name); |
764 | - return $keyDir . '/' . $name; |
|
764 | + return $keyDir.'/'.$name; |
|
765 | 765 | } |
766 | 766 | return null; |
767 | 767 | } |
@@ -780,7 +780,7 @@ discard block |
||
780 | 780 | $filter = FileNameFilter::create(); |
781 | 781 | $name = $filter->filter($this->Name); |
782 | 782 | |
783 | - return $this->DNData()->getKeyDir() . '/' . $name; |
|
783 | + return $this->DNData()->getKeyDir().'/'.$name; |
|
784 | 784 | } |
785 | 785 | |
786 | 786 | /** |
@@ -869,7 +869,7 @@ discard block |
||
869 | 869 | /* Look for each whitelisted hostname */ |
870 | 870 | foreach($interfaces as $host => $interface) { |
871 | 871 | /* See if the CVS Path is for this hostname, followed by some junk (maybe a port), then the path */ |
872 | - if(preg_match('{^[^.]*' . $host . '(.*?)([/a-zA-Z].+)}', $this->CVSPath, $match)) { |
|
872 | + if(preg_match('{^[^.]*'.$host.'(.*?)([/a-zA-Z].+)}', $this->CVSPath, $match)) { |
|
873 | 873 | |
874 | 874 | $path = $match[2]; |
875 | 875 | |
@@ -880,10 +880,10 @@ discard block |
||
880 | 880 | $components = explode('.', $host); |
881 | 881 | |
882 | 882 | foreach($regex as $pattern => $replacement) { |
883 | - $path = preg_replace('/' . $pattern . '/', $replacement, $path); |
|
883 | + $path = preg_replace('/'.$pattern.'/', $replacement, $path); |
|
884 | 884 | } |
885 | 885 | |
886 | - $uxurl = Controller::join_links($scheme . '://', $host, $path); |
|
886 | + $uxurl = Controller::join_links($scheme.'://', $host, $path); |
|
887 | 887 | |
888 | 888 | if(array_key_exists('commit', $interface) && $interface['commit'] == false) { |
889 | 889 | $commiturl = false; |
@@ -987,14 +987,14 @@ discard block |
||
987 | 987 | * @return bool |
988 | 988 | */ |
989 | 989 | public function allowedAny($codes, $member = null) { |
990 | - if (!$member) { |
|
990 | + if(!$member) { |
|
991 | 991 | $member = Member::currentUser(); |
992 | 992 | } |
993 | 993 | |
994 | 994 | if(Permission::checkMember($member, 'ADMIN')) return true; |
995 | 995 | |
996 | 996 | $hits = $this->whoIsAllowedAny($codes)->filter('Member.ID', $member->ID)->count(); |
997 | - return ($hits>0 ? true : false); |
|
997 | + return ($hits > 0 ? true : false); |
|
998 | 998 | } |
999 | 999 | |
1000 | 1000 | /** |
@@ -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() { |