Merge branch '8.x'
# Conflicts: # CHANGELOG.md # tests/Feature/ExampleTest.php # tests/Unit/ExampleTest.php
This commit is contained in:
3
database/.gitignore
vendored
3
database/.gitignore
vendored
@@ -1,2 +1 @@
|
||||
*.sqlite
|
||||
*.sqlite-journal
|
||||
*.sqlite*
|
||||
|
||||
@@ -23,8 +23,8 @@ class UserFactory extends Factory
|
||||
public function definition()
|
||||
{
|
||||
return [
|
||||
'name' => $this->faker->name,
|
||||
'email' => $this->faker->unique()->safeEmail,
|
||||
'name' => $this->faker->name(),
|
||||
'email' => $this->faker->unique()->safeEmail(),
|
||||
'email_verified_at' => now(),
|
||||
'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
|
||||
'remember_token' => Str::random(10),
|
||||
|
||||
Reference in New Issue
Block a user