Merge remote-tracking branch 'upstream/8.x' into 8.x

Author: TBlindaruk

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

@@ -806,8 +806,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

@@ -796,8 +796,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

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

src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php

@@ -519,6 +519,10 @@ protected function handleLazyLoadingViolation($key)
             return call_user_func(static::$lazyLoadingViolationCallback, $this, $key);
         }
 
+        if (! $this->exists || $this->wasRecentlyCreated) {
+            return;
+        }
+
         throw new LazyLoadingViolationException($this, $key);
     }
 

src/Illuminate/Database/Eloquent/Model.php

@@ -384,10 +384,10 @@ public static function preventLazyLoading($value = true)
     /**
      * Register a callback that is responsible for handling lazy loading violations.
      *
-     * @param  callable  $callback
+     * @param  callable|null  $callback
      * @return void
      */
-    public static function handleLazyLoadingViolationUsing(callable $callback)
+    public static function handleLazyLoadingViolationUsing(?callable $callback)
     {
         static::$lazyLoadingViolationCallback = $callback;
     }

src/Illuminate/Foundation/Application.php

@@ -33,7 +33,7 @@ class Application extends Container implements ApplicationContract, CachesConfig
      *
      * @var string
      */
-    const VERSION = '8.83.5';
+    const VERSION = '8.83.6';
 
     /**
      * The base path for the Laravel installation.

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/Encryption/EncrypterTest.php

@@ -160,6 +160,18 @@ public function testExceptionThrownWhenPayloadIsInvalid()
         $e->decrypt($payload);
     }
 
+    public function testDecryptionExceptionIsThrownWhenUnexpectedTagIsAdded()
+    {
+        $this->expectException(DecryptException::class);
+        $this->expectExceptionMessage('Unable to use tag because the cipher algorithm does not support AEAD.');
+
+        $e = new Encrypter(str_repeat('a', 16));
+        $payload = $e->encrypt('foo');
+        $decodedPayload = json_decode(base64_decode($payload));
+        $decodedPayload->tag = 'set-manually';
+        $e->decrypt(base64_encode(json_encode($decodedPayload)));
+    }
+
     public function testExceptionThrownWithDifferentKey()
     {
         $this->expectException(DecryptException::class);

tests/Integration/Database/EloquentStrictLoadingTest.php

@@ -127,6 +127,8 @@ public function testStrictModeWithCustomCallbackOnLazyLoading()
         $models = EloquentStrictLoadingTestModel1::get();
 
         $models[0]->modelTwos;
+
+        Model::handleLazyLoadingViolationUsing(null);
     }
 
     public function testStrictModeWithOverriddenHandlerOnLazyLoading()
@@ -141,6 +143,21 @@ public function testStrictModeWithOverriddenHandlerOnLazyLoading()
 
         $models[0]->modelTwos;
     }
+
+    public function testStrictModeDoesntThrowAnExceptionOnManuallyMadeModel()
+    {
+        $model1 = EloquentStrictLoadingTestModel1WithLocalPreventsLazyLoading::make();
+        $model2 = EloquentStrictLoadingTestModel2::make();
+        $model1->modelTwos->push($model2);
+
+        $this->assertInstanceOf(Collection::class, $model1->modelTwos);
+    }
+
+    public function testStrictModeDoesntThrowAnExceptionOnRecentlyCreatedModel()
+    {
+        $model1 = EloquentStrictLoadingTestModel1WithLocalPreventsLazyLoading::create();
+        $this->assertInstanceOf(Collection::class, $model1->modelTwos);
+    }
 }
 
 class EloquentStrictLoadingTestModel1 extends Model
@@ -172,6 +189,19 @@ protected function handleLazyLoadingViolation($key)
     }
 }
 
+class EloquentStrictLoadingTestModel1WithLocalPreventsLazyLoading extends Model
+{
+    public $table = 'test_model1';
+    public $timestamps = false;
+    public $preventsLazyLoading = true;
+    protected $guarded = [];
+
+    public function modelTwos()
+    {
+        return $this->hasMany(EloquentStrictLoadingTestModel2::class, 'model_1_id');
+    }
+}
+
 class EloquentStrictLoadingTestModel2 extends Model
 {
     public $table = 'test_model2';