Fix versions after merging PR

grimzy · grimzy · commit 7d0e7f29d43f · 2020-03-02T01:17:43.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -19,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
 
diff --git a/composer.json b/composer.json
@@ -15,17 +15,17 @@
         }
     ],
     "require": {
-        "php": ">=5.5",
+        "php": ">=5.5.9",
         "ext-pdo": "*",
         "ext-json": "*",
-        "illuminate/database": "^5.2|^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"
