use specific major version of phpunit

doctrine · Apr 7, 2017 · 2e9d646 · 2e9d646
1 parent 2fe2c55
commit 2e9d646
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,8 +21,9 @@ matrix:
   include:
     - php: 5.3
       env: TRANSPORT=doctrine_dbal COMPOSER_FLAGS="--prefer-lowest"
-    - php: 5.3
-      env: TRANSPORT=jackrabbit COMPOSER_FLAGS="--prefer-lowest"
+# composer fails to find a solution even though i think there should exist one
+#    - php: 5.3
+#      env: TRANSPORT=jackrabbit COMPOSER_FLAGS="--prefer-lowest"
     - php: 7.0
       env: TRANSPORT=doctrine_dbal SYMFONY_VERSION="2.7"
     - php: 7.0
@@ -39,8 +40,8 @@ before_script:
   - if [ "$PHPBENCH" = "yes" ]; then composer require --no-update phpbench/phpbench=~0.11; fi;
   - ./tests/travis_${TRANSPORT}.sh
 
-script: 
-  - phpunit -c tests/phpunit_${TRANSPORT}.xml.dist
+script:
+  - vendor/bin/phpunit -c tests/phpunit_${TRANSPORT}.xml.dist
   - if [ "$PHPBENCH" = "yes" ]; then php vendor/bin/phpbench run --report=all; fi;
 
 

diff --git a/composer.json b/composer.json
@@ -27,12 +27,12 @@
         "symfony/yaml": "^2.3|^3.0",
         "symfony/phpunit-bridge": "^2.7|^3.0",
         "liip/rmt": "~1.2",
-        "phpunit/phpunit": "*"
+        "phpunit/phpunit": "^4.8|5.*"
     },
     "suggest": {
         "symfony/yaml": "^2.3|^3.0",
-        "jackalope/jackalope-doctrine-dbal": "^1.1.5",
-        "jackalope/jackalope-jackrabbit": "^1.0"
+        "jackalope/jackalope-doctrine-dbal": "^1.3.0",
+        "jackalope/jackalope-jackrabbit": "^1.3.0"
     },
     "conflict": {
         "jackalope/jackalope-doctrine-dbal": "<1.1.5"