Merge pull request #29610 from laravel/5.5-psr-16

[5.5] Fixed incorrect implementation of PSR-16
laravel · Aug 16, 2019 · 4c6c24f · 4c6c24f
2 parents 0f53880 + 1663d74
commit 4c6c24f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Illuminate/Cache/Repository.php b/src/Illuminate/Cache/Repository.php
@@ -199,7 +199,7 @@ public function put($key, $value, $minutes = null)
      */
     public function set($key, $value, $ttl = null)
     {
-        $this->put($key, $value, $ttl);
+        $this->put($key, $value, is_int($ttl) ? $ttl / 60 : null);
     }
 
     /**
@@ -225,7 +225,7 @@ public function putMany(array $values, $minutes)
      */
     public function setMultiple($values, $ttl = null)
     {
-        $this->putMany(is_array($values) ? $values : iterator_to_array($values), $ttl);
+        $this->putMany(is_array($values) ? $values : iterator_to_array($values), is_int($ttl) ? $ttl / 60 : null);
     }
 
     /**