.travis.yml | fix versions, add postgres

.travis.yml

@@ -4,33 +4,41 @@ sudo: false
 
 env:
   global:
-    - COMPOSER_ROOT_VERSION=1.4.x-dev
+    - COMPOSER_ROOT_VERSION=1.x-dev
     - CORE_RELEASE=master
 
 matrix:
   fast_finish: true
   include:
     - php: 5.6
-      env: DB=MYSQL PHPUNIT_TEST=1 PHPCS_TEST=1
+      env: DB=MYSQL PHPUNIT_TEST=1
     - php: 7.0
       env: DB=MYSQL PHPUNIT_TEST=1
     - php: 7.1
-      env: DB=MYSQL PDO=1 PHPUNIT_COVERAGE_TEST=1
+      env: DB=MYSQL PHPUNIT_TEST=1
     - php: 7.2
+      env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1 PHPCS_TEST=1
+    - php: 7.2
+      env: DB=MYSQL PHPUNIT_TEST=1 PDO=1
+    - php: 7.3
+      env: DB=MYSQL PHPUNIT_TEST=1
+    - php: 7.3
       env: DB=PGSQL PHPUNIT_TEST=1
 
 before_script:
 # Init PHP
+  - printf "\n" | pecl install imagick
+  - composer self-update || true
   - phpenv rehash
-  - phpenv config-rm xdebug.ini
   - export PATH=~/.config/composer/vendor/bin:$PATH
   - echo 'memory_limit = 2G' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
 
 # Install composer dependencies
   - composer validate
   - composer install --prefer-dist
-  - composer require --prefer-dist --no-update silverstripe/recipe-core:4.4.x-dev silverstripe/versioned:1.3.x-dev
+  - composer require --prefer-dist --no-update silverstripe/recipe-core:4.x-dev silverstripe/versioned:1.x-dev
   - composer update --prefer-dist
+  - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.x-dev --prefer-dist; fi
   - if [[ $PHPCS_TEST ]]; then composer global require squizlabs/php_codesniffer:^3 --prefer-dist --no-interaction --no-progress --no-suggest -o; fi
 
 script:

phpunit.xml.dist

@@ -6,5 +6,13 @@ Requires PHPUnit ^5.7
 <phpunit bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true">
 	<testsuite name="Default">
 		<directory>tests/php</directory>
-    </testsuite>
+	</testsuite>
+	<filter>
+		<whitelist addUncoveredFilesFromWhitelist="true">
+			<directory suffix=".php">src/</directory>
+			<exclude>
+				<directory suffix=".php">tests/php/</directory>
+			</exclude>
+		</whitelist>
+	</filter>
 </phpunit>