Skip to content

Commit 3fae3c0

Browse files
authored
Merge pull request #113 from gabriel-caruso/phpunit-6
Update to PHPUnit 6 and Mockery 1
2 parents 28aa0be + 1a0709b commit 3fae3c0

16 files changed

+408
-142
lines changed

composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"license": "MIT",
77
"autoload": {
88
"psr-4": {
9-
"phpDocumentor\\": ["src/phpDocumentor"]
9+
"phpDocumentor\\": "src/phpDocumentor"
1010
}
1111
},
1212
"autoload-dev": {
@@ -19,17 +19,17 @@
1919
}
2020
},
2121
"require": {
22-
"php": "^7.0",
23-
"psr/log": "~1.0",
24-
"nikic/php-parser": "^3.0",
22+
"php": "^7.0",
23+
"psr/log": "~1.0",
24+
"nikic/php-parser": "^3.0",
2525
"phpdocumentor/reflection-docblock": "^4.1",
26-
"phpdocumentor/reflection-common": "^1.0@dev"
26+
"phpdocumentor/reflection-common": "^1.0@dev"
2727
},
2828
"require-dev": {
29-
"mockery/mockery": "~0.8",
29+
"mockery/mockery": "~1.0",
3030
"mikey179/vfsStream": "~1.2",
3131
"squizlabs/php_codesniffer": "^2.5",
32-
"phpunit/phpunit": "^5.7"
32+
"phpunit/phpunit": "^6.4"
3333
},
3434
"extra": {
3535
"branch-alias": {

0 commit comments

Comments
 (0)