Skip to content

Commit eb34a44

Browse files
carusogabrieljaapio
authored andcommitted
Update to PHP 7 and PHPUnit 6
1 parent 81b006f commit eb34a44

File tree

3 files changed

+25
-13
lines changed

3 files changed

+25
-13
lines changed

.travis.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
language: php
22
dist: trusty
33
php:
4-
- 5.5
5-
- 5.6
64
- 7.0
75
- 7.1
8-
- hhvm
96
- nightly
107

118
matrix:
129
allow_failures:
1310
- php:
14-
- hhvm
1511
- nightly
1612

1713
cache:
@@ -27,7 +23,7 @@ before_script:
2723
- composer install --no-interaction
2824

2925
after_script:
30-
- if [ $TRAVIS_PHP_VERSION = '5.6' ]; then wget https://scrutinizer-ci.com/ocular.phar; php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
26+
- if [ $TRAVIS_PHP_VERSION = '7.0' ]; then wget https://scrutinizer-ci.com/ocular.phar; php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
3127

3228
notifications:
3329
irc: "irc.freenode.org#phpdocumentor"

composer.json

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,30 @@
11
{
2-
"name": "phpdocumentor/type-resolver",
3-
"type": "library",
2+
"name": "phpdocumentor/type-resolver",
3+
"type": "library",
44
"license": "MIT",
55
"authors": [
6-
{"name": "Mike van Riel", "email": "[email protected]"}
6+
{
7+
"name": "Mike van Riel",
8+
"email": "[email protected]"
9+
}
710
],
811
"require": {
9-
"php": "^5.5 || ^7.0",
12+
"php": "^7.0",
1013
"phpdocumentor/reflection-common": "^1.0"
1114
},
1215
"autoload": {
13-
"psr-4": {"phpDocumentor\\Reflection\\": ["src/"]}
16+
"psr-4": {
17+
"phpDocumentor\\Reflection\\": "src"
18+
}
1419
},
1520
"autoload-dev": {
16-
"psr-4": {"phpDocumentor\\Reflection\\": ["tests/unit"]}
21+
"psr-4": {
22+
"phpDocumentor\\Reflection\\": "tests/unit"
23+
}
1724
},
1825
"require-dev": {
19-
"phpunit/phpunit": "^5.7 ||^4.8.35",
20-
"mockery/mockery": "^0.9.4"
26+
"phpunit/phpunit": "^6.4",
27+
"mockery/mockery": "^1.0"
2128
},
2229
"extra": {
2330
"branch-alias": {

tests/unit/TypeResolverTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,15 @@
2929
*/
3030
class TypeResolverTest extends TestCase
3131
{
32+
33+
/**
34+
* Call Mockery::close after each test.
35+
*/
36+
public function tearDown()
37+
{
38+
m::close();
39+
}
40+
3241
/**
3342
* @param string $keyword
3443
* @param string $expectedClass

0 commit comments

Comments
 (0)