Merge branch '8.x' into 9.x

Author: GrahamCampbell

src/Illuminate/Cache/Repository.php

@@ -529,7 +529,7 @@ protected function getSeconds($ttl)
             $duration = Carbon::now()->diffInRealSeconds($duration, false);
         }
 
-        return (int) $duration > 0 ? $duration : 0;
+        return (int) ($duration > 0 ? $duration : 0);
     }
 
     /**

src/Illuminate/Collections/Collection.php

@@ -846,8 +846,8 @@ public function nth($step, $offset = 0)
 
         $position = 0;
 
-        foreach ($this->items as $item) {
-            if ($position % $step === $offset) {
+        foreach ($this->slice($offset)->items as $item) {
+            if ($position % $step === 0) {
                 $new[] = $item;
             }
 

src/Illuminate/Collections/LazyCollection.php

@@ -848,8 +848,8 @@ public function nth($step, $offset = 0)
         return new static(function () use ($step, $offset) {
             $position = 0;
 
-            foreach ($this as $item) {
-                if ($position % $step === $offset) {
+            foreach ($this->slice($offset) as $item) {
+                if ($position % $step === 0) {
                     yield $item;
                 }
 

src/Illuminate/Database/Connection.php

@@ -829,6 +829,8 @@ protected function reconnectIfMissingConnection()
     public function disconnect()
     {
         $this->setPdo(null)->setReadPdo(null);
+
+        $this->doctrineConnection = null;
     }
 
     /**

src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php

@@ -24,7 +24,7 @@ public function bootstrap(Application $app)
         // First we will see if we have a cache configuration file. If we do, we'll load
         // the configuration items from that file so that it is very quick. Otherwise
         // we will need to spin through every configuration file and load them all.
-        if (is_file($cached = $app->getCachedConfigPath())) {
+        if (file_exists($cached = $app->getCachedConfigPath())) {
             $items = require $cached;
 
             $loadedFromCache = true;

tests/Support/SupportCollectionTest.php

@@ -2976,6 +2976,8 @@ public function testNth($collection)
         $this->assertEquals(['b', 'f'], $data->nth(4, 1)->all());
         $this->assertEquals(['c'], $data->nth(4, 2)->all());
         $this->assertEquals(['d'], $data->nth(4, 3)->all());
+        $this->assertEquals(['c', 'e'], $data->nth(2, 2)->all());
+        $this->assertEquals(['c', 'd', 'e', 'f'], $data->nth(1, 2)->all());
     }
 
     /**