Skip to content
This repository was archived by the owner on Apr 19, 2022. It is now read-only.

Commit 6643c48

Browse files
committed
Синхронизация с laravel/laravel, тайпхинтинг в фабрике моделей
1 parent 09c360f commit 6643c48

File tree

5 files changed

+6
-4
lines changed

5 files changed

+6
-4
lines changed

config/app.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
/*
167167
* Package Service Providers...
168168
*/
169-
// SocialiteProviders\Manager\ServiceProvider::class,
169+
// SocialiteProviders\Manager\ServiceProvider::class,
170170

171171
/*
172172
* Application Service Providers...
@@ -201,6 +201,7 @@
201201
// 'Artisan' => Illuminate\Support\Facades\Artisan::class,
202202
// 'Auth' => Illuminate\Support\Facades\Auth::class,
203203
// 'Blade' => Illuminate\Support\Facades\Blade::class,
204+
// 'Bus' => Illuminate\Support\Facades\Bus::class,
204205
// 'Cache' => Illuminate\Support\Facades\Cache::class,
205206
// 'Config' => Illuminate\Support\Facades\Config::class,
206207
// 'Cookie' => Illuminate\Support\Facades\Cookie::class,

database/factories/ModelFactory.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111
|
1212
*/
1313

14+
/** @var \Illuminate\Database\Eloquent\Factory $factory */
1415
$factory->define(App\User::class, function (Faker\Generator $faker) {
1516
static $password;
1617

1718
return [
1819
'name' => $faker->name,
19-
'email' => $faker->safeEmail,
20+
'email' => $faker->unique()->safeEmail,
2021
'password' => $password ?: $password = bcrypt('secret'),
2122
'remember_token' => str_random(10),
2223
];

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
"laravel-elixir-webpack-official": "^1.0.2",
1414
"lodash": "^4.14.0",
1515
"vue": "^1.0.26",
16-
"vue-resource": "^0.9.3"
16+
"vue-resource": "^1.0.2"
1717
}
1818
}

resources/assets/js/bootstrap.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ require('vue-resource');
2626
*/
2727

2828
Vue.http.interceptors.push((request, next) => {
29-
request.headers['X-CSRF-TOKEN'] = Laravel.csrfToken;
29+
request.headers.set('X-CSRF-TOKEN', Laravel.csrfToken);
3030

3131
next();
3232
});
File renamed without changes.

0 commit comments

Comments
 (0)