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

Merge pull request #50 from miguelcangueiro/upgrade-laravel

Browse source 
Upgrade to Laravel 6
This commit is contained in:
Jonathan Reinink 2019-10-17 17:32:29 -04:00 • committed by GitHub
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", "license": "MIT",
"type": "project", "type": "project",
"require": { "require": {
"php": "^7.1.3", "php": "^7.2",
"fideloper/proxy": "^4.0", "fideloper/proxy": "^4.0",
"fzaninotto/faker": "^1.4",
"inertiajs/inertia-laravel": "^0.1", "inertiajs/inertia-laravel": "^0.1",
"laravel/framework": "5.8.*", "laravel/framework": "^6.0",
"laravel/tinker": "^1.0", "laravel/tinker": "^1.0",
"league/glide": "2.0.x-dev", "league/glide": "2.0.x-dev",
"reinink/remember-query-strings": "^0.1.0", "reinink/remember-query-strings": "^0.1.0",
"tightenco/ziggy": "^0.6.9" "tightenco/ziggy": "^0.8.0"
}, },
"require-dev": { "require-dev": {
"barryvdh/laravel-debugbar": "^3.2", "barryvdh/laravel-debugbar": "^3.2",
"beyondcode/laravel-dump-server": "^1.0", "beyondcode/laravel-dump-server": "^1.0",
"filp/whoops": "^2.0", "facade/ignition": "^1.4",
"fzaninotto/faker": "^1.4",
"mockery/mockery": "^1.0", "mockery/mockery": "^1.0",
"nunomaduro/collision": "^2.0", "nunomaduro/collision": "^3.0",
"phpunit/phpunit": "^7.0" "phpunit/phpunit": "^8.0"
}, },
"autoload": { "autoload": {
"classmap": [ "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 <?php
use Faker\Generator as Faker; 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, 'last_name' => $faker->lastName,
'email' => $faker->unique()->safeEmail, 'email' => $faker->unique()->safeEmail,
'password' => 'secret', 'password' => 'secret',
'remember_token' => str_random(10), 'remember_token' => Str::random(10),
'owner' => false, 'owner' => false,
]; ];
}); });