@@ -317,8 +317,7 @@ |
||
| 317 | 317 | { |
| 318 | 318 | $_oDateTime = new \DateTime(str_replace('Z', '', $_oIso8601Entity->sStartTime)); |
| 319 | 319 | $_oDateTime->setTimezone(new \DateTimeZone($sTimeZone)); |
| 320 | - } |
|
| 321 | - else |
|
| 320 | + } else |
|
| 322 | 321 | { |
| 323 | 322 | $_oDateTime = new \DateTime($_oIso8601Entity->sStartTime); |
| 324 | 323 | } |
@@ -99,10 +99,12 @@ |
||
| 99 | 99 | { |
| 100 | 100 | if ($this->oRepositoryBridge->addJob($oJobEntity)) |
| 101 | 101 | { |
| 102 | - if (!is_null($this->oJobCollection)) // if no collection inited the new job will init by chronos request |
|
| 102 | + if (!is_null($this->oJobCollection)) { |
|
| 103 | + // if no collection inited the new job will init by chronos request |
|
| 103 | 104 | { |
| 104 | 105 | $this->oJobCollection->offsetSet($oJobEntity->getKey(), $oJobEntity); |
| 105 | 106 | } |
| 107 | + } |
|
| 106 | 108 | |
| 107 | 109 | return true; |
| 108 | 110 | } |
@@ -116,12 +116,14 @@ |
||
| 116 | 116 | if ( |
| 117 | 117 | !file_exists($this->getHomeDir() . DIRECTORY_SEPARATOR . 'parameters.yml') |
| 118 | 118 | && !file_exists($this->getWorkingDir() . DIRECTORY_SEPARATOR . '.chapiconfig') |
| 119 | - ) // one file have to exist |
|
| 119 | + ) { |
|
| 120 | + // one file have to exist |
|
| 120 | 121 | { |
| 121 | 122 | $this->oOutput->writeln(sprintf( |
| 122 | 123 | '<error>%s</error>', |
| 123 | 124 | 'No parameter file found. Please run "configure" command for initial setup or add a local `.chapiconfig` to your working directory.' |
| 124 | 125 | )); |
| 126 | + } |
|
| 125 | 127 | return false; |
| 126 | 128 | } |
| 127 | 129 | |
@@ -55,8 +55,7 @@ |
||
| 55 | 55 | $_mValue = (!empty($_mValue)) |
| 56 | 56 | ? json_encode($_mValue, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) |
| 57 | 57 | : $_sEmptyString; |
| 58 | - } |
|
| 59 | - elseif (is_bool($_mValue)) |
|
| 58 | + } elseif (is_bool($_mValue)) |
|
| 60 | 59 | { |
| 61 | 60 | $_mValue = (true === $_mValue) |
| 62 | 61 | ? 'true' |
@@ -155,8 +155,7 @@ discard block |
||
| 155 | 155 | DIRECTORY_SEPARATOR, |
| 156 | 156 | $oJobEntity->getKey() |
| 157 | 157 | ); |
| 158 | - } |
|
| 159 | - else |
|
| 158 | + } else |
|
| 160 | 159 | { |
| 161 | 160 | $_sJobPath = $oJobEntity->getKey(); |
| 162 | 161 | } |
@@ -268,15 +267,19 @@ discard block |
||
| 268 | 267 | |
| 269 | 268 | if ($_aTemp) |
| 270 | 269 | { |
| 271 | - if (property_exists($_aTemp, 'name')) // chronos |
|
| 270 | + if (property_exists($_aTemp, 'name')) { |
|
| 271 | + // chronos |
|
| 272 | 272 | { |
| 273 | 273 | $_aJobEntities[] = new ChronosJobEntity($_aTemp); |
| 274 | + } |
|
| 274 | 275 | |
| 275 | - } else if (property_exists($_aTemp, 'id')) //marathon |
|
| 276 | + } else if (property_exists($_aTemp, 'id')) { |
|
| 277 | + //marathon |
|
| 276 | 278 | { |
| 277 | 279 | foreach ($this->getMarathonEntitiesForConfig($_aTemp) as $_oApp) |
| 278 | 280 | { |
| 279 | 281 | $_aJobEntities[] = $_oApp; |
| 282 | + } |
|
| 280 | 283 | } |
| 281 | 284 | } else { |
| 282 | 285 | throw new JobLoadException( |
@@ -297,8 +300,7 @@ discard block |
||
| 297 | 300 | $_aJobs[] = $_oJobEntity; |
| 298 | 301 | } |
| 299 | 302 | |
| 300 | - } |
|
| 301 | - else |
|
| 303 | + } else |
|
| 302 | 304 | { |
| 303 | 305 | throw new JobLoadException( |
| 304 | 306 | sprintf('Unable to load json job data from "%s". Please check if the json is valid.', $_sJobFilePath), |
@@ -323,8 +325,7 @@ discard block |
||
| 323 | 325 | $this->aGroupedApps[] = $_oApp->id; |
| 324 | 326 | $_aRet[] = $_oGroupEntity; |
| 325 | 327 | } |
| 326 | - } |
|
| 327 | - else |
|
| 328 | + } else |
|
| 328 | 329 | { |
| 329 | 330 | $_aRet[] = new MarathonAppEntity($aEntityData); |
| 330 | 331 | } |
@@ -83,8 +83,7 @@ |
||
| 83 | 83 | )); |
| 84 | 84 | return false; |
| 85 | 85 | } |
| 86 | - } |
|
| 87 | - catch(\Exception $e) |
|
| 86 | + } catch(\Exception $e) |
|
| 88 | 87 | { |
| 89 | 88 | $this->oLogger->error(sprintf( |
| 90 | 89 | 'Job %s cannot be added to remote : %s',$sAppId, $e->getMessage() |
@@ -151,8 +151,7 @@ |
||
| 151 | 151 | if ($this->oJobComparisonBusinessCase->hasSameJobType($_oJobEntityLocal, $_oJobEntityChronos)) |
| 152 | 152 | { |
| 153 | 153 | $_bHasUpdatedJob = $this->oJobRepositoryRemote->updateJob($_oJobEntityLocal); |
| 154 | - } |
|
| 155 | - else |
|
| 154 | + } else |
|
| 156 | 155 | { |
| 157 | 156 | $_bHasUpdatedJob = ( |
| 158 | 157 | $this->oJobRepositoryRemote->removeJob($_oJobEntityChronos->getKey()) |
@@ -52,8 +52,7 @@ discard block |
||
| 52 | 52 | if (empty($aEntityNames)) |
| 53 | 53 | { |
| 54 | 54 | $_aRemoteEntities = $this->oJobRepositoryRemote->getJobs(); |
| 55 | - } |
|
| 56 | - else |
|
| 55 | + } else |
|
| 57 | 56 | { |
| 58 | 57 | $_aRemoteEntities = []; |
| 59 | 58 | foreach ($aEntityNames as $_sJobName) |
@@ -85,8 +84,7 @@ discard block |
||
| 85 | 84 | 'Entity %s stored in local repository', |
| 86 | 85 | $oAppRemote->getKey() |
| 87 | 86 | )); |
| 88 | - } |
|
| 89 | - else { |
|
| 87 | + } else { |
|
| 90 | 88 | $this->oLogger->error(sprintf( |
| 91 | 89 | 'Failed to store %s in local repository', |
| 92 | 90 | $oAppRemote->getKey() |
@@ -116,8 +114,7 @@ discard block |
||
| 116 | 114 | 'Entity %s is updated in local repository', |
| 117 | 115 | $oAppRemote->getKey() |
| 118 | 116 | )); |
| 119 | - } |
|
| 120 | - else { |
|
| 117 | + } else { |
|
| 121 | 118 | $this->oLogger->error(sprintf( |
| 122 | 119 | 'Failed to update app %s in local repository', |
| 123 | 120 | $oAppRemote->getKey() |
@@ -104,12 +104,10 @@ discard block |
||
| 104 | 104 | if (is_array($mValueA) && is_array($mValueB)) |
| 105 | 105 | { |
| 106 | 106 | return $this->isArrayEqual($mValueA, $mValueB); |
| 107 | - } |
|
| 108 | - elseif (is_object($mValueA) && is_object($mValueB)) |
|
| 107 | + } elseif (is_object($mValueA) && is_object($mValueB)) |
|
| 109 | 108 | { |
| 110 | 109 | return $this->isArrayEqual(get_object_vars($mValueA), get_object_vars($mValueB)); |
| 111 | - } |
|
| 112 | - elseif ((is_scalar($mValueA) && is_scalar($mValueB)) || (is_null($mValueA) && is_null($mValueB))) |
|
| 110 | + } elseif ((is_scalar($mValueA) && is_scalar($mValueB)) || (is_null($mValueA) && is_null($mValueB))) |
|
| 113 | 111 | { |
| 114 | 112 | return $mValueA == $mValueB; |
| 115 | 113 | } |
@@ -142,8 +140,7 @@ discard block |
||
| 142 | 140 | { |
| 143 | 141 | return false; |
| 144 | 142 | } |
| 145 | - } |
|
| 146 | - else |
|
| 143 | + } else |
|
| 147 | 144 | { |
| 148 | 145 | foreach ($aValuesB as $_mValueB) |
| 149 | 146 | { |