Merge pull request #46 from clearbooks/ADHOC-2874-sql-schema-update

dependency updates (ADHOC-2874)
clearbooks · Dec 5, 2017 · 6da622b · 6da622b
2 parents 727babe + 10d70d4
commit 6da622b
Show file tree

Hide file tree

Showing 3 changed files with 462 additions and 191 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,6 @@
 language: php
 php:
-  - 5.5
-  - 5.6
   - 7.0
-  - hhvm
-  - nightly
 
 install: composer install --dev
 before_script:
@@ -13,6 +9,3 @@ before_script:
 script:
   - cat vendor/clearbooks/labs-schema/sql/*.sql | mysql -uroot labs
   - vendor/phpunit/phpunit/phpunit -c phpunit.xml --coverage-clover build/logs/clover.xml
-after_success:
-  - if [ "$TRAVIS_PHP_VERSION" != "nightly" ] && [ "$TRAVIS_PHP_VERSION" != "7.0" ] && [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
-  - if [ "$TRAVIS_PHP_VERSION" != "nightly" ] && [ "$TRAVIS_PHP_VERSION" != "7.0" ] && [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi
diff --git a/composer.json b/composer.json
@@ -30,16 +30,17 @@
       "type": "git"
     },
     {
-      "url": "git@github.com:clearbooks/labs-schema.git",
+      "url": "https://github.com/clearbooks/labs-schema.git",
       "type": "git"
     }
   ],
   "require": {
     "doctrine/dbal": "2.5.1",
     "clearbooks/labs": "^1.1",
-    "clearbooks/labs-php-client": "^1.4",
-    "clearbooks/labs-php-client-mysql": "^1.4",
-    "clearbooks/labs-schema": "1.1.1"
+    "clearbooks/labs-php-client": "~1.4",
+    "clearbooks/labs-php-client-mysql": "^2.0.0",
+    "clearbooks/labs-schema": "~1.1",
+    "php": ">=7.0"
   },
   "require-dev": {
     "phpunit/phpunit": "4.7.*"