Merge branch 'develop'

Merge details:

(e0a523b) Move the polling type constant to the provisionsers themselves.
by Jelle Sebreghts on Wed Sep 12 16:46:33 2018

(b6e03a6) Fix use statements.
by Jelle Sebreghts on Tue Sep 11 15:56:02 2018

(5940669) Codeclimate fixes.
by Jelle Sebreghts on Mon Sep 10 15:03:23 2018

(617b6f8) Try to fix travis, add PHP 7.2 to tests.
by Jelle Sebreghts on Mon Sep 10 14:55:53 2018

(d6865e2) Split provisioners.
by Jelle Sebreghts on Mon Sep 10 14:36:04 2018

.travis.yml

@@ -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
@@ -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

FieldType/DatabaseHostFieldType.php

@@ -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

FieldType/SshKeyChoiceFieldType.php

@@ -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;

Provisioner/AbstractSockProvisioner.php

@@ -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);
+        }
+    }
+}