Skip to content

Commit e1ba583

Browse files
authored
Merge pull request #10 from rstgroup/improve-testing
Fixed and improved testing, added php 7.1 and 7.2
2 parents cbf5251 + 27bf50c commit e1ba583

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

.travis.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,24 @@ language: php
33
php:
44
- 5.6
55
- 7.0
6+
- 7.1
7+
- 7.2
68
- nightly
79
- hhvm
810

11+
env:
12+
- DEPS=lowest
13+
- DEPS=latest
14+
915
matrix:
1016
allow_failures:
1117
- php: nightly
1218
- php: hhvm
1319

1420
before_script:
15-
- travis_retry composer self-update
16-
- travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source
21+
- phpenv config-rm xdebug.ini
22+
- if [[ $DEPS == 'lowest' ]]; then composer update --prefer-stable --no-interaction --prefer-lowest ; fi
23+
- if [[ $DEPS == 'latest' ]]; then composer update --prefer-stable --no-interaction ; fi
1724

1825
script:
19-
- phpunit
26+
- vendor/bin/phpunit

composer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
},
1010
"require-dev": {
1111
"league/tactician-doctrine": "^1.0",
12-
"phpunit/phpunit": "^4.8"
12+
"phpunit/phpunit": "^4.8.36",
13+
"sebastian/comparator": "^1.2.4",
14+
"doctrine/orm": "^2.5"
1315
},
1416
"keywords": [
1517
"zend framework",

test/TacticianModuleTest/Factory/Plugin/DoctrineTransactionFactoryTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ public function testCreateService()
3535
],
3636
]));
3737

38-
$doctrineStub = $this->getMockBuilder('Doctrine\ORM\EntityManager')
39-
->disableOriginalConstructor()
38+
$doctrineStub = $this->getMockBuilder(\Doctrine\ORM\EntityManagerInterface::class)
4039
->getMock();
4140

4241
$this->serviceLocator->expects($this->at(1))

0 commit comments

Comments
 (0)