@@ -125,12 +125,14 @@ |
||
125 | 125 | if ( |
126 | 126 | !file_exists($this->getHomeDir() . DIRECTORY_SEPARATOR . 'parameters.yml') |
127 | 127 | AND !file_exists(getcwd() . DIRECTORY_SEPARATOR . '.chapiconfig') |
128 | - ) // one file have to exist |
|
128 | + ) { |
|
129 | + // one file have to exist |
|
129 | 130 | { |
130 | 131 | $this->oOutput->writeln(sprintf( |
131 | 132 | '<error>%s</error>', |
132 | 133 | 'No parameter file found. Please run "configure" command for initial setup or add a local `.chapiconfig` to your working directory.' |
133 | 134 | )); |
135 | + } |
|
134 | 136 | return false; |
135 | 137 | } |
136 | 138 |
@@ -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) |
@@ -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']); |
@@ -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 | } |
@@ -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 | } |
@@ -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 | } |