From 187fd50a27d3e412f40c5d93406f30403cf8667f Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Fri, 24 Mar 2017 14:19:56 +1300 Subject: [PATCH 1/4] Bump PHPUnit dep --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 26d355e..765a14a 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=5.3.3", - "phpunit/phpunit": "~4.8", + "phpunit/phpunit": "^4.8 || ^5.7", "behat/behat": "~2.5.0", "behat/mink": "~1.6.0", "behat/mink-extension": "~1.3.0", From 55fd4a81af9cd531f139c6e72e5dfba2cd7bb20e Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Fri, 24 Mar 2017 15:00:41 +1300 Subject: [PATCH 2/4] Avoid deprecated PHPUnit APIs --- tests/Context/SilverStripeContextTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Context/SilverStripeContextTest.php b/tests/Context/SilverStripeContextTest.php index aca8aa0..73a1dd5 100644 --- a/tests/Context/SilverStripeContextTest.php +++ b/tests/Context/SilverStripeContextTest.php @@ -64,8 +64,8 @@ class SilverStripeContextTest extends \PHPUnit_Framework_TestCase ->getMock(); $sessionMock = $this->getMockBuilder('Behat\Mink\Session') ->setConstructorArgs(array( - $this->getMock('Behat\Mink\Driver\DriverInterface'), - $this->getMock('Behat\Mink\Selector\SelectorsHandler') + $this->getMockBuilder('Behat\Mink\Driver\DriverInterface')->getMock(), + $this->getMockBuilder('Behat\Mink\Selector\SelectorsHandler')->getMock() )) ->setMethods(array('getPage')) ->getMock(); From f856e63706c42d16334ff1c00932b90781a22962 Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Fri, 24 Mar 2017 15:01:56 +1300 Subject: [PATCH 3/4] Validate composer schema --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7a94b56..4ba26ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ matrix: env: PHPUNIT_TEST=1 before_script: + - composer validate - composer install --dev --prefer-dist - composer require silverstripe/config:1.0.x-dev silverstripe/framework:4.0.x-dev --prefer-dist - pyrus install pear/PHP_CodeSniffer From fa017a213aade7f6222bf509a514695cbe1ed689 Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Fri, 24 Mar 2017 15:06:20 +1300 Subject: [PATCH 4/4] Test PHP 7 --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4ba26ac..911a759 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,12 +14,16 @@ matrix: include: - php: 5.6 env: PHPUNIT_TEST=1 + - php: 7.0 + env: PHPUNIT_TEST=1 + - php: 7.1 + env: PHPUNIT_TEST=1 before_script: - composer validate - composer install --dev --prefer-dist - composer require silverstripe/config:1.0.x-dev silverstripe/framework:4.0.x-dev --prefer-dist - - pyrus install pear/PHP_CodeSniffer + - "if [ \"$PHPCS_TEST\" = \"1\" ]; then pyrus install pear/PHP_CodeSniffer; fi" - phpenv rehash