fix conflicts

TomHAnderson · Nov 17, 2020 · 22e4182 · 22e4182
2 parents aaf59cf + 53d66bb
commit 22e4182
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/src/Illuminate/Database/Eloquent/Relations/Concerns/AsPivot.php b/src/Illuminate/Database/Eloquent/Relations/Concerns/AsPivot.php
@@ -297,6 +297,8 @@ public function newQueryForRestoration($ids)
      */
     protected function newQueryForCollectionRestoration(array $ids)
     {
+        $ids = array_values($ids);
+
         if (! Str::contains($ids[0], ':')) {
             return parent::newQueryForRestoration($ids);
         }

diff --git a/src/Illuminate/Database/Eloquent/Relations/MorphPivot.php b/src/Illuminate/Database/Eloquent/Relations/MorphPivot.php
@@ -151,6 +151,8 @@ public function newQueryForRestoration($ids)
      */
     protected function newQueryForCollectionRestoration(array $ids)
     {
+        $ids = array_values($ids);
+
         if (! Str::contains($ids[0], ':')) {
             return parent::newQueryForRestoration($ids);
         }

diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php
@@ -33,7 +33,7 @@ class Application extends Container implements ApplicationContract, CachesConfig
      *
      * @var string
      */
-    const VERSION = '8.14.0';
+    const VERSION = '8.15.0';
 
     /**
      * The base path for the Laravel installation.

diff --git a/src/Illuminate/Support/Facades/Request.php b/src/Illuminate/Support/Facades/Request.php
@@ -28,6 +28,8 @@
  * @method static array only(array|mixed $keys)
  * @method static array segments()
  * @method static array toArray()
+ * @method static array validate(array $rules, ...$params)
+ * @method static array validateWithBag(string $errorBag, array $rules, ...$params)
  * @method static bool accepts(string|array $contentTypes)
  * @method static bool acceptsAnyContentType()
  * @method static bool acceptsHtml()
@@ -43,6 +45,7 @@
  * @method static bool hasCookie(string $key)
  * @method static bool hasFile(string $key)
  * @method static bool hasHeader(string $key)
+ * @method static bool hasValidSignature(bool $absolute = true)
  * @method static bool is(mixed ...$patterns)
  * @method static bool isJson()
  * @method static bool matchesType(string $actual, string $type)