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

Merge branch 'develop' of github.com:laravel/laravel into develop

Browse Source
This commit is contained in:
Taylor Otwell
2019-02-14 11:03:51 -06:00
parent df4ecb9c83 0904307e6a
commit 2f2fe98aa9
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -19,7 +19,7 @@
"fzaninotto/faker": "^1.4",
"mockery/mockery": "^1.0",
"nunomaduro/collision": "^2.0",
"phpunit/phpunit": "^8.0"
"phpunit/phpunit": "^7.5"
},
"config": {
"optimize-autoloader": true,

3
database/factories/UserFactory.php
View File

@@ -1,6 +1,7 @@
<?php
use App\User;
use Illuminate\Support\Str;
use Faker\Generator as Faker;
/*
@@ -20,6 +21,6 @@ $factory->define(User::class, function (Faker $faker) {
'email' => $faker->unique()->safeEmail,
'email_verified_at' => now(),
'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
'remember_token' => str_random(10),
'remember_token' => Str::random(10),
];
});

12
phpunit.xml
View File

@@ -23,11 +23,11 @@
</whitelist>
</filter>
<php>
<env name="APP_ENV" value="testing"/>
<env name="BCRYPT_ROUNDS" value="4"/>
<env name="CACHE_DRIVER" value="array"/>
<env name="MAIL_DRIVER" value="array"/>
<env name="QUEUE_CONNECTION" value="sync"/>
<env name="SESSION_DRIVER" value="array"/>
<server name="APP_ENV" value="testing"/>
<server name="BCRYPT_ROUNDS" value="4"/>
<server name="CACHE_DRIVER" value="array"/>
<server name="MAIL_DRIVER" value="array"/>
<server name="QUEUE_CONNECTION" value="sync"/>
<server name="SESSION_DRIVER" value="array"/>
</php>
</phpunit>