@@ -37,8 +37,7 @@ discard block |
||
| 37 | 37 | if (!empty($_sJobName)) |
| 38 | 38 | { |
| 39 | 39 | $this->printJobDiff($_sJobName); |
| 40 | - } |
|
| 41 | - else |
|
| 40 | + } else |
|
| 42 | 41 | { |
| 43 | 42 | $_aLocalJobUpdates = $_oJobComparisonBusinessCase->getLocalJobUpdates(); |
| 44 | 43 | if (!empty($_aLocalJobUpdates)) |
@@ -76,12 +75,10 @@ discard block |
||
| 76 | 75 | if ($_sDiffSign == '+') |
| 77 | 76 | { |
| 78 | 77 | $this->oOutput->writeln(sprintf("<info>%s\t%s: %s</info>", $_sDiffSign, $_sProperty, substr($_sDiffLine, 1))); |
| 79 | - } |
|
| 80 | - elseif ($_sDiffSign == '-') |
|
| 78 | + } elseif ($_sDiffSign == '-') |
|
| 81 | 79 | { |
| 82 | 80 | $this->oOutput->writeln(sprintf("<fg=red>%s\t%s: %s</>", $_sDiffSign, $_sProperty, substr($_sDiffLine, 1))); |
| 83 | - } |
|
| 84 | - else |
|
| 81 | + } else |
|
| 85 | 82 | { |
| 86 | 83 | $this->oOutput->writeln(sprintf("\t%s: %s", $_sProperty, $_sDiffLine)); |
| 87 | 84 | } |
@@ -49,8 +49,7 @@ |
||
| 49 | 49 | if (JobUtils::isWildcard($aJobNames)) |
| 50 | 50 | { |
| 51 | 51 | $_oJobIndexService->resetJobIndex(); |
| 52 | - } |
|
| 53 | - else |
|
| 52 | + } else |
|
| 54 | 53 | { |
| 55 | 54 | $_oJobIndexService->removeJobs($aJobNames); |
| 56 | 55 | } |
@@ -250,13 +250,11 @@ discard block |
||
| 250 | 250 | { |
| 251 | 251 | $_sTimeline .= $this->parseTimeLineStrMark($_bPrintJobStart, $_bPrintJobEnd, $_bHasToCloseFinalTag, $_oTime->format('H>i'), $_oTime->format('H:i')); |
| 252 | 252 | |
| 253 | - } |
|
| 254 | - else |
|
| 253 | + } else |
|
| 255 | 254 | { |
| 256 | 255 | $_sTimeline .= $this->parseTimeLineStrMark($_bPrintJobStart, $_bPrintJobEnd, $_bHasToCloseFinalTag, str_repeat('>', 5), str_repeat($_sSpacer, 5)); |
| 257 | 256 | } |
| 258 | - } |
|
| 259 | - else |
|
| 257 | + } else |
|
| 260 | 258 | { |
| 261 | 259 | $_sTimeline .= $this->parseTimeLineStrMark($_bPrintJobStart, $_bPrintJobEnd, $_bHasToCloseFinalTag, '>', $_sSpacer); |
| 262 | 260 | } |
@@ -284,18 +282,15 @@ discard block |
||
| 284 | 282 | if ($bPrintJobStart && $bPrintJobEnd) |
| 285 | 283 | { |
| 286 | 284 | $_sTimelineSnippet = sprintf('<comment>%s</comment>', $sStartStopMark); |
| 287 | - } |
|
| 288 | - elseif ($bPrintJobStart) |
|
| 285 | + } elseif ($bPrintJobStart) |
|
| 289 | 286 | { |
| 290 | 287 | $_sTimelineSnippet = sprintf('<comment>%s', $sStartStopMark); |
| 291 | 288 | $bHasToCloseFinalTag = true; |
| 292 | - } |
|
| 293 | - elseif ($bPrintJobEnd) |
|
| 289 | + } elseif ($bPrintJobEnd) |
|
| 294 | 290 | { |
| 295 | 291 | $_sTimelineSnippet = sprintf('%s</comment>', $sStartStopMark); |
| 296 | 292 | $bHasToCloseFinalTag = false; |
| 297 | - } |
|
| 298 | - else |
|
| 293 | + } else |
|
| 299 | 294 | { |
| 300 | 295 | $_sTimelineSnippet = $sSpacer; |
| 301 | 296 | } |
@@ -115,8 +115,7 @@ |
||
| 115 | 115 | { |
| 116 | 116 | $_aFilteredJobList[] = $_sJobName; |
| 117 | 117 | } |
| 118 | - } |
|
| 119 | - else |
|
| 118 | + } else |
|
| 120 | 119 | { |
| 121 | 120 | if (!$this->oJobIndexService->isJobInIndex($_sJobName)) |
| 122 | 121 | { |
@@ -26,23 +26,20 @@ |
||
| 26 | 26 | if ($_sKey == 'type') |
| 27 | 27 | { |
| 28 | 28 | $this->{$_sKey} = strtolower($_mValue); |
| 29 | - } |
|
| 30 | - elseif ($_sKey == 'volumes') |
|
| 29 | + } elseif ($_sKey == 'volumes') |
|
| 31 | 30 | { |
| 32 | 31 | foreach ($_mValue as $_mValueVolume) |
| 33 | 32 | { |
| 34 | 33 | $_oVolume = new ContainerVolumeEntity($_mValueVolume); |
| 35 | 34 | $this->volumes[] = $_oVolume; |
| 36 | 35 | } |
| 37 | - } |
|
| 38 | - else |
|
| 36 | + } else |
|
| 39 | 37 | { |
| 40 | 38 | $this->{$_sKey} = $_mValue; |
| 41 | 39 | } |
| 42 | 40 | } |
| 43 | 41 | } |
| 44 | - } |
|
| 45 | - else |
|
| 42 | + } else |
|
| 46 | 43 | { |
| 47 | 44 | throw new \InvalidArgumentException(sprintf('Argument 1 passed to "%s" must be an array or object', __METHOD__)); |
| 48 | 45 | } |
@@ -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; |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | /** |
| 49 | - * @param JobEntity $oJobEntity |
|
| 49 | + * @param JobEntityInterface $oJobEntity |
|
| 50 | 50 | * @return bool |
| 51 | 51 | */ |
| 52 | 52 | private function isEpsilonPropertyValid(JobEntityInterface $oJobEntity) |
@@ -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 | } |
@@ -46,9 +46,9 @@ |
||
| 46 | 46 | |
| 47 | 47 | |
| 48 | 48 | /** |
| 49 | - * @param JobRepositoryInterface $oJobRepositoryLocal |
|
| 49 | + * @param JobRepositoryInterface $oJobRepositoryLocalChronos |
|
| 50 | 50 | * @param JobRepositoryInterface $oJobRepositoryChronos |
| 51 | - * @param JobRepositoryInterface $oJobRepositoryMarathon |
|
| 51 | + * @param JobRepositoryInterface $oJobRepositoryLocalChronos |
|
| 52 | 52 | * @param DiffCompareInterface $oDiffCompare |
| 53 | 53 | * @param DatePeriodFactoryInterface $oDatePeriodFactory |
| 54 | 54 | * @param LoggerInterface $oLogger |
@@ -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 | } |
@@ -150,6 +150,9 @@ discard block |
||
| 150 | 150 | return !(count($arr) == count(array_unique($arr))); |
| 151 | 151 | } |
| 152 | 152 | |
| 153 | + /** |
|
| 154 | + * @param integer $immediateChildren |
|
| 155 | + */ |
|
| 153 | 156 | private function isDependencyCircular(JobEntityInterface $oEntity, $immediateChildren, &$path=[]) |
| 154 | 157 | { |
| 155 | 158 | // Invariant: path will not have duplicates for acyclic dependency tree |
@@ -310,6 +313,9 @@ discard block |
||
| 310 | 313 | } |
| 311 | 314 | } |
| 312 | 315 | |
| 316 | + /** |
|
| 317 | + * @param boolean $bForceOverwrite |
|
| 318 | + */ |
|
| 313 | 319 | private function updateJobInLocalRepository($oAppRemote, $bForceOverwrite) |
| 314 | 320 | { |
| 315 | 321 | $_aDiff = $this->oJobComparisionBusinessCase->getJobDiff($oAppRemote->getKey()); |
@@ -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() |