Merge branch '1.1' into 1.2

# Conflicts: # .travis.yml
open-sausages · Jan 10, 2019 · 733ded9 · 733ded9
2 parents dcc8438 + 60bfe41
commit 733ded9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -15,6 +15,8 @@ matrix:
       env: DB=MYSQL PDO=1 PHPUNIT_COVERAGE_TEST=1
     - php: 7.2
       env: DB=MYSQL PHPUNIT_TEST=1
+    - php: 7.3
+      env: DB=MYSQL PHPUNIT_TEST=1
 
 before_script:
 # Init PHP

diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
     "require-dev": {
         "phpunit/phpunit": "^5.7",
         "silverstripe/admin": "^1",
-        "squizlabs/php_codesniffer": "^3.0"
+        "squizlabs/php_codesniffer": "^3"
     },
     "autoload": {
         "psr-4": {