ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
Taylor Otwell
2021-10-02 10:47:56 -05:00
parent 2c644455da 78e1d56c42
commit bdcb9681a6
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
composer.json
View File

@@ -15,9 +15,9 @@
"require-dev": { "require-dev": {
"fakerphp/faker": "^1.9.1", "fakerphp/faker": "^1.9.1",
"laravel/sail": "^1.0.1", "laravel/sail": "^1.0.1",
"mockery/mockery": "^1.4.2", "mockery/mockery": "^1.4.4",
"nunomaduro/collision": "^6.0", "nunomaduro/collision": "^6.0",
"phpunit/phpunit": "^9.3.3" "phpunit/phpunit": "^9.5.8"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

2
config/mail.php
View File

@@ -29,7 +29,7 @@ return [
| mailers below. You are free to add additional mailers as required. | mailers below. You are free to add additional mailers as required.
| |
| Supported: "smtp", "sendmail", "mailgun", "ses", | Supported: "smtp", "sendmail", "mailgun", "ses",
| "postmark", "log", "array" | "postmark", "log", "array", "failover"
| |
*/ */

2
database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php
View File

@@ -14,7 +14,7 @@ return new class extends Migration
public function up() public function up()
{ {
Schema::create('personal_access_tokens', function (Blueprint $table) { Schema::create('personal_access_tokens', function (Blueprint $table) {
$table->bigIncrements('id'); $table->id();
$table->morphs('tokenable'); $table->morphs('tokenable');
$table->string('name'); $table->string('name');
$table->string('token', 64)->unique(); $table->string('token', 64)->unique();

12
resources/lang/en/validation.php
View File

@@ -53,9 +53,9 @@ return [
'array' => 'The :attribute must have more than :value items.', 'array' => 'The :attribute must have more than :value items.',
], ],
'gte' => [ 'gte' => [
'numeric' => 'The :attribute must be greater than or equal :value.', 'numeric' => 'The :attribute must be greater than or equal to :value.',
'file' => 'The :attribute must be greater than or equal :value kilobytes.', 'file' => 'The :attribute must be greater than or equal to :value kilobytes.',
'string' => 'The :attribute must be greater than or equal :value characters.', 'string' => 'The :attribute must be greater than or equal to :value characters.',
'array' => 'The :attribute must have :value items or more.', 'array' => 'The :attribute must have :value items or more.',
], ],
'image' => 'The :attribute must be an image.', 'image' => 'The :attribute must be an image.',
@@ -73,9 +73,9 @@ return [
'array' => 'The :attribute must have less than :value items.', 'array' => 'The :attribute must have less than :value items.',
], ],
'lte' => [ 'lte' => [
'numeric' => 'The :attribute must be less than or equal :value.', 'numeric' => 'The :attribute must be less than or equal to :value.',
'file' => 'The :attribute must be less than or equal :value kilobytes.', 'file' => 'The :attribute must be less than or equal to :value kilobytes.',
'string' => 'The :attribute must be less than or equal :value characters.', 'string' => 'The :attribute must be less than or equal to :value characters.',
'array' => 'The :attribute must not have more than :value items.', 'array' => 'The :attribute must not have more than :value items.',
], ],
'max' => [ 'max' => [

1
tests/Feature/ExampleTest.php
View File

@@ -2,7 +2,6 @@
namespace Tests\Feature; namespace Tests\Feature;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase; use Tests\TestCase;
class ExampleTest extends TestCase class ExampleTest extends TestCase

3
tests/TestCase.php
View File

@@ -2,9 +2,10 @@
namespace Tests; namespace Tests;
use Illuminate\Foundation\Testing\LazilyRefreshDatabase;
use Illuminate\Foundation\Testing\TestCase as BaseTestCase; use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
abstract class TestCase extends BaseTestCase abstract class TestCase extends BaseTestCase
{ {
use CreatesApplication; use CreatesApplication, LazilyRefreshDatabase;
} }