@@ -133,6 +133,9 @@ |
||
133 | 133 | return !(count($arr) == count(array_unique($arr))); |
134 | 134 | } |
135 | 135 | |
136 | + /** |
|
137 | + * @param integer $iImmediateChildren |
|
138 | + */ |
|
136 | 139 | private function isDependencyCircular(MarathonAppEntity $oEntity, $iImmediateChildren, &$path=[]) |
137 | 140 | { |
138 | 141 | // Invariant: path will not have duplicates for acyclic dependency tree |
@@ -12,7 +12,6 @@ |
||
12 | 12 | |
13 | 13 | |
14 | 14 | use Chapi\BusinessCase\Comparison\JobComparisonInterface; |
15 | -use Chapi\Entity\JobEntityInterface; |
|
16 | 15 | use Chapi\Entity\Marathon\MarathonAppEntity; |
17 | 16 | use Chapi\Service\JobIndex\JobIndexServiceInterface; |
18 | 17 | use Chapi\Service\JobRepository\JobRepositoryInterface; |
@@ -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); |
@@ -83,8 +83,7 @@ |
||
83 | 83 | )); |
84 | 84 | return false; |
85 | 85 | } |
86 | - } |
|
87 | - catch(\Exception $e) |
|
86 | + } catch(\Exception $e) |
|
88 | 87 | { |
89 | 88 | $this->oLogger->error(sprintf( |
90 | 89 | 'Job %s cannot be added to remote : %s',$sAppId, $e->getMessage() |
@@ -98,8 +98,8 @@ |
||
98 | 98 | } |
99 | 99 | |
100 | 100 | /** |
101 | - * @param $sMethod |
|
102 | - * @param $sUrl |
|
101 | + * @param string $sMethod |
|
102 | + * @param string $sUrl |
|
103 | 103 | * @param $mData |
104 | 104 | * @return HttpGuzzlResponse |
105 | 105 | */ |
@@ -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 | ); |
@@ -59,48 +59,42 @@ |
||
59 | 59 | { |
60 | 60 | $_oResponse = $this->oGuzzelClient->request('GET', $sUrl, $_aRequestOptions); |
61 | 61 | return new HttpGuzzlResponse($_oResponse); |
62 | - } |
|
63 | - catch (ClientException $oException) // 400 level errors |
|
62 | + } catch (ClientException $oException) // 400 level errors |
|
64 | 63 | { |
65 | 64 | throw new HttpConnectionException( |
66 | 65 | sprintf('Client error: Calling %s returned %d', $this->oGuzzelClient->getConfig('base_uri') . $sUrl, $oException->getCode()), |
67 | 66 | $oException->getCode(), |
68 | 67 | $oException |
69 | 68 | ); |
70 | - } |
|
71 | - catch (ServerException $oException) // 500 level errors |
|
69 | + } catch (ServerException $oException) // 500 level errors |
|
72 | 70 | { |
73 | 71 | throw new HttpConnectionException( |
74 | 72 | sprintf('Server error: Calling %s returned %d', $this->oGuzzelClient->getConfig('base_uri') . $sUrl, $oException->getCode()), |
75 | 73 | $oException->getCode(), |
76 | 74 | $oException |
77 | 75 | ); |
78 | - } |
|
79 | - catch (TooManyRedirectsException $oException) // too many redirects to follow |
|
76 | + } catch (TooManyRedirectsException $oException) // too many redirects to follow |
|
80 | 77 | { |
81 | 78 | throw new HttpConnectionException( |
82 | 79 | sprintf('Request to %s failed due to too many redirects', $this->oGuzzelClient->getConfig('base_uri') . $sUrl), |
83 | 80 | HttpConnectionException::ERROR_CODE_TOO_MANY_REDIRECT_EXCEPTION, |
84 | 81 | $oException |
85 | 82 | ); |
86 | - } |
|
87 | - catch (ConnectException $oException) // networking error |
|
83 | + } catch (ConnectException $oException) // networking error |
|
88 | 84 | { |
89 | 85 | throw new HttpConnectionException( |
90 | 86 | sprintf('Cannot connect to %s due to some networking error', $this->oGuzzelClient->getConfig('base_uri') . $sUrl), |
91 | 87 | HttpConnectionException::ERROR_CODE_CONNECT_EXCEPTION, |
92 | 88 | $oException |
93 | 89 | ); |
94 | - } |
|
95 | - catch (RequestException $oException) // networking error (connection timeout, DNS errors, etc.) |
|
90 | + } catch (RequestException $oException) // networking error (connection timeout, DNS errors, etc.) |
|
96 | 91 | { |
97 | 92 | throw new HttpConnectionException( |
98 | 93 | sprintf('Cannot connect to %s due to networking error', $this->oGuzzelClient->getConfig('base_uri') . $sUrl), |
99 | 94 | HttpConnectionException::ERROR_CODE_REQUEST_EXCEPTION, |
100 | 95 | $oException |
101 | 96 | ); |
102 | - } |
|
103 | - catch (\Exception $oException) |
|
97 | + } catch (\Exception $oException) |
|
104 | 98 | { |
105 | 99 | throw new HttpConnectionException( |
106 | 100 | sprintf('Can\'t get response from "%s"', $this->oGuzzelClient->getConfig('base_uri') . $sUrl), |
@@ -12,8 +12,6 @@ |
||
12 | 12 | |
13 | 13 | use Chapi\Component\Cache\CacheInterface; |
14 | 14 | use Chapi\Component\RemoteClients\ApiClientInterface; |
15 | -use Chapi\Entity\Chronos\ChronosJobEntity; |
|
16 | -use Chapi\Entity\Marathon\MarathonAppEntity; |
|
17 | 15 | use Chapi\Service\JobValidator\JobValidatorServiceInterface; |
18 | 16 | use Psr\Log\LoggerInterface; |
19 | 17 | use Symfony\Component\Filesystem\Filesystem; |
@@ -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 | { |
@@ -13,9 +13,7 @@ |
||
13 | 13 | |
14 | 14 | use Chapi\Component\Comparison\DiffCompareInterface; |
15 | 15 | use Chapi\Entity\Chronos\ChronosJobEntity; |
16 | -use Chapi\Entity\Chronos\JobCollection; |
|
17 | 16 | use Chapi\Entity\JobEntityInterface; |
18 | -use Chapi\Entity\Marathon\AppEntity\PortDefinition; |
|
19 | 17 | use Chapi\Entity\Marathon\MarathonAppEntity; |
20 | 18 | use Chapi\Service\JobRepository\JobRepositoryInterface; |
21 | 19 |
@@ -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 |