@@ -58,17 +58,17 @@ |
||
58 | 58 | |
59 | 59 | protected function addHandlers($machine) { |
60 | 60 | $class = get_class($machine->getObject()); |
61 | - if (empty($this->config()->handlers[$class])) return; |
|
61 | + if(empty($this->config()->handlers[$class])) return; |
|
62 | 62 | |
63 | 63 | $transitions = $this->config()->handlers[$class]; |
64 | - foreach ($transitions as $transName => $handlers) { |
|
65 | - if (!is_array($handlers)) { |
|
64 | + foreach($transitions as $transName => $handlers) { |
|
65 | + if(!is_array($handlers)) { |
|
66 | 66 | throw new Exception(sprintf('Transition %s must be configured as an assoc array.', $transName)); |
67 | 67 | } |
68 | 68 | |
69 | - foreach ($handlers as $handlerClass => $handlerMethod) { |
|
69 | + foreach($handlers as $handlerClass => $handlerMethod) { |
|
70 | 70 | $handlerObj = Injector::inst()->get($handlerClass); |
71 | - if (!is_callable([$handlerObj, $handlerMethod])) { |
|
71 | + if(!is_callable([$handlerObj, $handlerMethod])) { |
|
72 | 72 | throw new Exception(sprintf('Handler %s is not callable on %s.', $handlerMethod, $handlerClass)); |
73 | 73 | } |
74 | 74 | $machine->getDispatcher()->addListener( |
@@ -12,7 +12,7 @@ |
||
12 | 12 | protected function sendEmailToApprover(DNDeployment $deployment) { |
13 | 13 | $deployer = $deployment->Deployer(); |
14 | 14 | $approver = $deployment->Approver(); |
15 | - if (!$approver || !$approver->exists()) { |
|
15 | + if(!$approver || !$approver->exists()) { |
|
16 | 16 | return false; |
17 | 17 | } |
18 | 18 |
@@ -4,28 +4,28 @@ |
||
4 | 4 | |
5 | 5 | public function run($request) { |
6 | 6 | $log = function($message) { |
7 | - $message = sprintf('[%s] ', date('Y-m-d H:i:s')) . $message; |
|
8 | - echo $message . PHP_EOL; |
|
7 | + $message = sprintf('[%s] ', date('Y-m-d H:i:s')).$message; |
|
8 | + echo $message.PHP_EOL; |
|
9 | 9 | }; |
10 | 10 | |
11 | - if (!Director::is_cli()) { |
|
11 | + if(!Director::is_cli()) { |
|
12 | 12 | $log('This command can only run via CLI'); |
13 | 13 | return; |
14 | 14 | } |
15 | 15 | |
16 | 16 | $columns = DB::query('SHOW COLUMNS FROM "DNDeployment"')->column(); |
17 | - if (!in_array('Status', $columns)) { |
|
17 | + if(!in_array('Status', $columns)) { |
|
18 | 18 | $log('Migration has already been run'); |
19 | 19 | return; |
20 | 20 | } |
21 | 21 | |
22 | - foreach (DB::query('SELECT "ID", "Status" FROM "DNDeployment"') as $record) { |
|
22 | + foreach(DB::query('SELECT "ID", "Status" FROM "DNDeployment"') as $record) { |
|
23 | 23 | // This record looks to be already migrated |
24 | - if (empty($record['Status'])) { |
|
24 | + if(empty($record['Status'])) { |
|
25 | 25 | continue; |
26 | 26 | } |
27 | 27 | |
28 | - switch ($record['Status']) { |
|
28 | + switch($record['Status']) { |
|
29 | 29 | case 'Queued': |
30 | 30 | DB::query(sprintf('UPDATE "DNDeployment" SET "State" = \'Queued\' WHERE "ID" = %s', $record['ID'])); |
31 | 31 | break; |
@@ -17,9 +17,9 @@ discard block |
||
17 | 17 | */ |
18 | 18 | public function alarmHandler() { |
19 | 19 | $sigFile = $this->args['sigFile']; |
20 | - if (file_exists($sigFile) && is_readable($sigFile) && is_writable($sigFile)) { |
|
20 | + if(file_exists($sigFile) && is_readable($sigFile) && is_writable($sigFile)) { |
|
21 | 21 | $signal = (int)file_get_contents($sigFile); |
22 | - if (is_int($signal) && in_array((int)$signal, [ |
|
22 | + if(is_int($signal) && in_array((int)$signal, [ |
|
23 | 23 | // The following signals are trapped by both Resque and Rainforest. |
24 | 24 | SIGTERM, |
25 | 25 | SIGINT, |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | SIGCONT |
31 | 31 | ])) { |
32 | 32 | echo sprintf( |
33 | - '[-] Signal "%s" received, delivering to own process group, PID "%s".' . PHP_EOL, |
|
33 | + '[-] Signal "%s" received, delivering to own process group, PID "%s".'.PHP_EOL, |
|
34 | 34 | $signal, |
35 | 35 | getmypid() |
36 | 36 | ); |
@@ -40,9 +40,9 @@ discard block |
||
40 | 40 | |
41 | 41 | // Dispatch to own process group. |
42 | 42 | $pgid = posix_getpgid(getmypid()); |
43 | - if ($pgid<=0) { |
|
43 | + if($pgid <= 0) { |
|
44 | 44 | echo sprintf( |
45 | - '[-] Unable to send signal to invalid PGID "%s".' . PHP_EOL, |
|
45 | + '[-] Unable to send signal to invalid PGID "%s".'.PHP_EOL, |
|
46 | 46 | $pgid |
47 | 47 | ); |
48 | 48 | } else { |
@@ -61,8 +61,8 @@ discard block |
||
61 | 61 | posix_setsid(); |
62 | 62 | |
63 | 63 | if(function_exists('pcntl_alarm') && function_exists('pcntl_signal')) { |
64 | - if (!empty($this->args['sigFile'])) { |
|
65 | - echo sprintf('[-] Signal file requested, polling "%s".' . PHP_EOL, $this->args['sigFile']); |
|
64 | + if(!empty($this->args['sigFile'])) { |
|
65 | + echo sprintf('[-] Signal file requested, polling "%s".'.PHP_EOL, $this->args['sigFile']); |
|
66 | 66 | declare(ticks = 1); |
67 | 67 | pcntl_signal(SIGALRM, [$this, 'alarmHandler']); |
68 | 68 | pcntl_alarm(1); |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | } |
75 | 75 | |
76 | 76 | public function perform() { |
77 | - echo "[-] DeployJob starting" . PHP_EOL; |
|
77 | + echo "[-] DeployJob starting".PHP_EOL; |
|
78 | 78 | $log = new DeploynautLogFile($this->args['logfile']); |
79 | 79 | |
80 | 80 | $deployment = DNDeployment::get()->byID($this->args['deploymentID']); |
@@ -109,11 +109,11 @@ discard block |
||
109 | 109 | ); |
110 | 110 | } catch(Exception $e) { |
111 | 111 | // DeploynautJob will automatically trigger onFailure. |
112 | - echo "[-] DeployJob failed" . PHP_EOL; |
|
112 | + echo "[-] DeployJob failed".PHP_EOL; |
|
113 | 113 | throw $e; |
114 | 114 | } |
115 | 115 | $this->updateStatus(DNDeployment::TR_COMPLETE); |
116 | - echo "[-] DeployJob finished" . PHP_EOL; |
|
116 | + echo "[-] DeployJob finished".PHP_EOL; |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | public function onFailure(Exception $exception) { |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | } |
101 | 101 | |
102 | 102 | public function LogLink() { |
103 | - return $this->Link() . '/log'; |
|
103 | + return $this->Link().'/log'; |
|
104 | 104 | } |
105 | 105 | |
106 | 106 | public function canView($member = null) { |
@@ -219,12 +219,12 @@ discard block |
||
219 | 219 | */ |
220 | 220 | public function getFullDeployMessages() { |
221 | 221 | $strategy = $this->getDeploymentStrategy(); |
222 | - if ($strategy->getActionCode()!=='full') return null; |
|
222 | + if($strategy->getActionCode() !== 'full') return null; |
|
223 | 223 | |
224 | 224 | $changes = $strategy->getChangesModificationNeeded(); |
225 | 225 | $messages = []; |
226 | - foreach ($changes as $change => $details) { |
|
227 | - if ($change==='Code version') continue; |
|
226 | + foreach($changes as $change => $details) { |
|
227 | + if($change === 'Code version') continue; |
|
228 | 228 | |
229 | 229 | $messages[] = [ |
230 | 230 | 'Flag' => sprintf( |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | ]; |
236 | 236 | } |
237 | 237 | |
238 | - if (empty($messages)) { |
|
238 | + if(empty($messages)) { |
|
239 | 239 | $messages[] = [ |
240 | 240 | 'Flag' => '', |
241 | 241 | 'Text' => '<i>Environment changes have been made.</i>' |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | |
285 | 285 | // if there is a compare URL, and a description or a change (something actually changed) |
286 | 286 | // then show the URL. Otherwise don't show anything, as there is no comparison to be made. |
287 | - if ($changed || $description) { |
|
287 | + if($changed || $description) { |
|
288 | 288 | $compareUrl = isset($change['compareUrl']) ? $change['compareUrl'] : ''; |
289 | 289 | } |
290 | 290 | |
@@ -348,7 +348,7 @@ discard block |
||
348 | 348 | |
349 | 349 | public function getSigFile() { |
350 | 350 | $dir = DNData::inst()->getSignalDir(); |
351 | - if (!is_dir($dir)) { |
|
351 | + if(!is_dir($dir)) { |
|
352 | 352 | `mkdir $dir`; |
353 | 353 | } |
354 | 354 | return sprintf( |