@@ -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')) { |
@@ -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 | } |
@@ -55,7 +55,7 @@ |
||
55 | 55 | |
56 | 56 | public function Link() { |
57 | 57 | // Use a get-var for branch so that it can handle unsafe chars better |
58 | - return Controller::join_links($this->project->Link(), 'branch?name=' . urlencode($this->Name())); |
|
58 | + return Controller::join_links($this->project->Link(), 'branch?name='.urlencode($this->Name())); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | /** |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | */ |
82 | 82 | public function setEnvironmentDir($environmentDir) { |
83 | 83 | if($environmentDir[0] != "/") { |
84 | - $environmentDir = BASE_PATH . '/' . $environmentDir; |
|
84 | + $environmentDir = BASE_PATH.'/'.$environmentDir; |
|
85 | 85 | } |
86 | 86 | $this->environmentDir = realpath($environmentDir) ?: $environmentDir; |
87 | 87 | } |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | */ |
103 | 103 | public function setKeyDir($keyDir) { |
104 | 104 | if($keyDir[0] != "/") { |
105 | - $keyDir = BASE_PATH . '/' . $keyDir; |
|
105 | + $keyDir = BASE_PATH.'/'.$keyDir; |
|
106 | 106 | } |
107 | 107 | $this->keyDir = realpath($keyDir) ?: $keyDir; |
108 | 108 | } |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | */ |
145 | 145 | public function setDataTransferDir($transferDir) { |
146 | 146 | if($transferDir[0] != "/") { |
147 | - $transferDir = BASE_PATH . '/' . $transferDir; |
|
147 | + $transferDir = BASE_PATH.'/'.$transferDir; |
|
148 | 148 | } |
149 | 149 | if(strpos($transferDir, ASSETS_PATH) === false) { |
150 | 150 | throw new LogicException(sprintf( |
@@ -174,14 +174,14 @@ discard block |
||
174 | 174 | public function getProjectPaths() { |
175 | 175 | $paths = array(); |
176 | 176 | if(!file_exists($this->getEnvironmentDir())) { |
177 | - $eMessage = 'The environment directory ' . $this->getEnvironmentDir() . ' doesn\'t exist. Create it ' |
|
177 | + $eMessage = 'The environment directory '.$this->getEnvironmentDir().' doesn\'t exist. Create it ' |
|
178 | 178 | . 'first and add some projects to it.'; |
179 | 179 | throw new Exception($eMessage); |
180 | 180 | } |
181 | 181 | foreach(scandir($this->getEnvironmentDir()) as $project) { |
182 | 182 | // Exlcude dot-prefixed directories (.git was getting in the way) |
183 | 183 | if(preg_match('/^[^\.]/', $project)) { |
184 | - $path = $this->getEnvironmentDir() . '/' . $project; |
|
184 | + $path = $this->getEnvironmentDir().'/'.$project; |
|
185 | 185 | if(is_dir($path) && $project != '.' && $project != '..') { |
186 | 186 | $paths[] = $project; |
187 | 187 | } |
@@ -196,11 +196,11 @@ discard block |
||
196 | 196 | * Returns an array of paths |
197 | 197 | */ |
198 | 198 | public function getEnvironmentPaths($project) { |
199 | - $baseDir = $this->getEnvironmentDir() . '/' . $project; |
|
199 | + $baseDir = $this->getEnvironmentDir().'/'.$project; |
|
200 | 200 | |
201 | 201 | $paths = array(); |
202 | 202 | if(!file_exists($baseDir)) { |
203 | - throw new Exception('Environment directory ' . $baseDir . ' doesn\'t exist. Create it first.'); |
|
203 | + throw new Exception('Environment directory '.$baseDir.' doesn\'t exist. Create it first.'); |
|
204 | 204 | } |
205 | 205 | // Search the directory for config files. |
206 | 206 | foreach(scandir($baseDir) as $environmentFile) { |
@@ -37,7 +37,7 @@ |
||
37 | 37 | * @return string |
38 | 38 | */ |
39 | 39 | public function LogLink() { |
40 | - return $this->Link() . '/log'; |
|
40 | + return $this->Link().'/log'; |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | /** |