Skip to content

Commit

Permalink
Merge pull request #12 from digipolisgent/feature/split-provisioners
Browse files Browse the repository at this point in the history
Split provisioners.
  • Loading branch information
Jelle-S authored Sep 12, 2018
2 parents 836d67a + e0a523b commit 5feb55e
Show file tree
Hide file tree
Showing 23 changed files with 2,584 additions and 976 deletions.
8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@ language: php

php:
- 7.1
- 7.2

before_install:
- echo "memory_limit=2G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini

install:
- composer self-update
- composer install
- COMPOSER_MEMORY_LIMIT=-1 travis_retry composer install --prefer-dist --no-interaction

before_script:
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
Expand All @@ -16,4 +20,4 @@ script:
- vendor/bin/phpunit --disallow-test-output --strict-coverage -d error_reporting=-1 --coverage-clover=build/logs/clover.xml Tests

after_script:
- ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
- ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
5 changes: 0 additions & 5 deletions FieldType/DatabaseHostFieldType.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,8 @@
namespace DigipolisGent\Domainator9k\SockBundle\FieldType;

use DigipolisGent\Domainator9k\CoreBundle\Entity\ApplicationEnvironment;
use DigipolisGent\Domainator9k\CoreBundle\Entity\VirtualServer;
use DigipolisGent\SettingBundle\FieldType\BooleanFieldType;
use DigipolisGent\SettingBundle\FieldType\StringFieldType;
use DigipolisGent\SettingBundle\Service\DataValueService;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Component\Validator\Constraints\Callback;
use Symfony\Component\Validator\Context\ExecutionContextInterface;

/**
* Class ManageSockFieldType
Expand Down
1 change: 0 additions & 1 deletion FieldType/SshKeyChoiceFieldType.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

namespace DigipolisGent\Domainator9k\SockBundle\FieldType;

use DigipolisGent\Domainator9k\CiTypes\JenkinsBundle\Entity\GroovyScript;
use DigipolisGent\Domainator9k\CoreBundle\Entity\ApplicationEnvironment;
use DigipolisGent\Domainator9k\SockBundle\Service\ApiService;
use DigipolisGent\SettingBundle\FieldType\AbstractFieldType;
Expand Down
22 changes: 22 additions & 0 deletions Provisioner/AbstractSockProvisioner.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php

namespace DigipolisGent\Domainator9k\SockBundle\Provisioner;

use DigipolisGent\Domainator9k\CoreBundle\Provisioner\AbstractProvisioner;

/**
* Class AbstractSockProvisioner
*
* @package DigipolisGent\Domainator9k\SockBundle\Provisioner
*/
abstract class AbstractSockProvisioner extends AbstractProvisioner
{
protected function ensurePollingProvisioner()
{
$provisioners = $this->task->getProvisioners();
if ($provisioners && !in_array(PollingProvisioner::class, $provisioners)) {
$provisioners[] = PollingProvisioner::class;
$this->task->setProvisioners($provisioners);
}
}
}
Loading

0 comments on commit 5feb55e

Please sign in to comment.