Merge branch '8.x' into 9.x

Author: driesvints

src/Illuminate/Database/Eloquent/Builder.php

@@ -872,9 +872,7 @@ public function cursorPaginate($perPage = null, $columns = ['*'], $cursorName =
      */
     protected function ensureOrderForCursorPagination($shouldReverse = false)
     {
-        $orders = collect($this->query->orders);
-
-        if ($orders->count() === 0) {
+        if (empty($this->query->orders) && empty($this->query->unionOrders)) {
             $this->enforceOrderBy();
         }
 
@@ -886,6 +884,10 @@ protected function ensureOrderForCursorPagination($shouldReverse = false)
             })->toArray();
         }
 
+        if ($this->query->unionOrders) {
+            return collect($this->query->unionOrders);
+        }
+
         return collect($this->query->orders);
     }
 

src/Illuminate/Support/Str.php

@@ -922,6 +922,18 @@ public static function substrReplace($string, $replace, $offset = 0, $length = n
         return substr_replace($string, $replace, $offset, $length);
     }
 
+    /**
+     * Swap multiple keywords in a string with other keywords.
+     *
+     * @param  array  $map
+     * @param  string  $subject
+     * @return string
+     */
+    public static function swap(array $map, $subject)
+    {
+        return strtr($subject, $map);
+    }
+
     /**
      * Make a string's first character uppercase.
      *

src/Illuminate/Support/Stringable.php

@@ -726,13 +726,24 @@ public function substrCount($needle, $offset = null, $length = null)
      * @param  string|array  $replace
      * @param  array|int  $offset
      * @param  array|int|null  $length
-     * @return string|array
+     * @return static
      */
     public function substrReplace($replace, $offset = 0, $length = null)
     {
         return new static(Str::substrReplace($this->value, $replace, $offset, $length));
     }
 
+    /**
+     * Swap multiple keywords in a string with other keywords.
+     *
+     * @param  array  $map
+     * @return static
+     */
+    public function swap(array $map)
+    {
+        return new static(strtr($this->value, $map));
+    }
+
     /**
      * Trim the string of the given characters.
      *

tests/Integration/Database/EloquentCursorPaginateTest.php

@@ -36,6 +36,23 @@ public function testCursorPaginationOnTopOfColumns()
         $this->assertCount(15, TestPost::cursorPaginate(15, ['id', 'title']));
     }
 
+    public function testPaginationWithUnion()
+    {
+        TestPost::create(['title' => 'Hello world', 'user_id' => 1]);
+        TestPost::create(['title' => 'Goodbye world', 'user_id' => 2]);
+        TestPost::create(['title' => 'Howdy', 'user_id' => 3]);
+        TestPost::create(['title' => '4th', 'user_id' => 4]);
+
+        $table1 = TestPost::query()->whereIn('user_id', [1, 2]);
+        $table2 = TestPost::query()->whereIn('user_id', [3, 4]);
+
+        $result = $table1->unionAll($table2)
+            ->orderBy('user_id', 'desc')
+            ->cursorPaginate(1);
+
+        self::assertSame(['user_id'], $result->getOptions()['parameters']);
+    }
+
     public function testPaginationWithDistinct()
     {
         for ($i = 1; $i <= 3; $i++) {

tests/Support/SupportStrTest.php

@@ -621,6 +621,24 @@ public function testPadRight()
         $this->assertSame('Alien     ', Str::padRight('Alien', 10));
     }
 
+    public function testSwapKeywords(): void
+    {
+        $this->assertSame(
+            'PHP 8 is fantastic',
+            Str::swap([
+                'PHP' => 'PHP 8',
+                'awesome' => 'fantastic',
+            ], 'PHP is awesome')
+        );
+
+        $this->assertSame(
+            'foo bar baz',
+            Str::swap([
+                'ⓐⓑ' => 'baz',
+            ], 'foo bar ⓐⓑ')
+        );
+    }
+
     public function testWordCount()
     {
         $this->assertEquals(2, Str::wordCount('Hello, world!'));

tests/Support/SupportStringableTest.php

@@ -795,6 +795,14 @@ public function testSubstr()
         $this->assertSame('', (string) $this->stringable('Б')->substr(2));
     }
 
+    public function testSwap()
+    {
+        $this->assertSame('PHP 8 is fantastic', (string) $this->stringable('PHP is awesome')->swap([
+            'PHP' => 'PHP 8',
+            'awesome' => 'fantastic',
+        ]));
+    }
+
     public function testSubstrCount()
     {
         $this->assertSame(3, $this->stringable('laravelPHPFramework')->substrCount('a'));