@@ -110,8 +110,12 @@ |
||
| 110 | 110 | // Normalise "empty" values into dashes so comparisons are done properly. |
| 111 | 111 | // This means there is no diference between an empty string and a null |
| 112 | 112 | // but "0" is considered to be non-empty. |
| 113 | - if(empty($from) && !strlen($from)) $from = '-'; |
|
| 114 | - if(empty($to) && !strlen($to)) $to = '-'; |
|
| 113 | + if(empty($from) && !strlen($from)) { |
|
| 114 | + $from = '-'; |
|
| 115 | + } |
|
| 116 | + if(empty($to) && !strlen($to)) { |
|
| 117 | + $to = '-'; |
|
| 118 | + } |
|
| 115 | 119 | |
| 116 | 120 | return $this->changes[$title] = array( |
| 117 | 121 | 'from' => $from, |
@@ -205,12 +205,16 @@ |
||
| 205 | 205 | */ |
| 206 | 206 | public function getFullDeployMessages() { |
| 207 | 207 | $strategy = $this->getDeploymentStrategy(); |
| 208 | - if ($strategy->getActionCode()!=='full') return null; |
|
| 208 | + if ($strategy->getActionCode()!=='full') { |
|
| 209 | + return null; |
|
| 210 | + } |
|
| 209 | 211 | |
| 210 | 212 | $changes = $strategy->getChangesModificationNeeded(); |
| 211 | 213 | $messages = []; |
| 212 | 214 | foreach ($changes as $change => $details) { |
| 213 | - if ($change==='Code version') continue; |
|
| 215 | + if ($change==='Code version') { |
|
| 216 | + continue; |
|
| 217 | + } |
|
| 214 | 218 | |
| 215 | 219 | $messages[] = [ |
| 216 | 220 | 'Flag' => sprintf( |
@@ -58,7 +58,9 @@ |
||
| 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])) { |
|
| 62 | + return; |
|
| 63 | + } |
|
| 62 | 64 | |
| 63 | 65 | $transitions = $this->config()->handlers[$class]; |
| 64 | 66 | foreach ($transitions as $transName => $handlers) { |
@@ -172,9 +172,11 @@ |
||
| 172 | 172 | return $errorResponse; |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | - if (!$this->project->allowed(self::ALLOW_APPROVAL, Member::currentUser))) { |
|
| 175 | + if (!$this->project->allowed(self::ALLOW_APPROVAL, Member::currentUser)) { |
|
| 176 | + ) { |
|
| 176 | 177 | return $this->getAPIResponse(['message' => 'You are not authorised to approve this deployment'], 403); |
| 177 | 178 | } |
| 179 | + } |
|
| 178 | 180 | |
| 179 | 181 | try { |
| 180 | 182 | $deployment->getMachine()->apply(DNDeployment::TR_APPROVE); |