[11.x] Fix flat array parameter for relation upsert (#52289)

* [11.x] Fix flat arrays for relation upsert

* add once

Author: iamgergo

src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php

@@ -286,6 +286,10 @@ public function updateOrCreate(array $attributes, array $values = [])
      */
     public function upsert(array $values, $uniqueBy, $update = null)
     {
+        if (! empty($values) && ! is_array(reset($values))) {
+            $values = [$values];
+        }
+
         foreach ($values as $key => $value) {
             $values[$key][$this->getForeignKeyName()] = $this->getParentKey();
         }

src/Illuminate/Database/Eloquent/Relations/MorphOneOrMany.php

@@ -106,6 +106,10 @@ protected function setForeignAttributesForCreate(Model $model)
      */
     public function upsert(array $values, $uniqueBy, $update = null)
     {
+        if (! empty($values) && ! is_array(reset($values))) {
+            $values = [$values];
+        }
+
         foreach ($values as $key => $value) {
             $values[$key][$this->getMorphType()] = $this->getMorphClass();
         }

tests/Database/DatabaseEloquentHasManyTest.php

@@ -257,7 +257,21 @@ public function testRelationUpsertFillsForeignKey()
     {
         $relation = $this->getRelation();
 
-        $relation->getQuery()->shouldReceive('upsert')->with(
+        $relation->getQuery()->shouldReceive('upsert')->once()->with(
+            [
+                ['email' => 'foo3', 'name' => 'bar', $relation->getForeignKeyName() => $relation->getParentKey()],
+            ],
+            ['email'],
+            ['name']
+        );
+
+        $relation->upsert(
+            ['email' => 'foo3', 'name' => 'bar'],
+            ['email'],
+            ['name']
+        );
+
+        $relation->getQuery()->shouldReceive('upsert')->once()->with(
             [
                 ['email' => 'foo3', 'name' => 'bar', $relation->getForeignKeyName() => $relation->getParentKey()],
                 ['name' => 'bar2', 'email' => 'foo2', $relation->getForeignKeyName() => $relation->getParentKey()],

tests/Database/DatabaseEloquentMorphTest.php

@@ -71,7 +71,21 @@ public function testMorphRelationUpsertFillsForeignKey()
     {
         $relation = $this->getManyRelation();
 
-        $relation->getQuery()->shouldReceive('upsert')->with(
+        $relation->getQuery()->shouldReceive('upsert')->once()->with(
+            [
+                ['email' => 'foo3', 'name' => 'bar', $relation->getForeignKeyName() => $relation->getParentKey(), $relation->getMorphType() => $relation->getMorphClass()],
+            ],
+            ['email'],
+            ['name']
+        );
+
+        $relation->upsert(
+            ['email' => 'foo3', 'name' => 'bar'],
+            ['email'],
+            ['name']
+        );
+
+        $relation->getQuery()->shouldReceive('upsert')->once()->with(
             [
                 ['email' => 'foo3', 'name' => 'bar', $relation->getForeignKeyName() => $relation->getParentKey(), $relation->getMorphType() => $relation->getMorphClass()],
                 ['name' => 'bar2', 'email' => 'foo2', $relation->getForeignKeyName() => $relation->getParentKey(), $relation->getMorphType() => $relation->getMorphClass()],