@@ -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 | } |
@@ -39,17 +39,17 @@ |
||
| 39 | 39 | |
| 40 | 40 | if (isset($aData['portMappings'])) |
| 41 | 41 | { |
| 42 | - foreach($aData['portMappings'] as $portMapping) |
|
| 42 | + foreach ($aData['portMappings'] as $portMapping) |
|
| 43 | 43 | { |
| 44 | - $this->portMappings[] = new DockerPortMapping((array)$portMapping); |
|
| 44 | + $this->portMappings[] = new DockerPortMapping((array) $portMapping); |
|
| 45 | 45 | } |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | if (isset($aData['parameters'])) |
| 49 | 49 | { |
| 50 | - foreach($aData['parameters'] as $parameter) |
|
| 50 | + foreach ($aData['parameters'] as $parameter) |
|
| 51 | 51 | { |
| 52 | - $this->parameters[] = new DockerParameters((array)$parameter); |
|
| 52 | + $this->parameters[] = new DockerParameters((array) $parameter); |
|
| 53 | 53 | } |
| 54 | 54 | } |
| 55 | 55 | |
@@ -41,9 +41,9 @@ |
||
| 41 | 41 | { |
| 42 | 42 | MarathonEntityUtils::setAllPossibleProperties($aData, $this); |
| 43 | 43 | |
| 44 | - if(isset($aData['command'])) |
|
| 44 | + if (isset($aData['command'])) |
|
| 45 | 45 | { |
| 46 | - $this->command = new HealthCheckCommand((array)$aData['command']); |
|
| 46 | + $this->command = new HealthCheckCommand((array) $aData['command']); |
|
| 47 | 47 | } |
| 48 | 48 | } |
| 49 | 49 | |
@@ -25,13 +25,13 @@ |
||
| 25 | 25 | { |
| 26 | 26 | MarathonEntityUtils::setAllPossibleProperties($aData, $this); |
| 27 | 27 | |
| 28 | - if(isset($aData['groups'])) |
|
| 28 | + if (isset($aData['groups'])) |
|
| 29 | 29 | { |
| 30 | 30 | $this->groups = $aData['groups']; |
| 31 | 31 | } |
| 32 | 32 | if (isset($aData['labels'])) |
| 33 | 33 | { |
| 34 | - $this->labels = (object)$aData['labels']; |
|
| 34 | + $this->labels = (object) $aData['labels']; |
|
| 35 | 35 | } |
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | 38 | \ No newline at end of file |
@@ -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; |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | $_aDifferences[$_sProperty] = $this->oDiffCompare->compare( |
| 167 | 167 | $_oRemoteEntity->{$_sProperty}, |
| 168 | 168 | $_oLocalEntity->{$_sProperty} |
| 169 | - ) ; |
|
| 169 | + ); |
|
| 170 | 170 | } |
| 171 | 171 | |
| 172 | 172 | return $_aDifferences; |
@@ -219,7 +219,7 @@ discard block |
||
| 219 | 219 | * @param JobEntityInterface $oRemoteJob |
| 220 | 220 | * @return null |
| 221 | 221 | */ |
| 222 | - abstract protected function preCompareModifications(JobEntityInterface &$oLocalJob, JobEntityInterface &$oRemoteJob); |
|
| 222 | + abstract protected function preCompareModifications(JobEntityInterface & $oLocalJob, JobEntityInterface & $oRemoteJob); |
|
| 223 | 223 | |
| 224 | 224 | /** |
| 225 | 225 | * Gets entity for each system with defaults set |
@@ -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); |