Merge branch '8.x' into 9.x

# Conflicts:
#	tests/Integration/Database/EloquentStrictLoadingTest.php

Author: driesvints

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

@@ -520,6 +520,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;
     }

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

@@ -145,6 +145,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
@@ -176,6 +191,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';