| @@ -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 | $_mValue = (!empty($_mValue)) | 
| 50 | 50 |                      ? '[ ' . implode(', ', $_mValue) . ' ]' | 
| 51 | 51 | : '[ ]'; | 
| 52 | - } | |
| 53 | - elseif (is_bool($_mValue)) | |
| 52 | + } elseif (is_bool($_mValue)) | |
| 54 | 53 |              { | 
| 55 | 54 | $_mValue = (true === $_mValue) | 
| 56 | 55 | ? 'true' | 
| @@ -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 | } | 
| @@ -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 | } | 
| @@ -58,8 +57,7 @@ discard block | ||
| 58 | 57 |          { | 
| 59 | 58 |              $_oDateStart = new \DateTime(str_replace('Z', '', $_oIso8601Entity->sStartTime)); | 
| 60 | 59 | $_oDateStart->setTimezone(new \DateTimeZone($sTimeZone)); | 
| 61 | - } | |
| 62 | - else | |
| 60 | + } else | |
| 63 | 61 |          { | 
| 64 | 62 | $_oDateStart = new \DateTime($_oIso8601Entity->sStartTime); | 
| 65 | 63 | } | 
| @@ -51,8 +51,7 @@ | ||
| 51 | 51 | ); | 
| 52 | 52 | |
| 53 | 53 | return new HttpGuzzlResponse($_oResponse); | 
| 54 | - } | |
| 55 | - catch (\Exception $oException) | |
| 54 | + } catch (\Exception $oException) | |
| 56 | 55 |          { | 
| 57 | 56 | throw new HttpConnectionException( | 
| 58 | 57 |                  sprintf('Can\'t get response from "%s"', $this->oGuzzelClient->getBaseUrl() . $sUrl), | 
| @@ -9,8 +9,8 @@ | ||
| 9 | 9 | |
| 10 | 10 | namespace Chapi\Component\Http; | 
| 11 | 11 | |
| 12 | -use Chapi\Exception\HttpConnectionException; | |
| 13 | 12 | use Chapi\Entity\Http\AuthEntity; | 
| 13 | +use Chapi\Exception\HttpConnectionException; | |
| 14 | 14 | use GuzzleHttp\ClientInterface; | 
| 15 | 15 | |
| 16 | 16 | class HttpGuzzlClient implements HttpClientInterface | 
| @@ -87,8 +87,7 @@ discard block | ||
| 87 | 87 |                      $this->{$_sKey} = $_mValue; | 
| 88 | 88 | } | 
| 89 | 89 | } | 
| 90 | - } | |
| 91 | - else | |
| 90 | + } else | |
| 92 | 91 |          { | 
| 93 | 92 |              throw new \InvalidArgumentException(sprintf('Argument 1 passed to "%s" must be an array or object', __METHOD__)); | 
| 94 | 93 | } | 
| @@ -136,8 +135,7 @@ discard block | ||
| 136 | 135 | if (!empty($this->schedule)) | 
| 137 | 136 |          { | 
| 138 | 137 | unset($_aReturn['parents']); | 
| 139 | - } | |
| 140 | - else | |
| 138 | + } else | |
| 141 | 139 |          { | 
| 142 | 140 | unset($_aReturn['schedule']); | 
| 143 | 141 | unset($_aReturn['scheduleTimeZone']); | 
| @@ -230,8 +230,7 @@ | ||
| 230 | 230 | // set path to job file map | 
| 231 | 231 | $this->setJobFileToMap($_oJobEntity->name, $_sJobFilePath); | 
| 232 | 232 | } | 
| 233 | - } | |
| 234 | - else | |
| 233 | + } else | |
| 235 | 234 |              { | 
| 236 | 235 | throw new JobLoadException( | 
| 237 | 236 |                      sprintf('Unable to load json job data from "%s". Please check if the json is valid.', $_sJobFilePath), | 
| @@ -138,8 +138,7 @@ discard block | ||
| 138 | 138 |              { | 
| 139 | 139 | $_oDataPeriod = $this->oDatePeriodFactory->createDatePeriod($oJobEntity->schedule, $oJobEntity->scheduleTimeZone); | 
| 140 | 140 | return (false !== $_oDataPeriod); | 
| 141 | - } | |
| 142 | - catch (DatePeriodException $oException) | |
| 141 | + } catch (DatePeriodException $oException) | |
| 143 | 142 |              { | 
| 144 | 143 | // invalid: Iso8601 is not valid and/or DatePeriodFactory is able to create a valid DatePeriod | 
| 145 | 144 | } | 
| @@ -161,9 +160,11 @@ discard block | ||
| 161 | 160 | $_oDateIntervalEpsilon = new \DateInterval($oJobEntity->epsilon); | 
| 162 | 161 |                  $_iIntervalEpsilon = (int) $_oDateIntervalEpsilon->format('%Y%M%D%H%I%S'); | 
| 163 | 162 | |
| 164 | - if ($_iIntervalEpsilon > 30) // if epsilon > "PT30S" | |
| 163 | +                if ($_iIntervalEpsilon > 30) { | |
| 164 | + // if epsilon > "PT30S" | |
| 165 | 165 |                  { | 
| 166 | 166 | $_oIso8601Entity = $this->oDatePeriodFactory->createIso8601Entity($oJobEntity->schedule); | 
| 167 | + } | |
| 167 | 168 | |
| 168 | 169 | $_oDateIntervalScheduling = new \DateInterval($_oIso8601Entity->sInterval); | 
| 169 | 170 |                      $_iIntervalScheduling = (int) $_oDateIntervalScheduling->format('%Y%M%D%H%I%S'); | 
| @@ -173,8 +174,7 @@ discard block | ||
| 173 | 174 | |
| 174 | 175 | // if epsilon is less or equal than 30sec the not empty check is enough | 
| 175 | 176 | return true; | 
| 176 | - } | |
| 177 | - catch (\Exception $_oException) | |
| 177 | + } catch (\Exception $_oException) | |
| 178 | 178 |              { | 
| 179 | 179 | // can't init \DateInterval instance | 
| 180 | 180 | return false; |