@@ -23,12 +23,12 @@ |
||
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 | } |
@@ -35,14 +35,14 @@ |
||
35 | 35 | |
36 | 36 | if (isset($aData['docker'])) |
37 | 37 | { |
38 | - $this->docker = new Docker((array)$aData['docker']); |
|
38 | + $this->docker = new Docker((array) $aData['docker']); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | if (isset($aData['volumes'])) |
42 | 42 | { |
43 | 43 | foreach ($aData['volumes'] as $volume) |
44 | 44 | { |
45 | - $this->volumes[] = new ContainerVolume((array)$volume); |
|
45 | + $this->volumes[] = new ContainerVolume((array) $volume); |
|
46 | 46 | } |
47 | 47 | } |
48 | 48 |
@@ -39,17 +39,17 @@ |
||
39 | 39 | |
40 | 40 | if (isset($aData['portMappings'])) |
41 | 41 | { |
42 | - foreach($aData['portMappings'] as $portMapping) |
|
42 | + foreach ($aData['portMappings'] as $portMapping) |
|
43 | 43 | { |
44 | - $this->portMappings[] = new DockerPortMapping((array)$portMapping); |
|
44 | + $this->portMappings[] = new DockerPortMapping((array) $portMapping); |
|
45 | 45 | } |
46 | 46 | } |
47 | 47 | |
48 | 48 | if (isset($aData['parameters'])) |
49 | 49 | { |
50 | - foreach($aData['parameters'] as $parameter) |
|
50 | + foreach ($aData['parameters'] as $parameter) |
|
51 | 51 | { |
52 | - $this->parameters[] = new DockerParameters((array)$parameter); |
|
52 | + $this->parameters[] = new DockerParameters((array) $parameter); |
|
53 | 53 | } |
54 | 54 | } |
55 | 55 |
@@ -41,9 +41,9 @@ |
||
41 | 41 | { |
42 | 42 | MarathonEntityUtils::setAllPossibleProperties($aData, $this); |
43 | 43 | |
44 | - if(isset($aData['command'])) |
|
44 | + if (isset($aData['command'])) |
|
45 | 45 | { |
46 | - $this->command = new HealthCheckCommand((array)$aData['command']); |
|
46 | + $this->command = new HealthCheckCommand((array) $aData['command']); |
|
47 | 47 | } |
48 | 48 | } |
49 | 49 |
@@ -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 || |
@@ -104,12 +104,10 @@ discard block |
||
104 | 104 | if (is_array($mValueA) && is_array($mValueB)) |
105 | 105 | { |
106 | 106 | return $this->isArrayEqual($mValueA, $mValueB); |
107 | - } |
|
108 | - elseif (is_object($mValueA) && is_object($mValueB)) |
|
107 | + } elseif (is_object($mValueA) && is_object($mValueB)) |
|
109 | 108 | { |
110 | 109 | return $this->isArrayEqual(get_object_vars($mValueA), get_object_vars($mValueB)); |
111 | - } |
|
112 | - elseif ((is_scalar($mValueA) && is_scalar($mValueB)) || (is_null($mValueA) && is_null($mValueB))) |
|
110 | + } elseif ((is_scalar($mValueA) && is_scalar($mValueB)) || (is_null($mValueA) && is_null($mValueB))) |
|
113 | 111 | { |
114 | 112 | return $mValueA == $mValueB; |
115 | 113 | } |
@@ -142,8 +140,7 @@ discard block |
||
142 | 140 | { |
143 | 141 | return false; |
144 | 142 | } |
145 | - } |
|
146 | - else |
|
143 | + } else |
|
147 | 144 | { |
148 | 145 | foreach ($aValuesB as $_mValueB) |
149 | 146 | { |
@@ -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 |
@@ -151,8 +151,7 @@ |
||
151 | 151 | if ($this->oJobComparisonBusinessCase->hasSameJobType($_oJobEntityLocal, $_oJobEntityChronos)) |
152 | 152 | { |
153 | 153 | $_bHasUpdatedJob = $this->oJobRepositoryRemote->updateJob($_oJobEntityLocal); |
154 | - } |
|
155 | - else |
|
154 | + } else |
|
156 | 155 | { |
157 | 156 | $_bHasUpdatedJob = ( |
158 | 157 | $this->oJobRepositoryRemote->removeJob($_oJobEntityChronos->getKey()) |
@@ -52,8 +52,7 @@ discard block |
||
52 | 52 | if (empty($aEntityNames)) |
53 | 53 | { |
54 | 54 | $_aRemoteEntities = $this->oJobRepositoryRemote->getJobs(); |
55 | - } |
|
56 | - else |
|
55 | + } else |
|
57 | 56 | { |
58 | 57 | $_aRemoteEntities = []; |
59 | 58 | foreach ($aEntityNames as $_sJobName) |
@@ -85,8 +84,7 @@ discard block |
||
85 | 84 | 'Entity %s stored in local repository', |
86 | 85 | $oAppRemote->getKey() |
87 | 86 | )); |
88 | - } |
|
89 | - else { |
|
87 | + } else { |
|
90 | 88 | $this->oLogger->error(sprintf( |
91 | 89 | 'Failed to store %s in local repository', |
92 | 90 | $oAppRemote->getKey() |
@@ -116,8 +114,7 @@ discard block |
||
116 | 114 | 'Entity %s is updated in local repository', |
117 | 115 | $oAppRemote->getKey() |
118 | 116 | )); |
119 | - } |
|
120 | - else { |
|
117 | + } else { |
|
121 | 118 | $this->oLogger->error(sprintf( |
122 | 119 | 'Failed to update app %s in local repository', |
123 | 120 | $oAppRemote->getKey() |