From d338140030122524c3a5ce78d874ac801dbb1f34 Mon Sep 17 00:00:00 2001
From: Quentin Renard <quentin@area17.com>
Date: Tue, 26 May 2020 15:52:03 -0400
Subject: [PATCH] Try only switching the PHPUnit printer through CLI to avoid
 duplicating the whole configuration file

---
 .travis.yml     |  2 +-
 phpunit-7.1.xml | 66 -------------------------------------------------
 2 files changed, 1 insertion(+), 67 deletions(-)
 delete mode 100644 phpunit-7.1.xml

diff --git a/.travis.yml b/.travis.yml
index d670f984e..5cd064b18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ script:
   - vendor/bin/php-cs-fixer --dry-run --config=./.php_cs.travis fix src/ tests/  || travis_terminate 1;
   - |
     if [[ "$TRAVIS_PHP_VERSION" == '7.1' ]]; then
-      vendor/bin/phpunit --configuration phpunit-7.1.xml
+      vendor/bin/phpunit --printer PHPUnit\TextUI\ResultPrinter
     else
       vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
     fi
diff --git a/phpunit-7.1.xml b/phpunit-7.1.xml
deleted file mode 100644
index 9da3b5121..000000000
--- a/phpunit-7.1.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="tests/bootstrap.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
-         verbose="true"
->
-  <listeners>
-    <listener class="NunoMaduro\Collision\Adapters\Phpunit\Listener" />
-  </listeners>
-  <testsuites>
-    <testsuite name="Twill Test Suites">
-      <directory suffix="Test.php">./tests</directory>
-    </testsuite>
-  </testsuites>
-  <filter>
-    <whitelist processUncoveredFilesFromWhitelist="false">
-      <directory suffix=".php">./src</directory>
-      <exclude>
-        <directory suffix=".blade.php">./tests</directory>
-      </exclude>
-    </whitelist>
-  </filter>
-  <logging>
-    <log type="coverage-html" target="tests/coverage/" lowUpperBound="35" highLowerBound="70"/>
-    <log type="coverage-clover" target="tests/coverage/coverage-clover.xml" lowUpperBound="35" highLowerBound="70"/>
-    <log type="coverage-text" target="php://stdout" showOnlySummary="true" showUncoveredFiles="false"/>
-  </logging>
-  <php>
-    <env name="APP_KEY" value="base64:DV8kQN5a+4MwAIQ5uk1WNafxO+/Efab0K20uVMDJ2UE="/>
-    <env name="APP_ENV" value="testing"/>
-    <env name="APP_URL" value="http://twill.test"/>
-    <env name="TELESCOPE_ENABLED" value="false"/>
-    <env name="BCRYPT_ROUNDS" value="4"/>
-    <env name="CACHE_DRIVER" value="array"/>
-    <env name="SESSION_DRIVER" value="array"/>
-    <env name="QUEUE_DRIVER" value="sync"/>
-    <env name="MAIL_DRIVER" value="array"/>
-    <env name="DB_CONNECTION" value="sqlite"/>
-    <env name="DB_DATABASE" value=":memory:"/>
-    <env name="LOG_CHANNEL" value="single"/>
-    <env name="MEDIA_LIBRARY_IMAGE_SERVICE" value="A17\Twill\Services\MediaLibrary\Glide"/>
-    <env name="MEDIA_LIBRARY_LOCAL_PATH" value="media-library"/>
-    <env name="MEDIA_LIBRARY_ENDPOINT_TYPE" value="local"/>
-    <env name="FILE_LIBRARY_FILE_SERVICE" value="A17\Twill\Services\MediaLibrary\Glide"/>
-    <env name="FILE_LIBRARY_LOCAL_PATH" value="file-library"/>
-    <env name="FILE_LIBRARY_ENDPOINT_TYPE" value="local"/>
-    <env name="IMGIX_SOURCE_HOST" value=""/>
-    <env name="IMGIX_USE_HTTPS" value=""/>
-    <env name="IMGIX_USE_SIGNED_URLS" value=""/>
-    <env name="IMGIX_SIGN_KEY" value=""/>
-    <env name="GLIDE_SOURCE" value="storage/app/public/media-library"/>
-    <env name="GLIDE_CACHE" value="storage/app/twill/cache"/>
-    <env name="GLIDE_CACHE_PATH_PREFIX" value="glide_cache"/>
-    <env name="GLIDE_BASE_URL" value="http://twill.test"/>
-    <env name="GLIDE_BASE_PATH" value="storage/media-library"/>
-    <env name="GLIDE_USE_SIGNED_URLS" value="false"/>
-    <env name="GLIDE_SIGN_KEY" value=""/>
-  </php>
-</phpunit>