@@ -25,13 +25,13 @@ |
||
| 25 | 25 | { |
| 26 | 26 | MarathonEntityUtils::setAllPossibleProperties($aData, $this); |
| 27 | 27 | |
| 28 | - if(isset($aData['groups'])) |
|
| 28 | + if (isset($aData['groups'])) |
|
| 29 | 29 | { |
| 30 | 30 | $this->groups = $aData['groups']; |
| 31 | 31 | } |
| 32 | 32 | if (isset($aData['labels'])) |
| 33 | 33 | { |
| 34 | - $this->labels = (object)$aData['labels']; |
|
| 34 | + $this->labels = (object) $aData['labels']; |
|
| 35 | 35 | } |
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | 38 | \ No newline at end of file |
@@ -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 || |
@@ -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; |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | $_aDifferences[$_sProperty] = $this->oDiffCompare->compare( |
| 167 | 167 | $_oRemoteEntity->{$_sProperty}, |
| 168 | 168 | $_oLocalEntity->{$_sProperty} |
| 169 | - ) ; |
|
| 169 | + ); |
|
| 170 | 170 | } |
| 171 | 171 | |
| 172 | 172 | return $_aDifferences; |
@@ -219,7 +219,7 @@ discard block |
||
| 219 | 219 | * @param JobEntityInterface $oRemoteJob |
| 220 | 220 | * @return null |
| 221 | 221 | */ |
| 222 | - abstract protected function preCompareModifications(JobEntityInterface &$oLocalJob, JobEntityInterface &$oRemoteJob); |
|
| 222 | + abstract protected function preCompareModifications(JobEntityInterface & $oLocalJob, JobEntityInterface & $oRemoteJob); |
|
| 223 | 223 | |
| 224 | 224 | /** |
| 225 | 225 | * Gets entity for each system with defaults set |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | // check if dependency is satisfied |
| 75 | - if ( $_oJobEntityLocal->isDependencyJob()) |
|
| 75 | + if ($_oJobEntityLocal->isDependencyJob()) |
|
| 76 | 76 | { |
| 77 | 77 | try { |
| 78 | 78 | $circular = $this->isDependencyCircular($_oJobEntityLocal, count($_oJobEntityLocal->dependencies)); |
@@ -84,10 +84,10 @@ discard block |
||
| 84 | 84 | return false; |
| 85 | 85 | } |
| 86 | 86 | } |
| 87 | - catch(\Exception $e) |
|
| 87 | + catch (\Exception $e) |
|
| 88 | 88 | { |
| 89 | 89 | $this->oLogger->error(sprintf( |
| 90 | - 'Job %s cannot be added to remote : %s',$sAppId, $e->getMessage() |
|
| 90 | + 'Job %s cannot be added to remote : %s', $sAppId, $e->getMessage() |
|
| 91 | 91 | )); |
| 92 | 92 | return false; |
| 93 | 93 | } |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | return !(count($arr) == count(array_unique($arr))); |
| 134 | 134 | } |
| 135 | 135 | |
| 136 | - private function isDependencyCircular(MarathonAppEntity $oEntity, $iImmediateChildren, &$path=[]) |
|
| 136 | + private function isDependencyCircular(MarathonAppEntity $oEntity, $iImmediateChildren, &$path = []) |
|
| 137 | 137 | { |
| 138 | 138 | // Invariant: path will not have duplicates for acyclic dependency tree |
| 139 | 139 | if ($this->hasDuplicates($path)) |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | // for B intermediate Child will be 2. |
| 187 | 187 | // when we process D, it will be reduced to 1 and with C to 0 |
| 188 | 188 | // then we will pop B to generate path [A, E] when we reach E. |
| 189 | - $iImmediateChildren = $iImmediateChildren -1; |
|
| 189 | + $iImmediateChildren = $iImmediateChildren - 1; |
|
| 190 | 190 | if ($iImmediateChildren == 0) |
| 191 | 191 | { |
| 192 | 192 | array_pop($path); |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | $_sYaml = $_oDumper->dump(array('parameters' => $aToStore), 2); |
| 166 | 166 | |
| 167 | 167 | $_oFileSystem = new Filesystem(); |
| 168 | - $_oFileSystem->dumpFile($this->getHomeDir() . '/parameters.yml', $_sYaml); |
|
| 168 | + $_oFileSystem->dumpFile($this->getHomeDir().'/parameters.yml', $_sYaml); |
|
| 169 | 169 | } |
| 170 | 170 | |
| 171 | 171 | /** |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | private function getParameterValue($sKey, $mDefaultValue = null) |
| 195 | 195 | { |
| 196 | 196 | $_oParser = new Parser(); |
| 197 | - $_sParameterFile = $this->getHomeDir() . '/parameters.yml'; |
|
| 197 | + $_sParameterFile = $this->getHomeDir().'/parameters.yml'; |
|
| 198 | 198 | |
| 199 | 199 | if (file_exists($_sParameterFile)) |
| 200 | 200 | { |
@@ -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 | // assuming same name won't be in all subsystems. |
| 81 | 81 | // TODO: add support to handle the duplicate names in different subsystems |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | } |
| 102 | 102 | /** @var JobComparisonInterface $comparer */ |
| 103 | 103 | $comparer = null; |
| 104 | - foreach($this->aComposites as $child) |
|
| 104 | + foreach ($this->aComposites as $child) |
|
| 105 | 105 | { |
| 106 | 106 | if ($child->isJobAvailable($oJobEntityA->getKey())) |
| 107 | 107 | { |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | */ |
| 126 | 126 | public function isJobAvailable($sJobName) |
| 127 | 127 | { |
| 128 | - foreach($this->aComposites as $child) |
|
| 128 | + foreach ($this->aComposites as $child) |
|
| 129 | 129 | { |
| 130 | 130 | if ($child->isJobAvailable($sJobName)) |
| 131 | 131 | { |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | catch (ClientException $oException) // 400 level errors |
| 64 | 64 | { |
| 65 | 65 | throw new HttpConnectionException( |
| 66 | - sprintf('Client error: Calling %s returned %d', $this->oGuzzelClient->getConfig('base_uri') . $sUrl, $oException->getCode()), |
|
| 66 | + sprintf('Client error: Calling %s returned %d', $this->oGuzzelClient->getConfig('base_uri').$sUrl, $oException->getCode()), |
|
| 67 | 67 | $oException->getCode(), |
| 68 | 68 | $oException |
| 69 | 69 | ); |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | catch (ServerException $oException) // 500 level errors |
| 72 | 72 | { |
| 73 | 73 | throw new HttpConnectionException( |
| 74 | - sprintf('Server error: Calling %s returned %d', $this->oGuzzelClient->getConfig('base_uri') . $sUrl, $oException->getCode()), |
|
| 74 | + sprintf('Server error: Calling %s returned %d', $this->oGuzzelClient->getConfig('base_uri').$sUrl, $oException->getCode()), |
|
| 75 | 75 | $oException->getCode(), |
| 76 | 76 | $oException |
| 77 | 77 | ); |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | catch (TooManyRedirectsException $oException) // too many redirects to follow |
| 80 | 80 | { |
| 81 | 81 | throw new HttpConnectionException( |
| 82 | - sprintf('Request to %s failed due to too many redirects', $this->oGuzzelClient->getConfig('base_uri') . $sUrl), |
|
| 82 | + sprintf('Request to %s failed due to too many redirects', $this->oGuzzelClient->getConfig('base_uri').$sUrl), |
|
| 83 | 83 | HttpConnectionException::ERROR_CODE_TOO_MANY_REDIRECT_EXCEPTION, |
| 84 | 84 | $oException |
| 85 | 85 | ); |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | catch (ConnectException $oException) // networking error |
| 88 | 88 | { |
| 89 | 89 | throw new HttpConnectionException( |
| 90 | - sprintf('Cannot connect to %s due to some networking error', $this->oGuzzelClient->getConfig('base_uri') . $sUrl), |
|
| 90 | + sprintf('Cannot connect to %s due to some networking error', $this->oGuzzelClient->getConfig('base_uri').$sUrl), |
|
| 91 | 91 | HttpConnectionException::ERROR_CODE_CONNECT_EXCEPTION, |
| 92 | 92 | $oException |
| 93 | 93 | ); |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | catch (RequestException $oException) // networking error (connection timeout, DNS errors, etc.) |
| 96 | 96 | { |
| 97 | 97 | throw new HttpConnectionException( |
| 98 | - sprintf('Cannot connect to %s due to networking error', $this->oGuzzelClient->getConfig('base_uri') . $sUrl), |
|
| 98 | + sprintf('Cannot connect to %s due to networking error', $this->oGuzzelClient->getConfig('base_uri').$sUrl), |
|
| 99 | 99 | HttpConnectionException::ERROR_CODE_REQUEST_EXCEPTION, |
| 100 | 100 | $oException |
| 101 | 101 | ); |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | catch (\Exception $oException) |
| 104 | 104 | { |
| 105 | 105 | throw new HttpConnectionException( |
| 106 | - sprintf('Can\'t get response from "%s"', $this->oGuzzelClient->getConfig('base_uri') . $sUrl), |
|
| 106 | + sprintf('Can\'t get response from "%s"', $this->oGuzzelClient->getConfig('base_uri').$sUrl), |
|
| 107 | 107 | HttpConnectionException::ERROR_CODE_UNKNOWN, |
| 108 | 108 | $oException |
| 109 | 109 | ); |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | /** |
| 52 | 52 | * @var array |
| 53 | 53 | */ |
| 54 | - public $constraints = []; |
|
| 54 | + public $constraints = []; |
|
| 55 | 55 | |
| 56 | 56 | |
| 57 | 57 | public $acceptedResourceRoles = null; |
@@ -103,47 +103,47 @@ discard block |
||
| 103 | 103 | { |
| 104 | 104 | foreach ($aData['portDefinitions'] as $portDefinition) |
| 105 | 105 | { |
| 106 | - $this->portDefinitions[] = new PortDefinition((array)$portDefinition); |
|
| 106 | + $this->portDefinitions[] = new PortDefinition((array) $portDefinition); |
|
| 107 | 107 | } |
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | if (isset($aData['container'])) |
| 111 | 111 | { |
| 112 | - $this->container = new Container((array)$aData['container']); |
|
| 112 | + $this->container = new Container((array) $aData['container']); |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | if (isset($aData['healthChecks'])) |
| 116 | 116 | { |
| 117 | - foreach($aData['healthChecks'] as $healthCheck) |
|
| 117 | + foreach ($aData['healthChecks'] as $healthCheck) |
|
| 118 | 118 | { |
| 119 | - $this->healthChecks[] = new HealthCheck((array)$healthCheck); |
|
| 119 | + $this->healthChecks[] = new HealthCheck((array) $healthCheck); |
|
| 120 | 120 | } |
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | if (isset($aData['upgradeStrategy'])) |
| 124 | 124 | { |
| 125 | - $this->upgradeStrategy = new UpgradeStrategy((array)$aData['upgradeStrategy']); |
|
| 125 | + $this->upgradeStrategy = new UpgradeStrategy((array) $aData['upgradeStrategy']); |
|
| 126 | 126 | } else { |
| 127 | 127 | $this->upgradeStrategy = new UpgradeStrategy(); |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | if (isset($aData['ipAddress'])) |
| 131 | 131 | { |
| 132 | - $this->ipAddress = new IpAddress((array)$aData['ipAddress']); |
|
| 132 | + $this->ipAddress = new IpAddress((array) $aData['ipAddress']); |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | if (isset($aData['env'])) |
| 136 | 136 | { |
| 137 | - $this->env = (object) $aData['env']; |
|
| 137 | + $this->env = (object) $aData['env']; |
|
| 138 | 138 | } else { |
| 139 | - $this->env = (object)[]; |
|
| 139 | + $this->env = (object) []; |
|
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | if (isset($aData['labels'])) |
| 143 | 143 | { |
| 144 | 144 | $this->labels = (object) $aData['labels']; |
| 145 | 145 | } else { |
| 146 | - $this->labels = (object)[]; |
|
| 146 | + $this->labels = (object) []; |
|
| 147 | 147 | } |
| 148 | 148 | MarathonEntityUtils::setPropertyIfExist($aData, $this, 'constraints'); |
| 149 | 149 | MarathonEntityUtils::setPropertyIfExist($aData, $this, 'args'); |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | $_aRet = (array) $this; |
| 162 | 162 | $_aRet = array_filter($_aRet, function($v, $k) { |
| 163 | 163 | return !is_null($v) || empty($v); |
| 164 | - }, ARRAY_FILTER_USE_BOTH ); |
|
| 164 | + }, ARRAY_FILTER_USE_BOTH); |
|
| 165 | 165 | return $_aRet; |
| 166 | 166 | } |
| 167 | 167 | |