File tree 3 files changed +6
-3
lines changed
3 files changed +6
-3
lines changed Original file line number Diff line number Diff line change 21
21
php :
22
22
- 7.0
23
23
- 5.6
24
- - 5.5
25
24
- hhvm
26
25
27
26
matrix :
Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ Use [Composer](https://getcomposer.org/):
19
19
20
20
PHP-Mock integrates with the trait
21
21
[ ` 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
23
23
by the method
24
24
[ ` getFunctionMock() ` ] ( http://php-mock.github.io/php-mock-phpunit/api/class-phpmock.phpunit.PHPMock.html#_getFunctionMock ) .
25
25
With this method you can build a mock in the way you are used to build a
Original file line number Diff line number Diff line change 17
17
"psr-4" : {"phpmock\\ phpunit\\ " : " classes/" }
18
18
},
19
19
"require" : {
20
+ <<<<<<< HEAD
21
+ "php" : " >=5.6" ,
22
+ =======
20
23
"php" : " >=5.5" ,
21
- "phpunit/phpunit" : " ^4.0.0" ,
24
+ >>>>>>> 7d3ba6c... Allow PHPUnit 5.0
25
+ "phpunit/phpunit" : " ^4.0.0 || ^5.0.0" ,
22
26
"php-mock/php-mock-integration" : " ^0.4"
23
27
},
24
28
"require-dev" : {
You can’t perform that action at this time.
0 commit comments