@@ -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 | } |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | $_iStartTime = ($_sStartTime == null) ? $_iCurrentTime : strtotime($_sStartTime); |
| 74 | 74 | if ($_sStartTime != null && $_iStartTime < $_iCurrentTime) |
| 75 | 75 | { |
| 76 | - $_iStartTime = strtotime($_sStartTime . ' + 24 hours'); |
|
| 76 | + $_iStartTime = strtotime($_sStartTime.' + 24 hours'); |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | $_iEndTime = ($_sEndTime == null) ? $_iStartTime + 7200 : strtotime($_sEndTime); |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | $_oTable = new Table($this->oOutput); |
| 96 | 96 | $_oTable->setHeaders(array( |
| 97 | 97 | 'Job', |
| 98 | - 'Timeline for ' . date('Y-m-d H:i', $iStartTime) . ' till ' . date('Y-m-d H:i', $iEndTime) |
|
| 98 | + 'Timeline for '.date('Y-m-d H:i', $iStartTime).' till '.date('Y-m-d H:i', $iEndTime) |
|
| 99 | 99 | )); |
| 100 | 100 | |
| 101 | 101 | $_aJobs = $this->getJobsWhichShouldStartInPeriod($iStartTime, $iEndTime); |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | |
| 164 | 164 | $oTable->addRow( |
| 165 | 165 | array( |
| 166 | - str_repeat(' ', $iCurrentChildLevel) . '|_ ' . $_sChildJobName, |
|
| 166 | + str_repeat(' ', $iCurrentChildLevel).'|_ '.$_sChildJobName, |
|
| 167 | 167 | $this->getTimelineStr( |
| 168 | 168 | $oDisplayPeriod, |
| 169 | 169 | $oJobDatePeriod, |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | { |
| 318 | 318 | if ($iJobStartTimeDelay > 0) |
| 319 | 319 | { |
| 320 | - $_oJobTime->add(new \DateInterval('PT' . $iJobStartTimeDelay . 'S')); |
|
| 320 | + $_oJobTime->add(new \DateInterval('PT'.$iJobStartTimeDelay.'S')); |
|
| 321 | 321 | } |
| 322 | 322 | |
| 323 | 323 | $_aStartTimes[$_oJobTime->format('YmdHi')] = $_oJobTime; |
@@ -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 | { |
@@ -129,12 +129,12 @@ |
||
| 129 | 129 | ? 100 / $oJobEntity->successCount * $oJobEntity->errorCount |
| 130 | 130 | : 100; |
| 131 | 131 | |
| 132 | - $_aJobInfoText[] = 'errors rate: ' . round($_fErrorRate, 2) . '%'; |
|
| 132 | + $_aJobInfoText[] = 'errors rate: '.round($_fErrorRate, 2).'%'; |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | if ($oJobEntity->errorsSinceLastSuccess > 0) |
| 136 | 136 | { |
| 137 | - $_aJobInfoText[] = 'errors since last success:' . $oJobEntity->errorsSinceLastSuccess; |
|
| 137 | + $_aJobInfoText[] = 'errors since last success:'.$oJobEntity->errorsSinceLastSuccess; |
|
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | return (!empty($_aJobInfoText)) |
@@ -11,7 +11,6 @@ |
||
| 11 | 11 | |
| 12 | 12 | use Chapi\Entity\Chronos\ChronosJobEntity; |
| 13 | 13 | use Chapi\Entity\JobEntityInterface; |
| 14 | -use Chapi\Entity\Marathon\MarathonAppEntity; |
|
| 15 | 14 | use Chapi\Service\JobRepository\JobRepositoryInterface; |
| 16 | 15 | use Symfony\Component\Console\Helper\Table; |
| 17 | 16 | use Symfony\Component\Console\Input\InputOption; |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | $this->loadParameterConfig($this->getWorkingDir(), '.chapiconfig', $_oContainer); |
| 100 | 100 | |
| 101 | 101 | // load services |
| 102 | - $_oLoader = new YamlFileLoader($_oContainer, new FileLocator(__DIR__ . self::FOLDER_RESOURCES)); |
|
| 102 | + $_oLoader = new YamlFileLoader($_oContainer, new FileLocator(__DIR__.self::FOLDER_RESOURCES)); |
|
| 103 | 103 | $_oLoader->load('services.yml'); |
| 104 | 104 | |
| 105 | 105 | self::$oContainer = $_oContainer; |
@@ -114,8 +114,8 @@ discard block |
||
| 114 | 114 | protected function isAppRunable() |
| 115 | 115 | { |
| 116 | 116 | if ( |
| 117 | - !file_exists($this->getHomeDir() . DIRECTORY_SEPARATOR . 'parameters.yml') |
|
| 118 | - && !file_exists($this->getWorkingDir() . DIRECTORY_SEPARATOR . '.chapiconfig') |
|
| 117 | + !file_exists($this->getHomeDir().DIRECTORY_SEPARATOR.'parameters.yml') |
|
| 118 | + && !file_exists($this->getWorkingDir().DIRECTORY_SEPARATOR.'.chapiconfig') |
|
| 119 | 119 | ) // one file have to exist |
| 120 | 120 | { |
| 121 | 121 | $this->oOutput->writeln(sprintf( |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | $_sHomeDir = getenv('CHAPI_HOME'); |
| 142 | 142 | if (!$_sHomeDir) |
| 143 | 143 | { |
| 144 | - $_sHomeDir = CommandUtils::getOsHomeDir() . DIRECTORY_SEPARATOR . '.chapi'; |
|
| 144 | + $_sHomeDir = CommandUtils::getOsHomeDir().DIRECTORY_SEPARATOR.'.chapi'; |
|
| 145 | 145 | } |
| 146 | 146 | |
| 147 | 147 | CommandUtils::hasCreateDirectoryIfNotExists($_sHomeDir); |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | */ |
| 155 | 155 | protected function getCacheDir() |
| 156 | 156 | { |
| 157 | - $_sCacheDir = $this->getHomeDir() . DIRECTORY_SEPARATOR . 'cache'; |
|
| 157 | + $_sCacheDir = $this->getHomeDir().DIRECTORY_SEPARATOR.'cache'; |
|
| 158 | 158 | CommandUtils::hasCreateDirectoryIfNotExists($_sCacheDir); |
| 159 | 159 | |
| 160 | 160 | return $_sCacheDir; |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | private function loadParameterConfig($sPath, $sFile, $oContainer) |
| 177 | 177 | { |
| 178 | 178 | // load local parameters |
| 179 | - if (file_exists($sPath . DIRECTORY_SEPARATOR . $sFile)) |
|
| 179 | + if (file_exists($sPath.DIRECTORY_SEPARATOR.$sFile)) |
|
| 180 | 180 | { |
| 181 | 181 | $_oLoader = new YamlFileLoader($oContainer, new FileLocator($sPath)); |
| 182 | 182 | $_oLoader->load($sFile); |
@@ -116,12 +116,14 @@ |
||
| 116 | 116 | if ( |
| 117 | 117 | !file_exists($this->getHomeDir() . DIRECTORY_SEPARATOR . 'parameters.yml') |
| 118 | 118 | && !file_exists($this->getWorkingDir() . DIRECTORY_SEPARATOR . '.chapiconfig') |
| 119 | - ) // one file have to exist |
|
| 119 | + ) { |
|
| 120 | + // one file have to exist |
|
| 120 | 121 | { |
| 121 | 122 | $this->oOutput->writeln(sprintf( |
| 122 | 123 | '<error>%s</error>', |
| 123 | 124 | 'No parameter file found. Please run "configure" command for initial setup or add a local `.chapiconfig` to your working directory.' |
| 124 | 125 | )); |
| 126 | + } |
|
| 125 | 127 | return false; |
| 126 | 128 | } |
| 127 | 129 | |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | $_sYaml = $_oDumper->dump(array('parameters' => $aToStore)); |
| 137 | 137 | |
| 138 | 138 | $_oFileSystem = new Filesystem(); |
| 139 | - $_oFileSystem->dumpFile($this->getHomeDir() . '/parameters.yml', $_sYaml); |
|
| 139 | + $_oFileSystem->dumpFile($this->getHomeDir().'/parameters.yml', $_sYaml); |
|
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | /** |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | private function getParameterValue($sKey, $mDefaultValue = null) |
| 166 | 166 | { |
| 167 | 167 | $_oParser = new Parser(); |
| 168 | - $_sParameterFile = $this->getHomeDir() . '/parameters.yml'; |
|
| 168 | + $_sParameterFile = $this->getHomeDir().'/parameters.yml'; |
|
| 169 | 169 | |
| 170 | 170 | if (file_exists($_sParameterFile)) |
| 171 | 171 | { |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | md5($sCachePrefix), |
| 37 | 37 | 0, |
| 38 | 38 | 6 |
| 39 | - ) . '.'; |
|
| 39 | + ).'.'; |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | /** |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | public function set($sKey, $mValue, $iTTL = 0) |
| 49 | 49 | { |
| 50 | - return $this->oDoctrineCache->save($this->sCachePrefix . $sKey, $mValue, $iTTL); |
|
| 50 | + return $this->oDoctrineCache->save($this->sCachePrefix.$sKey, $mValue, $iTTL); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | /** |
@@ -56,8 +56,8 @@ discard block |
||
| 56 | 56 | */ |
| 57 | 57 | public function get($sKey) |
| 58 | 58 | { |
| 59 | - return ($this->oDoctrineCache->contains($this->sCachePrefix . $sKey)) |
|
| 60 | - ? $this->oDoctrineCache->fetch($this->sCachePrefix . $sKey) |
|
| 59 | + return ($this->oDoctrineCache->contains($this->sCachePrefix.$sKey)) |
|
| 60 | + ? $this->oDoctrineCache->fetch($this->sCachePrefix.$sKey) |
|
| 61 | 61 | : null |
| 62 | 62 | ; |
| 63 | 63 | } |
@@ -68,6 +68,6 @@ discard block |
||
| 68 | 68 | */ |
| 69 | 69 | public function delete($sKey) |
| 70 | 70 | { |
| 71 | - return $this->oDoctrineCache->delete($this->sCachePrefix . $sKey); |
|
| 71 | + return $this->oDoctrineCache->delete($this->sCachePrefix.$sKey); |
|
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | 74 | \ No newline at end of file |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | catch (\Exception $oException) |
| 59 | 59 | { |
| 60 | 60 | throw new HttpConnectionException( |
| 61 | - sprintf('Can\'t get response from "%s"', $this->oGuzzelClient->getConfig('base_uri') . $sUrl), |
|
| 61 | + sprintf('Can\'t get response from "%s"', $this->oGuzzelClient->getConfig('base_uri').$sUrl), |
|
| 62 | 62 | 0, |
| 63 | 63 | $oException |
| 64 | 64 | ); |
@@ -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), |