Skip to content

Commit

Permalink
Fix versions after merging PR
Browse files Browse the repository at this point in the history
  • Loading branch information
grimzy committed Feb 29, 2020
1 parent e4879ed commit 3578a93
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
language: php

php:
- '5.5'
- '5.6'
- '7.0'
- '7.1'
- '7.2'
- '7.3'
Expand All @@ -16,7 +19,7 @@ services:
- docker

before_install:
- echo "memory_limit=2G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
- echo "memory_limit=3G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
- sudo /etc/init.d/mysql stop
- make start_db V=$MYSQL_VERSION

Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
}
],
"require": {
"php": ">=7.1.3",
"php": ">=5.5.9",
"ext-pdo": "*",
"ext-json": "*",
"illuminate/database": "^5.6|^6.0",
"illuminate/database": "^5.2||^6.0",
"geo-io/wkb-parser": "^1.0",
"jmikola/geojson": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "~4.8||~5.7",
"mockery/mockery": "^0.9.9",
"laravel/laravel": "^5.2|^6.0",
"laravel/laravel": "^5.2||^6.0",
"doctrine/dbal": "^2.5",
"laravel/browser-kit-testing": "^2.0",
"php-coveralls/php-coveralls": "^2.0"
Expand Down

0 comments on commit 3578a93

Please sign in to comment.