Merge pull request #16 from clearbooks/ADHOC-7858-php-7.4

PHP 7.4 support
clearbooks · Oct 7, 2020 · f36c8a2 · f36c8a2
2 parents bac1a8d + 6baa13b
commit f36c8a2
Show file tree

Hide file tree

Showing 24 changed files with 1,025 additions and 687 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ composer.phar
 /vendor/
 config/db-config.php
 build
+.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,13 @@
 language: php
 php:
-  - 7.0
+  - 7.2
+  - 7.3
+  - 7.4
 
-install: composer install --dev
+services:
+  - mysql
+
+install: composer install
 
 before_script:
   - cp config/db-config.sample.php config/db-config.php

diff --git a/composer.json b/composer.json
@@ -12,15 +12,15 @@
     "psr-4": {"Clearbooks\\Labs\\": ["src/", "test/"]}
   },
   "require":{
-    "clearbooks/labs-schema": "1.1.*",
-    "doctrine/dbal": "2.5.1",
-    "php-di/php-di": "^5.0",
-    "clearbooks/labs-php-client": "^1.4.1",
-    "crodas/notoj": "^1.3.3",
-    "php": ">=7.0"
+    "php": ">=7.2",
+    "clearbooks/labs-schema": "^1.1.2",
+    "clearbooks/labs-php-client": "^2.0.0",
+    "crodas/notoj": "^1.7.0",
+    "doctrine/dbal": "~2.10.4",
+    "php-di/php-di": "^6.0.5"
   },
   "require-dev": {
-    "phpunit/phpunit": "4.7.*"
+    "phpunit/phpunit": "^8"
   },
   "repositories": [
     {