diff --git a/composer.json b/composer.json index dd2ca4f0f..812e35b75 100644 --- a/composer.json +++ b/composer.json @@ -15,9 +15,9 @@ "require-dev": { "fakerphp/faker": "^1.9.1", "laravel/sail": "^1.0.1", - "mockery/mockery": "^1.4.2", + "mockery/mockery": "^1.4.4", "nunomaduro/collision": "^6.0", - "phpunit/phpunit": "^9.3.3" + "phpunit/phpunit": "^9.5.8" }, "autoload": { "psr-4": { diff --git a/config/mail.php b/config/mail.php index 88bb0b797..6c4a8632f 100644 --- a/config/mail.php +++ b/config/mail.php @@ -29,7 +29,7 @@ return [ | mailers below. You are free to add additional mailers as required. | | Supported: "smtp", "sendmail", "mailgun", "ses", - | "postmark", "log", "array" + | "postmark", "log", "array", "failover" | */ diff --git a/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php b/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php index a5f5de1fb..fd235f8c5 100644 --- a/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php +++ b/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php @@ -14,7 +14,7 @@ return new class extends Migration public function up() { Schema::create('personal_access_tokens', function (Blueprint $table) { - $table->bigIncrements('id'); + $table->id(); $table->morphs('tokenable'); $table->string('name'); $table->string('token', 64)->unique(); diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 21791139b..9fab4d928 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -53,9 +53,9 @@ return [ 'array' => 'The :attribute must have more than :value items.', ], 'gte' => [ - 'numeric' => 'The :attribute must be greater than or equal :value.', - 'file' => 'The :attribute must be greater than or equal :value kilobytes.', - 'string' => 'The :attribute must be greater than or equal :value characters.', + 'numeric' => 'The :attribute must be greater than or equal to :value.', + 'file' => 'The :attribute must be greater than or equal to :value kilobytes.', + 'string' => 'The :attribute must be greater than or equal to :value characters.', 'array' => 'The :attribute must have :value items or more.', ], 'image' => 'The :attribute must be an image.', @@ -73,9 +73,9 @@ return [ 'array' => 'The :attribute must have less than :value items.', ], 'lte' => [ - 'numeric' => 'The :attribute must be less than or equal :value.', - 'file' => 'The :attribute must be less than or equal :value kilobytes.', - 'string' => 'The :attribute must be less than or equal :value characters.', + 'numeric' => 'The :attribute must be less than or equal to :value.', + 'file' => 'The :attribute must be less than or equal to :value kilobytes.', + 'string' => 'The :attribute must be less than or equal to :value characters.', 'array' => 'The :attribute must not have more than :value items.', ], 'max' => [ diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php index 78ccc21f4..627a8a0df 100644 --- a/tests/Feature/ExampleTest.php +++ b/tests/Feature/ExampleTest.php @@ -2,7 +2,6 @@ namespace Tests\Feature; -use Illuminate\Foundation\Testing\RefreshDatabase; use Tests\TestCase; class ExampleTest extends TestCase diff --git a/tests/TestCase.php b/tests/TestCase.php index 2932d4a69..d665b2a87 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -2,9 +2,10 @@ namespace Tests; +use Illuminate\Foundation\Testing\LazilyRefreshDatabase; use Illuminate\Foundation\Testing\TestCase as BaseTestCase; abstract class TestCase extends BaseTestCase { - use CreatesApplication; + use CreatesApplication, LazilyRefreshDatabase; }