@@ -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 | { |
@@ -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 | |
@@ -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. |
@@ -54,8 +54,7 @@ |
||
| 54 | 54 | { |
| 55 | 55 | $_oResponse = $this->oGuzzelClient->request('GET', $sUrl, $_aRequestOptions); |
| 56 | 56 | return new HttpGuzzlResponse($_oResponse); |
| 57 | - } |
|
| 58 | - catch (\Exception $oException) |
|
| 57 | + } catch (\Exception $oException) |
|
| 59 | 58 | { |
| 60 | 59 | throw new HttpConnectionException( |
| 61 | 60 | sprintf('Can\'t get response from "%s"', $this->oGuzzelClient->getConfig('base_uri') . $sUrl), |
@@ -98,8 +98,8 @@ |
||
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | /** |
| 101 | - * @param $sMethod |
|
| 102 | - * @param $sUrl |
|
| 101 | + * @param string $sMethod |
|
| 102 | + * @param string $sUrl |
|
| 103 | 103 | * @param $mData |
| 104 | 104 | * @return HttpGuzzlResponse |
| 105 | 105 | */ |
@@ -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; |
@@ -34,10 +34,10 @@ discard block |
||
| 34 | 34 | public function getLocalMissingJobs() |
| 35 | 35 | { |
| 36 | 36 | $_aMissingJobs = array(); |
| 37 | - foreach($this->aComposites as $jobComparers) |
|
| 37 | + foreach ($this->aComposites as $jobComparers) |
|
| 38 | 38 | { |
| 39 | 39 | $missing = $jobComparers->getLocalMissingJobs(); |
| 40 | - $_aMissingJobs = array_merge($_aMissingJobs, $missing); |
|
| 40 | + $_aMissingJobs = array_merge($_aMissingJobs, $missing); |
|
| 41 | 41 | } |
| 42 | 42 | return $_aMissingJobs; |
| 43 | 43 | } |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | public function getRemoteMissingJobs() |
| 49 | 49 | { |
| 50 | 50 | $_aChronosMissingJobs = array(); |
| 51 | - foreach($this->aComposites as $jobComparers) |
|
| 51 | + foreach ($this->aComposites as $jobComparers) |
|
| 52 | 52 | { |
| 53 | 53 | $_aChronosMissingJobs = array_merge($_aChronosMissingJobs, $jobComparers->getRemoteMissingJobs()); |
| 54 | 54 | } |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | public function getLocalJobUpdates() |
| 62 | 62 | { |
| 63 | 63 | $_aLocalJobUpdates = array(); |
| 64 | - foreach($this->aComposites as $jobComparers) |
|
| 64 | + foreach ($this->aComposites as $jobComparers) |
|
| 65 | 65 | { |
| 66 | 66 | $_aLocalJobUpdates = array_merge($_aLocalJobUpdates, $jobComparers->getLocalJobUpdates()); |
| 67 | 67 | } |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | public function getJobDiff($sJobName) |
| 76 | 76 | { |
| 77 | 77 | $_aJobDiffs = array(); |
| 78 | - foreach($this->aComposites as $jobComparers) |
|
| 78 | + foreach ($this->aComposites as $jobComparers) |
|
| 79 | 79 | { |
| 80 | 80 | // NOTE: only gets the first one. |
| 81 | 81 | // does it make sense? |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | } |
| 100 | 100 | /** @var JobComparisonInterface $comparer */ |
| 101 | 101 | $comparer = null; |
| 102 | - foreach($this->aComposites as $child) |
|
| 102 | + foreach ($this->aComposites as $child) |
|
| 103 | 103 | { |
| 104 | 104 | if ($child->isJobAvailable($oJobEntityA->getKey())) |
| 105 | 105 | { |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | */ |
| 124 | 124 | public function isJobAvailable($sJobName) |
| 125 | 125 | { |
| 126 | - foreach($this->aComposites as $child) { |
|
| 126 | + foreach ($this->aComposites as $child) { |
|
| 127 | 127 | if ($child->isJobAvailable($sJobName)) |
| 128 | 128 | { |
| 129 | 129 | return true; |
@@ -250,12 +250,10 @@ discard block |
||
| 250 | 250 | { |
| 251 | 251 | if (is_array($mValueA) && is_array($mValueB)) { |
| 252 | 252 | return $this->isArrayEqual($mValueA, $mValueB); |
| 253 | - } |
|
| 254 | - elseif (is_object($mValueA) && is_object($mValueB)) |
|
| 253 | + } elseif (is_object($mValueA) && is_object($mValueB)) |
|
| 255 | 254 | { |
| 256 | 255 | return $this->isArrayEqual(get_object_vars($mValueA), get_object_vars($mValueB)); |
| 257 | - } |
|
| 258 | - elseif ((is_scalar($mValueA) && is_scalar($mValueB)) || (is_null($mValueA) && is_null($mValueB))) |
|
| 256 | + } elseif ((is_scalar($mValueA) && is_scalar($mValueB)) || (is_null($mValueA) && is_null($mValueB))) |
|
| 259 | 257 | { |
| 260 | 258 | return $mValueA == $mValueB; |
| 261 | 259 | } |
@@ -288,8 +286,7 @@ discard block |
||
| 288 | 286 | { |
| 289 | 287 | return false; |
| 290 | 288 | } |
| 291 | - } |
|
| 292 | - else |
|
| 289 | + } else |
|
| 293 | 290 | { |
| 294 | 291 | foreach ($aValuesB as $_mValueB) |
| 295 | 292 | { |
@@ -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 || |
@@ -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 | } |