Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Письменов Дмитрий Иванович
/
yourroomads
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 75ae66a2
authored
Oct 17, 2019
by
Jonathan Reinink
Committed by
GitHub
Oct 17, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #50 from miguelcangueiro/upgrade-laravel
Upgrade to Laravel 6
2 parents
ce9dfa4b
4d019534
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
8 deletions
composer.json
composer.lock
database/factories/UserFactory.php
composer.json
View file @
75ae66a
...
...
@@ -5,23 +5,23 @@
"license"
:
"MIT"
,
"type"
:
"project"
,
"require"
:
{
"php"
:
"^7.
1.3
"
,
"php"
:
"^7.
2
"
,
"fideloper/proxy"
:
"^4.0"
,
"fzaninotto/faker"
:
"^1.4"
,
"inertiajs/inertia-laravel"
:
"^0.1"
,
"laravel/framework"
:
"
5.8.*
"
,
"laravel/framework"
:
"
^6.0
"
,
"laravel/tinker"
:
"^1.0"
,
"league/glide"
:
"2.0.x-dev"
,
"reinink/remember-query-strings"
:
"^0.1.0"
,
"tightenco/ziggy"
:
"^0.
6.9
"
"tightenco/ziggy"
:
"^0.
8.0
"
},
"require-dev"
:
{
"barryvdh/laravel-debugbar"
:
"^3.2"
,
"beyondcode/laravel-dump-server"
:
"^1.0"
,
"filp/whoops"
:
"^2.0"
,
"facade/ignition"
:
"^1.4"
,
"fzaninotto/faker"
:
"^1.4"
,
"mockery/mockery"
:
"^1.0"
,
"nunomaduro/collision"
:
"^
2
.0"
,
"phpunit/phpunit"
:
"^
7
.0"
"nunomaduro/collision"
:
"^
3
.0"
,
"phpunit/phpunit"
:
"^
8
.0"
},
"autoload"
:
{
"classmap"
:
[
...
...
composer.lock
View file @
75ae66a
This diff is collapsed.
Click to expand it.
database/factories/UserFactory.php
View file @
75ae66a
<?php
use
Faker\Generator
as
Faker
;
use
Illuminate\Support\Str
;
/*
|--------------------------------------------------------------------------
...
...
@@ -19,7 +20,7 @@ $factory->define(App\User::class, function (Faker $faker) {
'last_name'
=>
$faker
->
lastName
,
'email'
=>
$faker
->
unique
()
->
safeEmail
,
'password'
=>
'secret'
,
'remember_token'
=>
str_
random
(
10
),
'remember_token'
=>
Str
::
random
(
10
),
'owner'
=>
false
,
];
});
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment