@@ -347,6 +347,9 @@ |
||
347 | 347 | } |
348 | 348 | |
349 | 349 | |
350 | + /** |
|
351 | + * @param string $sJobFile |
|
352 | + */ |
|
350 | 353 | private function dumpFileWithGroup($sJobFile, JobEntityInterface $oJobEntity, $bAdd = true) |
351 | 354 | { |
352 | 355 | $_sGroupConfig = file_get_contents($sJobFile); |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | $_sJobPath = $oJobEntity->getKey(); |
162 | 162 | } |
163 | 163 | |
164 | - return $this->sRepositoryDir . DIRECTORY_SEPARATOR . $_sJobPath . '.json'; |
|
164 | + return $this->sRepositoryDir.DIRECTORY_SEPARATOR.$_sJobPath.'.json'; |
|
165 | 165 | } |
166 | 166 | |
167 | 167 | /** |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | throw new \RuntimeException(sprintf('Path "%s" is not valid', $sPath)); |
177 | 177 | } |
178 | 178 | |
179 | - $_aTemp = Glob::glob(rtrim($sPath, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . '*'); |
|
179 | + $_aTemp = Glob::glob(rtrim($sPath, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.'*'); |
|
180 | 180 | |
181 | 181 | foreach ($_aTemp as $_sPath) |
182 | 182 | { |
@@ -155,8 +155,7 @@ discard block |
||
155 | 155 | DIRECTORY_SEPARATOR, |
156 | 156 | $oJobEntity->getKey() |
157 | 157 | ); |
158 | - } |
|
159 | - else |
|
158 | + } else |
|
160 | 159 | { |
161 | 160 | $_sJobPath = $oJobEntity->getKey(); |
162 | 161 | } |
@@ -268,15 +267,19 @@ discard block |
||
268 | 267 | |
269 | 268 | if ($_aTemp) |
270 | 269 | { |
271 | - if (property_exists($_aTemp, 'name')) // chronos |
|
270 | + if (property_exists($_aTemp, 'name')) { |
|
271 | + // chronos |
|
272 | 272 | { |
273 | 273 | $_aJobEntities[] = new ChronosJobEntity($_aTemp); |
274 | + } |
|
274 | 275 | |
275 | - } else if (property_exists($_aTemp, 'id')) //marathon |
|
276 | + } else if (property_exists($_aTemp, 'id')) { |
|
277 | + //marathon |
|
276 | 278 | { |
277 | 279 | foreach ($this->getMarathonEntitiesForConfig($_aTemp) as $_oApp) |
278 | 280 | { |
279 | 281 | $_aJobEntities[] = $_oApp; |
282 | + } |
|
280 | 283 | } |
281 | 284 | } else { |
282 | 285 | throw new JobLoadException( |
@@ -297,8 +300,7 @@ discard block |
||
297 | 300 | $_aJobs[] = $_oJobEntity; |
298 | 301 | } |
299 | 302 | |
300 | - } |
|
301 | - else |
|
303 | + } else |
|
302 | 304 | { |
303 | 305 | throw new JobLoadException( |
304 | 306 | sprintf('Unable to load json job data from "%s". Please check if the json is valid.', $_sJobFilePath), |
@@ -323,8 +325,7 @@ discard block |
||
323 | 325 | $this->aGroupedApps[] = $_oApp->id; |
324 | 326 | $_aRet[] = $_oGroupEntity; |
325 | 327 | } |
326 | - } |
|
327 | - else |
|
328 | + } else |
|
328 | 329 | { |
329 | 330 | $_aRet[] = new MarathonAppEntity($aEntityData); |
330 | 331 | } |
@@ -10,7 +10,6 @@ |
||
10 | 10 | namespace Chapi\Service\JobValidator\PropertyValidator; |
11 | 11 | |
12 | 12 | |
13 | -use Chapi\Entity\Chronos\JobEntity; |
|
14 | 13 | use Chapi\Entity\JobEntityInterface; |
15 | 14 | use Chapi\Service\JobValidator\PropertyValidatorInterface; |
16 | 15 |
@@ -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']); |
@@ -27,7 +27,7 @@ |
||
27 | 27 | */ |
28 | 28 | public static function setAllPossibleProperties($oData, $oTarget) |
29 | 29 | { |
30 | - foreach($oData as $attrName => $attrValue) |
|
30 | + foreach ($oData as $attrName => $attrValue) |
|
31 | 31 | { |
32 | 32 | // dont set array or objects. |
33 | 33 | // Because this would need further type information to properly set. |
@@ -38,8 +38,7 @@ discard block |
||
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 | } |
@@ -57,8 +56,7 @@ discard block |
||
57 | 56 | if (!empty($sTimeZone)) |
58 | 57 | { |
59 | 58 | $_oDateStart = new \DateTime(str_replace('Z', '', $_oIso8601Entity->sStartTime), new \DateTimeZone($sTimeZone)); |
60 | - } |
|
61 | - else |
|
59 | + } else |
|
62 | 60 | { |
63 | 61 | // todo: use a defined chronos time zone here? |
64 | 62 | $_oDateStart = new \DateTime($_oIso8601Entity->sStartTime); |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | */ |
83 | 83 | public function removeJob($sJobName) |
84 | 84 | { |
85 | - $_oResponse = $this->oHttpClient->delete('/scheduler/job/' . $sJobName); |
|
85 | + $_oResponse = $this->oHttpClient->delete('/scheduler/job/'.$sJobName); |
|
86 | 86 | return ($_oResponse->getStatusCode() == 204); |
87 | 87 | } |
88 | 88 | |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | */ |
92 | 92 | public function getJobStats($sJobName) |
93 | 93 | { |
94 | - return $this->sendGetJsonRequest('/scheduler/job/stat/' . $sJobName); |
|
94 | + return $this->sendGetJsonRequest('/scheduler/job/stat/'.$sJobName); |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | /** |
@@ -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 | } |
@@ -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; |
@@ -99,10 +99,12 @@ |
||
99 | 99 | { |
100 | 100 | if ($this->oRepositoryBridge->addJob($oJobEntity)) |
101 | 101 | { |
102 | - if (!is_null($this->oJobCollection)) // if no collection inited the new job will init by chronos request |
|
102 | + if (!is_null($this->oJobCollection)) { |
|
103 | + // if no collection inited the new job will init by chronos request |
|
103 | 104 | { |
104 | 105 | $this->oJobCollection->offsetSet($oJobEntity->getKey(), $oJobEntity); |
105 | 106 | } |
107 | + } |
|
106 | 108 | |
107 | 109 | return true; |
108 | 110 | } |