@@ -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), |
@@ -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 | |
@@ -44,22 +44,22 @@ |
||
| 44 | 44 | private static $sHomeDir = ''; |
| 45 | 45 | |
| 46 | 46 | /** |
| 47 | - * Executes the current command. |
|
| 48 | - * |
|
| 49 | - * This method is not abstract because you can use this class |
|
| 50 | - * as a concrete class. In this case, instead of defining the |
|
| 51 | - * execute() method, you set the code to execute by passing |
|
| 52 | - * a Closure to the setCode() method. |
|
| 53 | - * |
|
| 54 | - * @param InputInterface $oInput An InputInterface instance |
|
| 55 | - * @param OutputInterface $oOutput An OutputInterface instance |
|
| 56 | - * |
|
| 57 | - * @return integer null or 0 if everything went fine, or an error code |
|
| 58 | - * |
|
| 59 | - * @throws \LogicException When this abstract method is not implemented |
|
| 60 | - * |
|
| 61 | - * @see setCode() |
|
| 62 | - */ |
|
| 47 | + * Executes the current command. |
|
| 48 | + * |
|
| 49 | + * This method is not abstract because you can use this class |
|
| 50 | + * as a concrete class. In this case, instead of defining the |
|
| 51 | + * execute() method, you set the code to execute by passing |
|
| 52 | + * a Closure to the setCode() method. |
|
| 53 | + * |
|
| 54 | + * @param InputInterface $oInput An InputInterface instance |
|
| 55 | + * @param OutputInterface $oOutput An OutputInterface instance |
|
| 56 | + * |
|
| 57 | + * @return integer null or 0 if everything went fine, or an error code |
|
| 58 | + * |
|
| 59 | + * @throws \LogicException When this abstract method is not implemented |
|
| 60 | + * |
|
| 61 | + * @see setCode() |
|
| 62 | + */ |
|
| 63 | 63 | protected function execute(InputInterface $oInput, OutputInterface $oOutput) |
| 64 | 64 | { |
| 65 | 65 | $this->oInput = $oInput; |
@@ -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); |
@@ -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) |
@@ -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)) |
@@ -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 |
@@ -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 | /** |
@@ -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 | } |