Skip to content

Commit 725d508

Browse files
committed
Allow PHPUnit 5.0
Update Docs. Leave support for PHP 5.5
1 parent eb03263 commit 725d508

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ env:
2121
php:
2222
- 7.0
2323
- 5.6
24-
- 5.5
2524
- hhvm
2625

2726
matrix:

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Use [Composer](https://getcomposer.org/):
1919

2020
PHP-Mock integrates with the trait
2121
[`PHPMock`](http://php-mock.github.io/php-mock-phpunit/api/class-phpmock.phpunit.PHPMock.html)
22-
into your PHPUnit-4 test case. This trait extends the framework
22+
into your PHPUnit-4 or PHPUnit-5 test case. This trait extends the framework
2323
by the method
2424
[`getFunctionMock()`](http://php-mock.github.io/php-mock-phpunit/api/class-phpmock.phpunit.PHPMock.html#_getFunctionMock).
2525
With this method you can build a mock in the way you are used to build a

composer.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,12 @@
1717
"psr-4": {"phpmock\\phpunit\\": "classes/"}
1818
},
1919
"require": {
20+
<<<<<<< HEAD
21+
"php": ">=5.6",
22+
=======
2023
"php": ">=5.5",
21-
"phpunit/phpunit": "^4.0.0",
24+
>>>>>>> 7d3ba6c... Allow PHPUnit 5.0
25+
"phpunit/phpunit": "^4.0.0 || ^5.0.0",
2226
"php-mock/php-mock-integration": "^0.4"
2327
},
2428
"require-dev": {

0 commit comments

Comments
 (0)