From 2146fb2cdda732f7e46fc019b77b1e02c523efef Mon Sep 17 00:00:00 2001 From: Oliver Klee Date: Wed, 24 Jan 2018 15:36:29 +0100 Subject: [PATCH] [TASK] Install typo3/cms on Travis (#3) Also drop the composer validation CI step and clean up the branch alias. --- .travis.yml | 16 ++++++++++------ composer.json | 19 ++++++++++--------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index d1ea6ab..c08a02e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,13 @@ php: - 7.0 - 7.1 +env: +- TYPO3_VERSION="^7.6" +- TYPO3_VERSION="^8.7" + +matrix: + exclude: + cache: directories: - .Build/vendor @@ -15,14 +22,11 @@ before_install: - phpenv config-rm xdebug.ini install: -- composer install +- composer require-typo3-version "$TYPO3_VERSION" +- git checkout . +- export TYPO3_PATH_ROOT=$PWD/.Build/public script: -- > - echo; - echo "Validating the composer.json"; - composer validate --no-check-all --no-check-lock --strict; - - > echo; echo "Linting all PHP files"; diff --git a/composer.json b/composer.json index 4361b16..919c82f 100644 --- a/composer.json +++ b/composer.json @@ -27,11 +27,13 @@ }, "require": { "php": "~7.0.0 || ~7.1.0 || ~7.2.0", - "typo3/cms-core": "^7.6 || ^8.7" + "typo3/cms-core": "^7.6 || ^8.7", + "typo3/cms-fluid": "^7.6 || ^8.7", + "typo3/cms-frontend": "^7.6 || ^8.7" }, "require-dev": { - "namelesscoder/typo3-repository-client": "^1.2.0", "nimut/testing-framework": "^2.0.0", + "helhum/typo3-composer-setup": "^0.5.1", "phpunit/phpunit": "^5.7.0", "mikey179/vfsStream": "^1.6.0", "roave/security-advisories": "dev-master" @@ -57,22 +59,21 @@ } ], "config": { - "vendor-dir": ".Build/vendor", - "bin-dir": ".Build/bin" + "vendor-dir": ".Build/vendor" }, "scripts": { - "post-autoload-dump": [ - "mkdir -p .Build/Web/typo3conf/ext/", - "[ -L .Build/Web/typo3conf/ext/tea ]|| ln -snvf ../../../../. .Build/Web/typo3conf/ext/tea" + "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" ] }, "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "2.0.x-dev" }, "typo3/cms": { "cms-package-dir": "{$vendor-dir}/typo3/cms", - "web-dir": ".Build/Web" + "web-dir": ".Build/public" } } }