From b0ede23c29ff16729d801f4c7b3b371239959a0f Mon Sep 17 00:00:00 2001
From: Oliver Klee <github@oliverklee.de>
Date: Mon, 28 May 2018 15:08:56 +0200
Subject: [PATCH] [CLEANUP] Streamline .travis.yml and composer.json (#24)

Use latest changes from ext_scaffold.
---
 .travis.yml   | 22 ++++------------------
 composer.json | 18 +++++++++---------
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 465080c..fcb84c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,8 @@ env:
   global:
   - typo3DatabaseHost=localhost typo3DatabaseName=typo3 typo3DatabaseUsername=travis typo3DatabasePassword=''
   matrix:
-  - TYPO3_VERSION="^8.7" DEPENDENCIES=latest
-  - TYPO3_VERSION="^8.7" DEPENDENCIES=oldest
+  - TYPO3_VERSION="^8.7"
+  - TYPO3_VERSION="^8.7" DEPENDENCIES_PREFERENCE="--prefer-lowest"
 
 matrix:
   exclude:
@@ -26,22 +26,8 @@ before_install:
 - phpenv config-rm xdebug.ini
 
 install:
-- >
-  composer require-typo3-version "$TYPO3_VERSION";
-- >
-  echo;
-  if [ "$DEPENDENCIES" = "latest" ]; then
-    echo "Installing the latest dependencies";
-    composer update --with-dependencies --prefer-stable --prefer-dist;
-  else
-    echo "Installing the lowest dependencies";
-    composer update --with-dependencies --prefer-stable --prefer-dist --prefer-lowest;
-  fi;
-  composer show;
-- >
-  echo;
-  echo "Restoring the composer.json";
-  git checkout .;
+- composer require typo3/minimal "$TYPO3_VERSION" $DEPENDENCIES_PREFERENCE
+- git checkout .
 
 script:
 - >
diff --git a/composer.json b/composer.json
index e533b24..4d8fa7b 100644
--- a/composer.json
+++ b/composer.json
@@ -27,21 +27,24 @@
     },
     "require": {
         "php": "~7.0.0 || ~7.1.0 || ~7.2.0",
-        "typo3/cms-core": "^7.6.23 || ^8.7.9",
-        "typo3/cms-fluid": "^7.6.23 || ^8.7.9",
-        "typo3/cms-frontend": "^7.6.23 || ^8.7.9"
+        "typo3/cms-core": "^7.6.23 || ^8.7.10",
+        "typo3/cms-fluid": "^7.6.23 || ^8.7.10",
+        "typo3/cms-frontend": "^7.6.23 || ^8.7.10"
     },
     "require-dev": {
-        "typo3/cms-fluid-styled-content": "^7.6.23 || ^8.7.9",
+        "typo3/cms-fluid-styled-content": "^7.6.23 || ^8.7.10",
         "helhum/typo3-composer-setup": "^0.5.1",
         "helmich/typo3-typoscript-lint": "^1.4.4",
-        "nimut/testing-framework": "^3.0.0",
+        "nimut/testing-framework": "^3.0",
         "roave/security-advisories": "dev-master"
     },
     "replace": {
         "tea": "self.version",
         "typo3-ter/tea": "self.version"
     },
+    "conflict": {
+        "typo3/cms-composer-installers": "<1.4.6"
+    },
     "autoload": {
         "psr-4": {
             "OliverKlee\\Tea\\": "Classes/"
@@ -84,10 +87,6 @@
         "ci": [
             "@ci:static"
         ],
-        "require-typo3-version": [
-            "@php -r '$conf=json_decode(file_get_contents(__DIR__.\"/composer.json\"),true);$conf[\"require\"][\"typo3/cms-core\"]=$_SERVER[\"argv\"][1];file_put_contents(__DIR__.\"/composer.json\",json_encode($conf,JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT).chr(10));'",
-            "@composer install"
-        ],
         "link-extension": [
             "@php -r 'is_dir($extFolder=__DIR__.\"/.Build/public/typo3conf/ext/\") || mkdir($extFolder, 0777, true);'",
             "@php -r 'file_exists($extFolder=__DIR__.\"/.Build/public/typo3conf/ext/tea\") || symlink(__DIR__,$extFolder);'"
@@ -101,6 +100,7 @@
             "dev-master": "2.0.x-dev"
         },
         "typo3/cms": {
+            "extension-key": "tea",
             "cms-package-dir": "{$vendor-dir}/typo3/cms",
             "web-dir": ".Build/public"
         }