Merge pull request #58 from mattmcdonald-uk/master

Laravel 7 support

composer.json

@@ -16,9 +16,9 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "illuminate/support": "4.*|5.*|6.*",
-        "illuminate/config": "4.*|5.*|6.*",
-        "illuminate/translation": "4.*|5.*|6.*"
+        "illuminate/support": "4.*|5.*|6.*|7.*",
+        "illuminate/config": "4.*|5.*|6.*|7.*",
+        "illuminate/translation": "4.*|5.*|6.*|7.*"
     },
     "require-dev": {
         "phpunit/phpunit": "4.0.*",

src/Msurguy/Honeypot/HoneypotServiceProvider.php

@@ -33,10 +33,10 @@ public function register()
     */
     public function boot()
     {
-        if ($this->isLaravelVersion('4')) {
-            $this->package('msurguy/honeypot');
-        } elseif ($this->isLaravelVersion('5') || $this->isLaravelVersion('6')) {
+        if ($this->isLaravelMinimumVersion(5)) {
             $this->loadTranslationsFrom(__DIR__ . '/../../lang', 'honeypot');
+        } else {
+            $this->package('msurguy/honeypot');
         }
 
         $this->app->booted(function ($app) {
@@ -62,13 +62,13 @@ public function provides()
     }
 
     /**
-     * Determine if laravel starts with any of the given version strings
+     * Determine if Laravel version is at least the given version.
      *
-     * @param  string|array  $startsWith
+     * @param  string|array  $minimumVersion
      * @return boolean
      */
-    protected function isLaravelVersion($startsWith)
+    protected function isLaravelMinimumVersion($minimumVersion)
     {
-        return Str::startsWith(Application::VERSION, $startsWith);
+        return (float)Application::VERSION >= $minimumVersion;
     }
 }