new travis and scrut configs

.scrutinizer.yml

@@ -1,37 +1,15 @@
 inherit: true
 
-#Copied from https://www.adayinthelifeof.nl/2013/11/20/external-code-coverage-with-travis-scrutinizer/
-tools:
-    external_code_coverage:
-      timeout: 600
-    php_code_sniffer:
-      config:
-        standard: PSR2
-    php_cs_fixer:
-      extensions:
-        # Default:
-        - php
-      fixers: []
-      enabled: false
-      filter:
-            paths: [tests/*,src/*]
-            excluded_paths: []
-coding_style:
-  php:
-    indentation:
-      general:
-        use_tabs: false
-
-checks:
-    php:
-        code_rating: true
-        duplication: true
-
 build:
   nodes:
     analysis:
       tests:
         override: [php-scrutinizer-run]
 
+checks:
+  php:
+    code_rating: true
+    duplication: true
+
 filter:
-    paths: [tests/*,src/*]
+  paths: [src/*, tests/*]

.travis.yml

@@ -1,34 +1,39 @@
 language: php
 
+services:
+  - mysql
+  - postgresql
+
 env:
   global:
-    - COMPOSER_ROOT_VERSION=4.0.x-dev
-    - CODECOV_TOKEN=
-    - SCRUT_TOKEN=
+    - TRAVIS_NODE_VERSION="10"
 
 matrix:
   include:
+    - php: 5.6
+      env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_TEST=1
     - php: 7.0
-      env: DB=MYSQL PHPUNIT_TEST=1 PHPCS_TEST=1
+      env: DB=PGSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_TEST=1
     - php: 7.1
-      env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1
-    - php: 5.6
-      env: DB=MYSQL PHPUNIT_TEST=1
+      env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_TEST=1 PHPCS_TEST=1
+    - php: 7.2
+      env: DB=PGSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_TEST=1
+    - php: 7.3
+      env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_COVERAGE_TEST=1
 
 before_script:
-  # Init PHP
   - phpenv rehash
   - phpenv config-rm xdebug.ini
-  - echo 'memory_limit = 2048M' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
 
-  # Install composer dependencies
-  - composer require --prefer-dist --no-update silverstripe-themes/simple:~3.2
-  - composer update --no-suggest --prefer-dist
+  - composer validate
+  - composer require --no-update silverstripe/recipe-cms:"$RECIPE_VERSION"
+  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.1.x-dev; fi
+  - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
 
 script:
   - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi
-  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml && wget https://scrutinizer-ci.com/ocular.phar; fi
-  - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs src/ tests/; fi
+  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml; fi
+  - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs src/ tests/ *.php; fi
 
 after_success:
-  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml -t $CODECOV_TOKEN && travis_retry php ocular.phar code-coverage:upload --format=php-clover --access-token=$SCRUT_TOKEN coverage.xml; fi
+  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml -F php; fi

phpunit.xml.dist

@@ -1,6 +1,6 @@
 <phpunit bootstrap="vendor/silverstripe/cms/tests/bootstrap.php" colors="true">
     <testsuite name="silverstripe-elemental-blocks">
-        <directory>tests</directory>
+        <directory>tests/</directory>
     </testsuite>
 
     <filter>
@@ -11,4 +11,4 @@
             </exclude>
         </whitelist>
     </filter>
-</phpunit>
+</phpunit>