Skip to content

Commit e2356f6

Browse files
committed
Upgrade to php-mock-1
1 parent 512da39 commit e2356f6

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

.travis.yml

+8
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ cache:
88

99
env:
1010
- PHPUNIT_VERSION=dev-master
11+
- PHPUNIT_VERSION=~5.0.0
1112
- PHPUNIT_VERSION=~4.8.0
1213
- PHPUNIT_VERSION=~4.7.0
1314
- PHPUNIT_VERSION=~4.6.0
@@ -29,6 +30,13 @@ matrix:
2930
allow_failures:
3031
- php: hhvm
3132
- env: PHPUNIT_VERSION=dev-master
33+
exclude:
34+
- env: PHPUNIT_VERSION=~5.0.0
35+
php: 5.5
36+
- env: PHPUNIT_VERSION=dev-master
37+
php: 5.5
38+
- env: PHPUNIT_VERSION=dev-master
39+
php: 5.6
3240

3341
install:
3442
- composer require phpunit/phpunit:${PHPUNIT_VERSION}

README.md

+3-7
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,15 @@ This package integrates the function mock library
77

88
Use [Composer](https://getcomposer.org/):
99

10-
```json
11-
{
12-
"require-dev": {
13-
"php-mock/php-mock-phpunit": "^0.3"
14-
}
15-
}
10+
```sh
11+
composer require php-mock/php-mock-phpunit
1612
```
1713

1814
# Usage
1915

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

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"require": {
2020
"php": ">=5.5",
2121
"phpunit/phpunit": "^4.0.0 || ^5.0.0",
22-
"php-mock/php-mock-integration": "^0.4"
22+
"php-mock/php-mock-integration": "^1"
2323
},
2424
"require-dev": {
2525
"mockery/mockery": "^0.9"

0 commit comments

Comments
 (0)