Merge branch '10.x' into 11.x

Signed-off-by: Mior Muhammad Zaki <[email protected]>

Author: crynobone

composer.json

@@ -106,7 +106,7 @@
         "league/flysystem-sftp-v3": "^3.0",
         "mockery/mockery": "^1.6",
         "nyholm/psr7": "^1.2",
-        "orchestra/testbench-core": "^9.0",
+        "orchestra/testbench-core": "^9.0.6",
         "pda/pheanstalk": "^5.0",
         "phpstan/phpstan": "^1.4.7",
         "phpunit/phpunit": "^10.5|^11.0",

src/Illuminate/Collections/Collection.php

@@ -998,8 +998,11 @@ public function push(...$values)
     /**
      * Push all of the given items onto the collection.
      *
-     * @param  iterable<array-key, TValue>  $source
-     * @return static
+     * @template TConcatKey of array-key
+     * @template TConcatValue
+     *
+     * @param  iterable<TConcatKey, TConcatValue>  $source
+     * @return static<TKey|TConcatKey, TValue|TConcatValue>
      */
     public function concat($source)
     {

src/Illuminate/Collections/Enumerable.php

@@ -816,8 +816,11 @@ public function partition($key, $operator = null, $value = null);
     /**
      * Push all of the given items onto the collection.
      *
-     * @param  iterable<array-key, TValue>  $source
-     * @return static
+     * @template TConcatKey of array-key
+     * @template TConcatValue
+     *
+     * @param  iterable<TConcatKey, TConcatValue>  $source
+     * @return static<TKey|TConcatKey, TValue|TConcatValue>
      */
     public function concat($source);
 

src/Illuminate/Collections/LazyCollection.php

@@ -991,8 +991,11 @@ public function select($keys)
     /**
      * Push all of the given items onto the collection.
      *
-     * @param  iterable<array-key, TValue>  $source
-     * @return static
+     * @template TConcatKey of array-key
+     * @template TConcatValue
+     *
+     * @param  iterable<TConcatKey, TConcatValue>  $source
+     * @return static<TKey|TConcatKey, TValue|TConcatValue>
      */
     public function concat($source)
     {

tests/Integration/Auth/ApiAuthenticationWithEloquentTest.php

@@ -3,7 +3,6 @@
 namespace Illuminate\Tests\Integration\Auth;
 
 use Illuminate\Database\QueryException;
-use Illuminate\Foundation\Auth\User as FoundationUser;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Str;
 use Orchestra\Testbench\TestCase;
@@ -12,11 +11,10 @@
 #[RequiresPhpExtension('pdo_mysql')]
 class ApiAuthenticationWithEloquentTest extends TestCase
 {
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
         // Auth configuration
         $app['config']->set('auth.defaults.guard', 'api');
-        $app['config']->set('auth.providers.users.model', User::class);
 
         $app['config']->set('auth.guards.api', [
             'driver' => 'token',
@@ -58,8 +56,3 @@ public function testAuthenticationViaApiWithEloquentUsingWrongDatabaseCredential
         }
     }
 }
-
-class User extends FoundationUser
-{
-    //
-}

tests/Integration/Auth/AuthenticationTest.php

@@ -13,34 +13,50 @@
 use Illuminate\Auth\SessionGuard;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Events\Dispatcher;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Str;
 use Illuminate\Support\Testing\Fakes\EventFake;
 use Illuminate\Tests\Integration\Auth\Fixtures\AuthenticationTestUser;
 use InvalidArgumentException;
+use Orchestra\Testbench\Attributes\WithMigration;
 use Orchestra\Testbench\TestCase;
 
+#[WithMigration]
 class AuthenticationTest extends TestCase
 {
-    protected function getEnvironmentSetUp($app)
+    use RefreshDatabase;
+
+    protected function defineEnvironment($app)
     {
-        $app['config']->set('auth.providers.users.model', AuthenticationTestUser::class);
+        $app['config']->set([
+            'auth.providers.users.model' => AuthenticationTestUser::class,
+            'hashing.driver' => 'bcrypt',
+        ]);
+    }
 
-        $app['config']->set('hashing', ['driver' => 'bcrypt']);
+    protected function defineRoutes($router)
+    {
+        $router->get('basic', function () {
+            return $this->app['auth']->guard()->basic()
+                ?: $this->app['auth']->user()->toJson();
+        });
+
+        $router->get('basicWithCondition', function () {
+            return $this->app['auth']->guard()->basic('email', ['is_active' => true])
+                ?: $this->app['auth']->user()->toJson();
+        });
     }
 
-    protected function setUp(): void
+    protected function afterRefreshingDatabase()
     {
-        parent::setUp();
-
-        Schema::create('users', function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('email');
-            $table->string('username');
-            $table->string('password');
-            $table->string('remember_token')->default(null)->nullable();
+        Schema::table('users', function (Blueprint $table) {
+            $table->renameColumn('name', 'username');
+        });
+
+        Schema::table('users', function (Blueprint $table) {
             $table->tinyInteger('is_active')->default(0);
         });
 
@@ -50,16 +66,6 @@ protected function setUp(): void
             'password' => bcrypt('password'),
             'is_active' => true,
         ]);
-
-        $this->app->make('router')->get('basic', function () {
-            return $this->app['auth']->guard()->basic()
-                ?: $this->app['auth']->user()->toJson();
-        });
-
-        $this->app->make('router')->get('basicWithCondition', function () {
-            return $this->app['auth']->guard()->basic('email', ['is_active' => true])
-                ?: $this->app['auth']->user()->toJson();
-        });
     }
 
     public function testBasicAuthProtectsRoute()

tests/Integration/Auth/ForgotPasswordTest.php

@@ -3,16 +3,21 @@
 namespace Illuminate\Tests\Integration\Auth;
 
 use Illuminate\Auth\Notifications\ResetPassword;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Support\Facades\Notification;
 use Illuminate\Support\Facades\Password;
 use Illuminate\Support\Str;
 use Illuminate\Tests\Integration\Auth\Fixtures\AuthenticationTestUser;
+use Orchestra\Testbench\Attributes\WithMigration;
 use Orchestra\Testbench\Factories\UserFactory;
 use Orchestra\Testbench\TestCase;
 
+#[WithMigration]
 class ForgotPasswordTest extends TestCase
 {
+    use RefreshDatabase;
+
     protected function tearDown(): void
     {
         ResetPassword::$createUrlCallback = null;
@@ -27,11 +32,6 @@ protected function defineEnvironment($app)
         $app['config']->set('auth.providers.users.model', AuthenticationTestUser::class);
     }
 
-    protected function defineDatabaseMigrations()
-    {
-        $this->loadLaravelMigrations();
-    }
-
     protected function defineRoutes($router)
     {
         $router->get('password/reset/{token}', function ($token) {

tests/Integration/Auth/ForgotPasswordWithoutDefaultRoutesTest.php

@@ -3,16 +3,21 @@
 namespace Illuminate\Tests\Integration\Auth;
 
 use Illuminate\Auth\Notifications\ResetPassword;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Support\Facades\Notification;
 use Illuminate\Support\Facades\Password;
 use Illuminate\Support\Str;
 use Illuminate\Tests\Integration\Auth\Fixtures\AuthenticationTestUser;
+use Orchestra\Testbench\Attributes\WithMigration;
 use Orchestra\Testbench\Factories\UserFactory;
 use Orchestra\Testbench\TestCase;
 
+#[WithMigration]
 class ForgotPasswordWithoutDefaultRoutesTest extends TestCase
 {
+    use RefreshDatabase;
+
     protected function tearDown(): void
     {
         ResetPassword::$createUrlCallback = null;
@@ -27,11 +32,6 @@ protected function defineEnvironment($app)
         $app['config']->set('auth.providers.users.model', AuthenticationTestUser::class);
     }
 
-    protected function defineDatabaseMigrations()
-    {
-        $this->loadLaravelMigrations();
-    }
-
     protected function defineRoutes($router)
     {
         $router->get('custom/password/reset/{token}', function ($token) {

tests/Integration/Cache/DynamoDbStoreTest.php

@@ -7,19 +7,12 @@
 use Illuminate\Contracts\Cache\Repository;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
+use Orchestra\Testbench\Attributes\RequiresEnv;
 use Orchestra\Testbench\TestCase;
 
+#[RequiresEnv('DYNAMODB_CACHE_TABLE')]
 class DynamoDbStoreTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        if (! env('DYNAMODB_CACHE_TABLE')) {
-            $this->markTestSkipped('DynamoDB not configured.');
-        }
-
-        parent::setUp();
-    }
-
     public function testItemsCanBeStoredAndRetrieved()
     {
         Cache::driver('dynamodb')->put('name', 'Taylor', 10);

tests/Integration/Cache/FileCacheLockTest.php

@@ -4,21 +4,12 @@
 
 use Exception;
 use Illuminate\Support\Facades\Cache;
+use Orchestra\Testbench\Attributes\WithConfig;
 use Orchestra\Testbench\TestCase;
 
+#[WithConfig('cache.default', 'file')]
 class FileCacheLockTest extends TestCase
 {
-    /**
-     * Define environment setup.
-     *
-     * @param  \Illuminate\Foundation\Application  $app
-     * @return void
-     */
-    protected function getEnvironmentSetUp($app)
-    {
-        $app['config']->set('cache.default', 'file');
-    }
-
     public function testLocksCanBeAcquiredAndReleased()
     {
         Cache::lock('foo')->forceRelease();