@@ -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; |
@@ -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 | } |
@@ -26,8 +26,7 @@ |
||
26 | 26 | $this->{$_sKey} = $_mValue; |
27 | 27 | } |
28 | 28 | } |
29 | - } |
|
30 | - else |
|
29 | + } else |
|
31 | 30 | { |
32 | 31 | throw new \InvalidArgumentException(sprintf('Argument 1 passed to "%s" must be an array or object', __METHOD__)); |
33 | 32 | } |
@@ -94,15 +94,13 @@ discard block |
||
94 | 94 | if ($_sKey == 'container') |
95 | 95 | { |
96 | 96 | $this->{$_sKey} = new ContainerEntity($_mValue); |
97 | - } |
|
98 | - else |
|
97 | + } else |
|
99 | 98 | { |
100 | 99 | $this->{$_sKey} = $_mValue; |
101 | 100 | } |
102 | 101 | } |
103 | 102 | } |
104 | - } |
|
105 | - else |
|
103 | + } else |
|
106 | 104 | { |
107 | 105 | throw new \InvalidArgumentException(sprintf('Argument 1 passed to "%s" must be an array or object', __METHOD__)); |
108 | 106 | } |
@@ -150,8 +148,7 @@ discard block |
||
150 | 148 | if (!empty($this->schedule)) |
151 | 149 | { |
152 | 150 | unset($_aReturn['parents']); |
153 | - } |
|
154 | - else |
|
151 | + } else |
|
155 | 152 | { |
156 | 153 | unset($_aReturn['schedule']); |
157 | 154 | unset($_aReturn['scheduleTimeZone']); |