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

taylorotwell · web-flow · commit 4c6c24f5ea4c · 2019-08-16T13:39:16.000-05:00
[5.5] Fixed incorrect implementation of PSR-16
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);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ public function put($key, $value, $minutes = null)`
`199`	`199`	`*/`
`200`	`200`	`public function set($key, $value, $ttl = null)`
`201`	`201`	`{`
`202`		`- $this->put($key, $value, $ttl);`
	`202`	`+ $this->put($key, $value, is_int($ttl) ? $ttl / 60 : null);`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`/**`
`@@ -225,7 +225,7 @@ public function putMany(array $values, $minutes)`
`225`	`225`	`*/`
`226`	`226`	`public function setMultiple($values, $ttl = null)`
`227`	`227`	`{`
`228`		`- $this->putMany(is_array($values) ? $values : iterator_to_array($values), $ttl);`
	`228`	`+ $this->putMany(is_array($values) ? $values : iterator_to_array($values), is_int($ttl) ? $ttl / 60 : null);`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`/**`