Merge pull request #151 from dhensby/pulls/phpunit-bump

Bump PHPUnit dep

.travis.yml

@@ -14,11 +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
 
 

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",

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();