@@ -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 |
@@ -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 | { |
@@ -11,12 +11,10 @@ |
||
11 | 11 | |
12 | 12 | use Chapi\Entity\JobEntityInterface; |
13 | 13 | use Chapi\Entity\Marathon\AppEntity\Container; |
14 | -use Chapi\Entity\Marathon\AppEntity\DockerPortMapping; |
|
15 | 14 | use Chapi\Entity\Marathon\AppEntity\HealthCheck; |
16 | 15 | use Chapi\Entity\Marathon\AppEntity\IpAddress; |
17 | 16 | use Chapi\Entity\Marathon\AppEntity\PortDefinition; |
18 | 17 | use Chapi\Entity\Marathon\AppEntity\UpgradeStrategy; |
19 | -use Symfony\Component\Config\Definition\Exception\Exception; |
|
20 | 18 | |
21 | 19 | class MarathonAppEntity implements JobEntityInterface |
22 | 20 | { |
@@ -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 |
@@ -123,7 +123,8 @@ discard block |
||
123 | 123 | if (isset($aData['upgradeStrategy'])) |
124 | 124 | { |
125 | 125 | $this->upgradeStrategy = new UpgradeStrategy((array)$aData['upgradeStrategy']); |
126 | - } else { |
|
126 | + } |
|
127 | + else { |
|
127 | 128 | $this->upgradeStrategy = new UpgradeStrategy(); |
128 | 129 | } |
129 | 130 | |
@@ -135,14 +136,16 @@ discard block |
||
135 | 136 | if (isset($aData['env'])) |
136 | 137 | { |
137 | 138 | $this->env = (object) $aData['env']; |
138 | - } else { |
|
139 | + } |
|
140 | + else { |
|
139 | 141 | $this->env = (object)[]; |
140 | 142 | } |
141 | 143 | |
142 | 144 | if (isset($aData['labels'])) |
143 | 145 | { |
144 | 146 | $this->labels = (object) $aData['labels']; |
145 | - } else { |
|
147 | + } |
|
148 | + else { |
|
146 | 149 | $this->labels = (object)[]; |
147 | 150 | } |
148 | 151 | MarathonEntityUtils::setPropertyIfExist($aData, $this, 'constraints'); |
@@ -23,12 +23,12 @@ discard block |
||
23 | 23 | |
24 | 24 | public function __construct($aData = []) |
25 | 25 | { |
26 | - MarathonEntityUtils::setAllPossibleProperties((array)$aData, $this); |
|
27 | - if(isset($aData['labels'])) |
|
26 | + MarathonEntityUtils::setAllPossibleProperties((array) $aData, $this); |
|
27 | + if (isset($aData['labels'])) |
|
28 | 28 | { |
29 | - $this->labels = (object)$aData['labels']; |
|
29 | + $this->labels = (object) $aData['labels']; |
|
30 | 30 | } else { |
31 | - $this->labels = (object)[]; |
|
31 | + $this->labels = (object) []; |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | } |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | $_aRet = (array) $this; |
42 | 42 | $_aRet = array_filter($_aRet, function($v, $k) { |
43 | 43 | return !is_null($v); |
44 | - }, ARRAY_FILTER_USE_BOTH ); |
|
44 | + }, ARRAY_FILTER_USE_BOTH); |
|
45 | 45 | return $_aRet; |
46 | 46 | } |
47 | 47 | } |
48 | 48 | \ No newline at end of file |
@@ -27,7 +27,8 @@ |
||
27 | 27 | if(isset($aData['labels'])) |
28 | 28 | { |
29 | 29 | $this->labels = (object)$aData['labels']; |
30 | - } else { |
|
30 | + } |
|
31 | + else { |
|
31 | 32 | $this->labels = (object)[]; |
32 | 33 | } |
33 | 34 |
@@ -96,9 +96,9 @@ |
||
96 | 96 | * @param string $sDirectoryPath |
97 | 97 | * @param array $aSearchPatterns |
98 | 98 | */ |
99 | - private function getSearchPatternsFromDir($sDirectoryPath, &$aSearchPatterns=[]) |
|
99 | + private function getSearchPatternsFromDir($sDirectoryPath, &$aSearchPatterns = []) |
|
100 | 100 | { |
101 | - $_sIgnoreFilePath = $sDirectoryPath . DIRECTORY_SEPARATOR . '.chapiignore'; |
|
101 | + $_sIgnoreFilePath = $sDirectoryPath.DIRECTORY_SEPARATOR.'.chapiignore'; |
|
102 | 102 | |
103 | 103 | if (is_file($_sIgnoreFilePath)) |
104 | 104 | { |
@@ -70,7 +70,8 @@ |
||
70 | 70 | if (null == $_oLocalEntity) |
71 | 71 | { |
72 | 72 | $this->addJobInLocalRepository($_oRemoteEntity); |
73 | - } else { |
|
73 | + } |
|
74 | + else { |
|
74 | 75 | //update |
75 | 76 | $this->updateJobInLocalRepository($_oRemoteEntity, $bForceOverwrite); |
76 | 77 | } |
@@ -38,8 +38,7 @@ |
||
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 | } |