[WIP][TASK] Require typo3/cms-core instead of typo3/cms

alexanderschnitzler · Oct 12, 2019 · fb9db2a · fb9db2a
1 parent d02418f
commit fb9db2a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/.Build/composer.json b/.Build/composer.json
@@ -5,8 +5,8 @@
         "GPL-2.0+"
     ],
     "require-dev": {
-        "php": "~7.0 || ~7.1",
-        "typo3/testing-framework": "^1.1.0",
+        "php": "^7.0 <7.4",
+        "typo3/testing-framework": "^2.0",
         "phpunit/phpcov": "^4.0.0",
         "codeclimate/php-test-reporter": "^0.4.4"
     },

diff --git a/.travis.yml b/.travis.yml
@@ -1,17 +1,12 @@
 language: php
 
 php:
-  - 7.0
-  - 7.1
+  - "7.0"
+  - "7.1"
 
 env:
   matrix:
-    - TYPO3_VERSION=8.7.0
-    - TYPO3_VERSION=8.7.1
-    - TYPO3_VERSION=8.7.2
-    - TYPO3_VERSION=8.7.3
-    - TYPO3_VERSION=8.7.4
-    - TYPO3_VERSION=8.7.*
+    - TYPO3_VERSION=^8.7.0
 
 sudo: false
 
@@ -37,11 +32,17 @@ before_script:
   - cd .Build
   - mkdir -p build/logs/
   - mkdir -p coverage/
-  - composer require typo3/cms=$TYPO3_VERSION
+  - composer require typo3/cms-core=$TYPO3_VERSION
+  - composer require typo3/cms-version=$TYPO3_VERSION
+  - composer require typo3/cms-workspaces=$TYPO3_VERSION
   - export TYPO3_PATH_WEB=$TRAVIS_BUILD_DIR/.Build/web;
   - cd $TRAVIS_BUILD_DIR
 
 script:
+  - >
+    echo;
+    echo "Symlink vendor folder"
+    ln -sr .Build/vendor .Build/web/vendor
   - >
     echo;
     echo "Running php lint";
@@ -60,7 +61,8 @@ script:
     export PROCESSOR="ImageMagick";
     export PROCESSOR_PATH="/usr/bin/";
     export PROCESSOR_PATH_LZW="/usr/bin/";
-    php .Build/bin/phpunit --process-isolation --colors --coverage-php=.Build/coverage/functional.cov --configuration .Build/FunctionalTests.xml;
+    export TYPO3_ROOT_PATH="web/";
+    php .Build/bin/phpunit --process-isolation --colors --configuration .Build/vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTests.xml .Build/web/typo3conf/ext/fluid_styled_responsive_images/Tests/Functional/;
 
 after_script:
   - cd .Build

diff --git a/composer.json b/composer.json
@@ -17,8 +17,8 @@
         }
     ],
     "require": {
-        "php": "~7.0 || ~7.1",
-        "typo3/cms": "^8.7.0"
+        "php": "^7.0 <7.4",
+        "typo3/cms-core": "^8.7.0"
     },
     "replace": {
         "fluid_styled_responsive_images": "self.version",