From 94f9de3856b5b51a3c9d12a3f7b65cc854f5e6d1 Mon Sep 17 00:00:00 2001
From: Helmut Hummel <info@helhum.io>
Date: Sun, 17 Jun 2018 12:53:30 +0200
Subject: [PATCH] Use upstream version of testing framework again

---
 .travis.yml   | 8 ++------
 appveyor.yml  | 4 ----
 composer.json | 6 +-----
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 33ac3e58..300a4cb1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,12 +27,9 @@ notifications:
 
 # This is executed for all stages
 before_install:
-  - mkdir -p .Build/external
-  - git clone https://github.com/helhum/TYPO3-testing-framework.git .Build/external/nimut-testing-framework -b typo3-93-compat
-  - composer config repositories.testing-framework vcs .Build/external/nimut-testing-framework
+  - if php -i | grep -q xdebug; then phpenv config-rm xdebug.ini; fi
 
 install:
-  - if php -i | grep -q xdebug; then phpenv config-rm xdebug.ini; fi
   - export COMPOSER_ROOT_VERSION=5.3.2
   - |
     composer require \
@@ -66,7 +63,6 @@ jobs:
       stage: test
       php: 7.2
       env: PHP Lint
-      before_install: skip
       install: skip
       before_script: skip
       script:
@@ -104,7 +100,6 @@ jobs:
     - stage: test
       php: 7.1
       env: Consistency checks
-      before_install: skip
       install: skip
       before_script: skip
       script:
@@ -118,6 +113,7 @@ jobs:
     - stage: sonar code scanner
       if: type = push AND branch IN (master, develop)
       php: 7.2
+      before_install: skip
       install: skip
       before_script:
       script:
diff --git a/appveyor.yml b/appveyor.yml
index dd951470..163033d0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -50,10 +50,6 @@ install:
   - IF NOT EXIST php-installed.txt type nul >> php-installed.txt
 
   - cd c:\t3c
-  - md .Build
-  - md .Build\external
-  - git clone https://github.com/helhum/TYPO3-testing-framework.git .Build/external/nimut-testing-framework -b typo3-93-compat
-  - composer config repositories.testing-framework vcs .Build/external/nimut-testing-framework
   - composer require "typo3/cms-backend=%TYPO3_VERSION%" "typo3/cms-core=%TYPO3_VERSION%" "typo3/cms-extbase=%TYPO3_VERSION%" "typo3/cms-extensionmanager=%TYPO3_VERSION%" "typo3/cms-fluid=%TYPO3_VERSION%" "typo3/cms-frontend=%TYPO3_VERSION%" "typo3/cms-install=%TYPO3_VERSION%" "typo3/cms-saltedpasswords=%TYPO3_VERSION%" "typo3/cms-scheduler=%TYPO3_VERSION%" --prefer-dist --no-progress --ansi
   - git checkout .
 
diff --git a/composer.json b/composer.json
index c4c21bf9..65eb9092 100644
--- a/composer.json
+++ b/composer.json
@@ -3,10 +3,6 @@
         "local": {
             "type": "path",
             "url": "Packages/*"
-        },
-        "testing-framework": {
-            "type": "vcs",
-            "url": "https://github.com/helhum/TYPO3-testing-framework.git"
         }
     },
     "name": "helhum/typo3-console",
@@ -57,7 +53,7 @@
         "typo3-console/php-server-command": "^0.2",
         "typo3-console/create-reference-command": "@dev",
         "symfony/filesystem": "^3.2",
-        "nimut/testing-framework": "dev-typo3-93-compat"
+        "nimut/testing-framework": "dev-master"
     },
     "conflict": {
         "typo3-ter/dbal": "*",