Clean up travis

.travis.yml

@@ -51,8 +51,8 @@ before_script:
 
 # Install composer dependencies
   - composer validate
-  - if [[ (! $BEHAT_TEST) && (! $ASSETADMIN_TEST) ]]; then composer require --prefer-dist --no-update silverstripe/recipe-core:4.x-dev silverstripe/assets:2.x-dev --prefer-dist ; fi
-  - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:3.x-dev --prefer-dist --no-update; fi
+  - if [[ (! $BEHAT_TEST) && (! $ASSETADMIN_TEST) ]]; then composer require --prefer-dist --no-update silverstripe/recipe-core:4.x-dev silverstripe/assets:1.x-dev --prefer-dist ; fi
+  - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.x-dev --prefer-dist --no-update; fi
   - if [[ $ASSETADMIN_TEST ]]; then composer require silverstripe/recipe-cms $RECIPE_CMS_VERSION --prefer-source --no-update ; fi
   - if [[ $BEHAT_TEST ]]; then composer require silverstripe/recipe-testing:^2 silverstripe/recipe-cms:$RECIPE_CMS_VERSION silverstripe/frameworktest:dev-master --prefer-source --no-update ; fi
   - composer update
@@ -64,7 +64,7 @@ before_script:
 
 
 script:
-  - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi
+  - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit '' flush=1; fi
   - if [[ $PHPCS_TEST ]]; then composer run-script lint; fi
   - if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml -vvv; fi
   - if [[ $BEHAT_TEST ]]; then vendor/bin/behat @asset-admin --config vendor/silverstripe/asset-admin/behat.yml ; fi