Merge pull request #1 from xsolve-pl/develop

Adjusting dependencies and improving CI tests.
boldare · May 17, 2018 · c062e9e · c062e9e
2 parents 597a05b + 2d20b67
commit c062e9e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,19 +3,22 @@ language: php
 branches:
   only:
     - master
+    - develop
     - /^v\d+\.\d+\.\d+$/
 
 matrix:
+  fast_finish: true
   include:
     - php: 5.6
       env: PHPSTAN=false
     - php: 7.0
       env: PHPSTAN=true
     - php: 7.1
       env: PHPSTAN=true
+    - php: 7.2
+      env: PHPSTAN=true
     - php: hhvm
       env: PHPSTAN=false
-  fast_finish: true
   allow_failures:
     - php: hhvm
 
@@ -25,7 +28,7 @@ cache:
     - $HOME/.composer/cache
 
 before_install:
-  - phpenv config-rm xdebug.ini || echo "xdebug not available"
+  - phpenv config-rm xdebug.ini || echo "XDebug disabled."
   - composer self-update
 
 install: 

diff --git a/composer.json b/composer.json
@@ -14,13 +14,16 @@
         }
     ],
     "require": {
-        "php": ">=5.6.0"
+        "php": "^5.6|^7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~5.5",
+        "phpunit/phpunit": "^5.5",
         "sebastian/phpcpd": "^2.0",
         "phpmd/phpmd": "^2.4"
     },
+    "suggest": {
+        "xsolve-pl/model-factory-bundle": "^1.0"
+    },
     "autoload":{
         "psr-4":{
             "Xsolve\\ModelFactory\\": "lib",