Merge pull request #10 from rstgroup/improve-testing

Fixed and improved testing, added php 7.1 and 7.2
mikemix · Mar 1, 2018 · e1ba583 · e1ba583
2 parents cbf5251 + 27bf50c
commit e1ba583
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,17 +3,24 @@ language: php
 php:
   - 5.6
   - 7.0
+  - 7.1
+  - 7.2
   - nightly
   - hhvm
 
+env:
+  - DEPS=lowest
+  - DEPS=latest
+
 matrix:
   allow_failures:
     - php: nightly
     - php: hhvm
 
 before_script:
-  - travis_retry composer self-update
-  - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source
+  - phpenv config-rm xdebug.ini
+  - if [[ $DEPS == 'lowest' ]]; then composer update --prefer-stable --no-interaction --prefer-lowest ; fi
+  - if [[ $DEPS == 'latest' ]]; then composer update --prefer-stable --no-interaction ; fi
 
 script:
-  - phpunit
+  - vendor/bin/phpunit
diff --git a/composer.json b/composer.json
@@ -9,7 +9,9 @@
   },
   "require-dev": {
     "league/tactician-doctrine": "^1.0",
-    "phpunit/phpunit": "^4.8"
+    "phpunit/phpunit": "^4.8.36",
+    "sebastian/comparator": "^1.2.4",
+    "doctrine/orm": "^2.5"
   },
   "keywords": [
     "zend framework",

diff --git a/test/TacticianModuleTest/Factory/Plugin/DoctrineTransactionFactoryTest.php b/test/TacticianModuleTest/Factory/Plugin/DoctrineTransactionFactoryTest.php
@@ -35,8 +35,7 @@ public function testCreateService()
                 ],
         ]));
 
-        $doctrineStub = $this->getMockBuilder('Doctrine\ORM\EntityManager')
-            ->disableOriginalConstructor()
+        $doctrineStub = $this->getMockBuilder(\Doctrine\ORM\EntityManagerInterface::class)
             ->getMock();
 
         $this->serviceLocator->expects($this->at(1))