Merge pull request dingo#1637 from specialtactics/bugfix/update-to-use-laravel-5.8-cache-ttl

Use Cache TTLs using now() - Laravel 5.8 compatibility

Author: specialtactics

composer.json

@@ -13,24 +13,25 @@
         "email": "[email protected]"
     }],
     "require": {
-        "php": "^7.0",
+        "php": "^7.1",
         "dingo/blueprint": "^0.2",
-        "illuminate/routing": "^5.1",
-        "illuminate/support": "^5.1",
-        "league/fractal": "^0.17"
+        "illuminate/routing": "^5.5",
+        "illuminate/support": "^5.5",
+        "league/fractal": "^0.17",
+        "laravel/framework": "^5.5"
     },
     "require-dev": {
         "phpdocumentor/reflection-docblock": "3.3.2",
         "friendsofphp/php-cs-fixer": "~2",
-        "illuminate/auth": "^5.1",
-        "illuminate/cache": "^5.1",
-        "illuminate/console": "^5.1",
-        "illuminate/database": "^5.1",
-        "illuminate/events": "^5.1",
-        "illuminate/filesystem": "^5.1",
-        "illuminate/log": "^5.1",
-        "illuminate/pagination": "^5.1",
-        "laravel/lumen-framework": "^5.1",
+        "illuminate/auth": "^5.5",
+        "illuminate/cache": "^5.5",
+        "illuminate/console": "^5.5",
+        "illuminate/database": "^5.5",
+        "illuminate/events": "^5.5",
+        "illuminate/filesystem": "^5.5",
+        "illuminate/log": "^5.5",
+        "illuminate/pagination": "^5.5",
+        "laravel/lumen-framework": "^5.5",
         "mockery/mockery": "~1.0",
         "phpunit/phpunit": "^4.8.35 || ^5.4.3 || ^6.5",
         "squizlabs/php_codesniffer": "~2.0",

src/Http/RateLimit/Handler.php

@@ -185,7 +185,7 @@ protected function key($key)
      */
     protected function cache($key, $value, $minutes)
     {
-        $this->cache->add($this->key($key), $value, $minutes);
+        $this->cache->add($this->key($key), $value, now()->addMinutes($minutes));
     }
 
     /**

tests/ChecksLaravelVersionTrait.php

@@ -32,12 +32,15 @@ private function getApplicationStub()
         if ('dev-master' === $version) {
             $version = $this->current_release;
         }
-        $compared_versions = version_compare('5.8', $version);
-        // If comparison is Less Than, or Equal To, provide the 5.8 stub.
-        if ($compared_versions === -1 || $compared_versions === 0) {
+
+        // Remove the 'v' in for example 'v5.8.3'
+        $version = str_replace('v', '', $version);
+
+        // Return the version stub for the right version
+        if (version_compare($version, '5.8.0', '>=')) {
             return new Application58Stub;
+        } else {
+            return new ApplicationStub;
         }
-
-        return new ApplicationStub;
     }
 }