From ceba6c14069e06eeb3659e3a159fd632eba213be Mon Sep 17 00:00:00 2001 From: Dylan Wagstaff Date: Mon, 26 Feb 2018 12:45:25 +1300 Subject: [PATCH] FIX Update requirements & travis config to be consistent with acutal requirements --- .travis.yml | 3 +-- composer.json | 8 +++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index adfb908..34286c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,14 +22,13 @@ before_script: # Install composer dependencies - composer validate - - composer require --no-update silverstripe/installer 4.0.x-dev - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql 2.0.x-dev; fi - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile script: - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi - if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml; fi - - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs src/ tests/ *.php; fi + - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs src/ tests/; fi after_success: - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi diff --git a/composer.json b/composer.json index bdf12a1..d2d2e2b 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,6 @@ { "name": "silverstripe/externallinks", - "description": - "Adds tracking of broken external links to the SilverStripe CMS", + "description": "Adds tracking of broken external links to the SilverStripe CMS", "type": "silverstripe-vendormodule", "keywords": ["silverstripe", "broken", "links", "href"], "license": "BSD-3-Clause", @@ -12,15 +11,14 @@ } ], "require": { - "silverstripe/recipe-cms": "^1.0" + "silverstripe/cms": "^4.0" }, "require-dev": { "phpunit/PHPUnit": "^5.7", "squizlabs/php_codesniffer": "^3.0" }, "suggest": { - "silverstripe/queuedjobs": - "Provides a more efficient method of generating/updating the report" + "silverstripe/queuedjobs": "Provides a more efficient method of generating/updating the report" }, "autoload": { "psr-4": {