@@ -54,8 +54,7 @@ |
||
54 | 54 | { |
55 | 55 | $_oResponse = $this->oGuzzelClient->request('GET', $sUrl, $_aRequestOptions); |
56 | 56 | return new HttpGuzzlResponse($_oResponse); |
57 | - } |
|
58 | - catch (\Exception $oException) |
|
57 | + } catch (\Exception $oException) |
|
59 | 58 | { |
60 | 59 | throw new HttpConnectionException( |
61 | 60 | sprintf('Can\'t get response from "%s"', $this->oGuzzelClient->getConfig('base_uri') . $sUrl), |
@@ -100,8 +100,7 @@ discard block |
||
100 | 100 | )); |
101 | 101 | return false; |
102 | 102 | } |
103 | - } |
|
104 | - catch(\Exception $e) |
|
103 | + } catch(\Exception $e) |
|
105 | 104 | { |
106 | 105 | $this->oLogger->error(sprintf( |
107 | 106 | "Job %s cannot be added to remote : %s",$sAppId, $e->getMessage() |
@@ -268,8 +267,7 @@ discard block |
||
268 | 267 | if (empty($aJobNames)) |
269 | 268 | { |
270 | 269 | $_aApps = $this->oJobRepositoryRemote->getJobs(); |
271 | - } |
|
272 | - else |
|
270 | + } else |
|
273 | 271 | { |
274 | 272 | $_aApps = []; |
275 | 273 | foreach ($aJobNames as $_sAppName) |
@@ -282,11 +280,12 @@ discard block |
||
282 | 280 | foreach ($_aApps as $_oAppRemote) |
283 | 281 | { |
284 | 282 | $_oAppLocal = $this->oJobRepositoryLocal->getJob($_oAppRemote->getKey()); |
285 | - if (null == $_oAppLocal) // add |
|
283 | + if (null == $_oAppLocal) { |
|
284 | + // add |
|
286 | 285 | { |
287 | 286 | $this->addJobInLocalRepository($_oAppRemote); |
288 | 287 | } |
289 | - else // update |
|
288 | + } else // update |
|
290 | 289 | { |
291 | 290 | $this->updateJobInLocalRepository($_oAppRemote, $bForceOverwrite); |
292 | 291 | } |
@@ -301,8 +300,7 @@ discard block |
||
301 | 300 | 'App %s stored in local repository', |
302 | 301 | $oAppRemote->getKey() |
303 | 302 | )); |
304 | - } |
|
305 | - else { |
|
303 | + } else { |
|
306 | 304 | $this->oLogger->error(sprintf( |
307 | 305 | 'Failed to store %s in local repository', |
308 | 306 | $oAppRemote->getKey() |
@@ -331,8 +329,7 @@ discard block |
||
331 | 329 | 'App %s is updated in local repository', |
332 | 330 | $oAppRemote->getKey() |
333 | 331 | )); |
334 | - } |
|
335 | - else { |
|
332 | + } else { |
|
336 | 333 | $this->oLogger->error(sprintf( |
337 | 334 | 'Failed to update app %s in local repository', |
338 | 335 | $oAppRemote->getKey() |
@@ -101,8 +101,7 @@ discard block |
||
101 | 101 | if (empty($aJobNames)) |
102 | 102 | { |
103 | 103 | $_aChronosJobs = $this->oJobRepositoryChronos->getJobs(); |
104 | - } |
|
105 | - else |
|
104 | + } else |
|
106 | 105 | { |
107 | 106 | $_aChronosJobs = []; |
108 | 107 | foreach ($aJobNames as $_sJobName) |
@@ -124,8 +123,7 @@ discard block |
||
124 | 123 | 'Job "%s" successfully stored in local repository', |
125 | 124 | $_oJobEntity->name |
126 | 125 | )); |
127 | - } |
|
128 | - else |
|
126 | + } else |
|
129 | 127 | { |
130 | 128 | $this->oLogger->error(sprintf( |
131 | 129 | 'Failed to store job "%s" in local repository', |
@@ -156,8 +154,7 @@ discard block |
||
156 | 154 | 'Job "%s" successfully updated in local repository', |
157 | 155 | $_oJobEntity->name |
158 | 156 | )); |
159 | - } |
|
160 | - else |
|
157 | + } else |
|
161 | 158 | { |
162 | 159 | $this->oLogger->error(sprintf( |
163 | 160 | 'Failed to update job "%s" in local repository', |
@@ -245,8 +242,7 @@ discard block |
||
245 | 242 | if ($this->oJobComparisonBusinessCase->hasSameJobType($_oJobEntityLocal, $_oJobEntityChronos)) |
246 | 243 | { |
247 | 244 | $_bHasUpdatedJob = $this->oJobRepositoryChronos->updateJob($_oJobEntityLocal); |
248 | - } |
|
249 | - else |
|
245 | + } else |
|
250 | 246 | { |
251 | 247 | $_bHasUpdatedJob = ( |
252 | 248 | $this->oJobRepositoryChronos->removeJob($_oJobEntityChronos->name) |
@@ -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 | } |
@@ -250,12 +250,10 @@ discard block |
||
250 | 250 | { |
251 | 251 | if (is_array($mValueA) && is_array($mValueB)) { |
252 | 252 | return $this->isArrayEqual($mValueA, $mValueB); |
253 | - } |
|
254 | - elseif (is_object($mValueA) && is_object($mValueB)) |
|
253 | + } elseif (is_object($mValueA) && is_object($mValueB)) |
|
255 | 254 | { |
256 | 255 | return $this->isArrayEqual(get_object_vars($mValueA), get_object_vars($mValueB)); |
257 | - } |
|
258 | - elseif ((is_scalar($mValueA) && is_scalar($mValueB)) || (is_null($mValueA) && is_null($mValueB))) |
|
256 | + } elseif ((is_scalar($mValueA) && is_scalar($mValueB)) || (is_null($mValueA) && is_null($mValueB))) |
|
259 | 257 | { |
260 | 258 | return $mValueA == $mValueB; |
261 | 259 | } |
@@ -288,8 +286,7 @@ discard block |
||
288 | 286 | { |
289 | 287 | return false; |
290 | 288 | } |
291 | - } |
|
292 | - else |
|
289 | + } else |
|
293 | 290 | { |
294 | 291 | foreach ($aValuesB as $_mValueB) |
295 | 292 | { |
@@ -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 | } |
@@ -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' |