@@ -347,6 +347,9 @@ |
||
| 347 | 347 | } |
| 348 | 348 | |
| 349 | 349 | |
| 350 | + /** |
|
| 351 | + * @param string $sJobFile |
|
| 352 | + */ |
|
| 350 | 353 | private function dumpFileWithGroup($sJobFile, JobEntityInterface $oJobEntity, $bAdd = true) |
| 351 | 354 | { |
| 352 | 355 | $_sGroupConfig = file_get_contents($sJobFile); |
@@ -10,7 +10,6 @@ |
||
| 10 | 10 | namespace Chapi\Service\JobValidator\PropertyValidator; |
| 11 | 11 | |
| 12 | 12 | |
| 13 | -use Chapi\Entity\Chronos\JobEntity; |
|
| 14 | 13 | use Chapi\Entity\JobEntityInterface; |
| 15 | 14 | use Chapi\Service\JobValidator\PropertyValidatorInterface; |
| 16 | 15 | |
@@ -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; |
@@ -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 | */ |
@@ -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; |
@@ -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 | |
@@ -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 | { |