atasistro
/
pingcrm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #50 from miguelcangueiro/upgrade-laravel 

Upgrade to Laravel 6
This commit is contained in:
Jonathan Reinink 2019-10-17 17:32:29 -04:00 committed by GitHub
parent ce9dfa4beb 4d01953486
commit 75ae66a2c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 570 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
composer.json
View File

@ -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": [

837
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

3
database/factories/UserFactory.php
View File

@ -1,6 +1,7 @@
<?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,
];
});