Merge pull request #150 from jessarcher/master

Laravel 6.0 support

Author: Torann

.travis.yml

@@ -1,11 +1,12 @@
 language: php
 
 php:
-  - 7.0
   - 7.1
+  - 7.2
+  - 7.3
 
 before_script:
   - curl -s http://getcomposer.org/installer | php
   - php composer.phar install --dev
 
-script: phpunit
+script: php ./vendor/bin/phpunit

composer.json

@@ -19,16 +19,17 @@
     }
   ],
   "require": {
-    "php": "^7.0",
-    "illuminate/support": "~5.0",
-    "illuminate/console": "~5.0"
+    "php": "^7.1",
+    "illuminate/support": "~5.5|^6.0",
+    "illuminate/console": "~5.5|^6.0",
+    "vlucas/phpdotenv": "^3.5"
   },
   "suggest": {
     "geoip2/geoip2": "Required to use the MaxMind database or web service with GeoIP (~2.1).",
     "monolog/monolog": "Allows for storing location not found errors to the log"
   },
   "require-dev": {
-    "phpunit/phpunit": "^4.8",
+    "phpunit/phpunit": "^7.0",
     "mockery/mockery": "^0.9.4",
     "geoip2/geoip2": "~2.1"
   },

phpunit.xml

@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          verbose="true"
 >
     <testsuites>

src/GeoIPServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace Torann\GeoIP;
 
+use Illuminate\Support\Str;
 use Illuminate\Support\ServiceProvider;
 
 class GeoIPServiceProvider extends ServiceProvider
@@ -74,6 +75,6 @@ public function registerGeoIpCommands()
      */
     protected function isLumen()
     {
-        return str_contains($this->app->version(), 'Lumen') === true;
+        return Str::contains($this->app->version(), 'Lumen') === true;
     }
 }

tests/TestCase.php

@@ -9,12 +9,12 @@ class TestCase extends PHPUnitTestCase
 {
     public static $functions;
 
-    public function setUp()
+    public function setUp(): void
     {
         self::$functions = Mockery::mock();
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         Mockery::close();
     }