@@ -57,9 +57,11 @@ discard block |
||
57 | 57 | $_oDateIntervalEpsilon = new \DateInterval($oJobEntity->epsilon); |
58 | 58 | $_iIntervalEpsilon = (int) $_oDateIntervalEpsilon->format('%Y%M%D%H%I%S'); |
59 | 59 | |
60 | - if ($_iIntervalEpsilon > 30) // if epsilon > "PT30S" |
|
60 | + if ($_iIntervalEpsilon > 30) { |
|
61 | + // if epsilon > "PT30S" |
|
61 | 62 | { |
62 | 63 | $_oIso8601Entity = $this->oDatePeriodFactory->createIso8601Entity($oJobEntity->schedule); |
64 | + } |
|
63 | 65 | |
64 | 66 | $_oDateIntervalScheduling = new \DateInterval($_oIso8601Entity->sInterval); |
65 | 67 | $_iIntervalScheduling = (int) $_oDateIntervalScheduling->format('%Y%M%D%H%I%S'); |
@@ -69,8 +71,7 @@ discard block |
||
69 | 71 | |
70 | 72 | // if epsilon is less or equal than 30sec the not empty check is enough |
71 | 73 | return true; |
72 | - } |
|
73 | - catch (\Exception $_oException) |
|
74 | + } catch (\Exception $_oException) |
|
74 | 75 | { |
75 | 76 | // can't init \DateInterval instance |
76 | 77 | return false; |
@@ -62,8 +62,7 @@ |
||
62 | 62 | { |
63 | 63 | $_oDataPeriod = $this->oDatePeriodFactory->createDatePeriod($oJobEntity->schedule, $oJobEntity->scheduleTimeZone); |
64 | 64 | return (false !== $_oDataPeriod); |
65 | - } |
|
66 | - catch (\Exception $oException) |
|
65 | + } catch (\Exception $oException) |
|
67 | 66 | { |
68 | 67 | // invalid: Iso8601 is not valid and/or DatePeriodFactory is able to create a valid DatePeriod |
69 | 68 | } |
@@ -37,7 +37,7 @@ |
||
37 | 37 | $this->oDiffCompare = $oDiffCompare; |
38 | 38 | } |
39 | 39 | |
40 | - protected function preCompareModifications(JobEntityInterface &$oLocalJob, JobEntityInterface &$oRemoteJob) |
|
40 | + protected function preCompareModifications(JobEntityInterface & $oLocalJob, JobEntityInterface & $oRemoteJob) |
|
41 | 41 | { |
42 | 42 | if ( |
43 | 43 | !$oLocalJob instanceof MarathonAppEntity || |
@@ -54,7 +54,7 @@ |
||
54 | 54 | } |
55 | 55 | |
56 | 56 | |
57 | - protected function preCompareModifications(JobEntityInterface &$oLocalJob, JobEntityInterface &$oRemoteJob) |
|
57 | + protected function preCompareModifications(JobEntityInterface & $oLocalJob, JobEntityInterface & $oRemoteJob) |
|
58 | 58 | { |
59 | 59 | // no modification needed |
60 | 60 | return; |
@@ -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() |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | } |
85 | 85 | |
86 | 86 | // check if dependency is satisfied |
87 | - if ( $_oJobEntityLocal->isDependencyJob()) |
|
87 | + if ($_oJobEntityLocal->isDependencyJob()) |
|
88 | 88 | { |
89 | 89 | try { |
90 | 90 | $circular = $this->isDependencyCircular($_oJobEntityLocal, count($_oJobEntityLocal->dependencies)); |
@@ -96,10 +96,10 @@ discard block |
||
96 | 96 | return false; |
97 | 97 | } |
98 | 98 | } |
99 | - catch(\Exception $e) |
|
99 | + catch (\Exception $e) |
|
100 | 100 | { |
101 | 101 | $this->oLogger->error(sprintf( |
102 | - 'Job %s cannot be added to remote : %s',$sAppId, $e->getMessage() |
|
102 | + 'Job %s cannot be added to remote : %s', $sAppId, $e->getMessage() |
|
103 | 103 | )); |
104 | 104 | return false; |
105 | 105 | } |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | * @return bool |
158 | 158 | * @throws \Exception |
159 | 159 | */ |
160 | - private function isDependencyCircular(MarathonAppEntity $oEntity, $iImmediateChildren, &$path=[]) |
|
160 | + private function isDependencyCircular(MarathonAppEntity $oEntity, $iImmediateChildren, &$path = []) |
|
161 | 161 | { |
162 | 162 | // Invariant: path will not have duplicates for acyclic dependency tree |
163 | 163 | if ($this->hasDuplicates($path)) |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | // for B intermediate Child will be 2. |
212 | 212 | // when we process D, it will be reduced to 1 and with C to 0 |
213 | 213 | // then we will pop B to generate path [A, E] when we reach E. |
214 | - $iImmediateChildren = $iImmediateChildren -1; |
|
214 | + $iImmediateChildren = $iImmediateChildren - 1; |
|
215 | 215 | if ($iImmediateChildren == 0) |
216 | 216 | { |
217 | 217 | array_pop($path); |
@@ -59,48 +59,42 @@ |
||
59 | 59 | { |
60 | 60 | $_oResponse = $this->oGuzzelClient->request('GET', $sUrl, $_aRequestOptions); |
61 | 61 | return new HttpGuzzlResponse($_oResponse); |
62 | - } |
|
63 | - catch (ClientException $oException) // 400 level errors |
|
62 | + } catch (ClientException $oException) // 400 level errors |
|
64 | 63 | { |
65 | 64 | throw new HttpConnectionException( |
66 | 65 | sprintf('Client error: Calling %s returned %d', $this->oGuzzelClient->getConfig('base_uri') . $sUrl, $oException->getCode()), |
67 | 66 | $oException->getCode(), |
68 | 67 | $oException |
69 | 68 | ); |
70 | - } |
|
71 | - catch (ServerException $oException) // 500 level errors |
|
69 | + } catch (ServerException $oException) // 500 level errors |
|
72 | 70 | { |
73 | 71 | throw new HttpConnectionException( |
74 | 72 | sprintf('Server error: Calling %s returned %d', $this->oGuzzelClient->getConfig('base_uri') . $sUrl, $oException->getCode()), |
75 | 73 | $oException->getCode(), |
76 | 74 | $oException |
77 | 75 | ); |
78 | - } |
|
79 | - catch (TooManyRedirectsException $oException) // too many redirects to follow |
|
76 | + } catch (TooManyRedirectsException $oException) // too many redirects to follow |
|
80 | 77 | { |
81 | 78 | throw new HttpConnectionException( |
82 | 79 | sprintf('Request to %s failed due to too many redirects', $this->oGuzzelClient->getConfig('base_uri') . $sUrl), |
83 | 80 | HttpConnectionException::ERROR_CODE_TOO_MANY_REDIRECT_EXCEPTION, |
84 | 81 | $oException |
85 | 82 | ); |
86 | - } |
|
87 | - catch (ConnectException $oException) // networking error |
|
83 | + } catch (ConnectException $oException) // networking error |
|
88 | 84 | { |
89 | 85 | throw new HttpConnectionException( |
90 | 86 | sprintf('Cannot connect to %s due to some networking error', $this->oGuzzelClient->getConfig('base_uri') . $sUrl), |
91 | 87 | HttpConnectionException::ERROR_CODE_CONNECT_EXCEPTION, |
92 | 88 | $oException |
93 | 89 | ); |
94 | - } |
|
95 | - catch (RequestException $oException) // networking error (connection timeout, DNS errors, etc.) |
|
90 | + } catch (RequestException $oException) // networking error (connection timeout, DNS errors, etc.) |
|
96 | 91 | { |
97 | 92 | throw new HttpConnectionException( |
98 | 93 | sprintf('Cannot connect to %s due to networking error', $this->oGuzzelClient->getConfig('base_uri') . $sUrl), |
99 | 94 | HttpConnectionException::ERROR_CODE_REQUEST_EXCEPTION, |
100 | 95 | $oException |
101 | 96 | ); |
102 | - } |
|
103 | - catch (\Exception $oException) |
|
97 | + } catch (\Exception $oException) |
|
104 | 98 | { |
105 | 99 | throw new HttpConnectionException( |
106 | 100 | sprintf('Can\'t get response from "%s"', $this->oGuzzelClient->getConfig('base_uri') . $sUrl), |
@@ -183,7 +183,8 @@ discard block |
||
183 | 183 | if (is_file($_sPath) && preg_match('~\.json~i', $_sPath)) |
184 | 184 | { |
185 | 185 | $aJobFiles[] = $_sPath; |
186 | - } elseif (is_dir($_sPath)) |
|
186 | + } |
|
187 | + elseif (is_dir($_sPath)) |
|
187 | 188 | { |
188 | 189 | $this->getJobFilesFromFileSystem($_sPath, $aJobFiles); |
189 | 190 | } |
@@ -268,17 +269,23 @@ discard block |
||
268 | 269 | |
269 | 270 | if ($_aTemp) |
270 | 271 | { |
271 | - if (property_exists($_aTemp, 'name')) // chronos |
|
272 | + if (property_exists($_aTemp, 'name')) { |
|
273 | + // chronos |
|
272 | 274 | { |
273 | 275 | $_aJobEntities[] = new ChronosJobEntity($_aTemp); |
276 | + } |
|
274 | 277 | |
275 | - } else if (property_exists($_aTemp, 'id')) //marathon |
|
278 | + } |
|
279 | + else if (property_exists($_aTemp, 'id')) { |
|
280 | + //marathon |
|
276 | 281 | { |
277 | 282 | foreach ($this->getMarathonEntitiesForConfig($_aTemp) as $_oApp) |
278 | 283 | { |
279 | 284 | $_aJobEntities[] = $_oApp; |
285 | + } |
|
280 | 286 | } |
281 | - } else { |
|
287 | + } |
|
288 | + else { |
|
282 | 289 | throw new JobLoadException( |
283 | 290 | 'Could not distinguish job as either chronos or marathon', |
284 | 291 | JobLoadException::ERROR_CODE_UNKNOWN_ENTITY_TYPE |
@@ -385,7 +392,8 @@ discard block |
||
385 | 392 | } |
386 | 393 | return false; |
387 | 394 | } |
388 | - } else { |
|
395 | + } |
|
396 | + else { |
|
389 | 397 | $_oDecodedConfig->apps[$key] = $oJobEntity; |
390 | 398 | } |
391 | 399 | $_bAppFound = true; |
@@ -38,8 +38,7 @@ |
||
38 | 38 | try |
39 | 39 | { |
40 | 40 | return self::$aIso8601Entity[$_sKey] = new Iso8601Entity($sIso8601); |
41 | - } |
|
42 | - catch (\InvalidArgumentException $_oException) |
|
41 | + } catch (\InvalidArgumentException $_oException) |
|
43 | 42 | { |
44 | 43 | throw new DatePeriodException(sprintf("Can't init Iso8601Entity for '%s' iso 8601 string.", $sIso8601), 1, $_oException); |
45 | 44 | } |
@@ -27,7 +27,8 @@ |
||
27 | 27 | if (isset($aData['labels'])) |
28 | 28 | { |
29 | 29 | $this->labels = (object) $aData['labels']; |
30 | - } else { |
|
30 | + } |
|
31 | + else { |
|
31 | 32 | $this->labels = (object) []; |
32 | 33 | } |
33 | 34 |