Skip to content

Commit f1954dc

Browse files
authored
Merge pull request #72 from tuxonice/update-v1/laravel-8
Update to Laravel 8
2 parents f13bf7a + 62cbca9 commit f1954dc

20 files changed

+1425
-1518
lines changed

app/Http/Controllers/Auth/RegisterController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
namespace App\Http\Controllers\Auth;
44

55
use App\Http\Controllers\Controller;
6+
use App\Models\User;
67
use App\Providers\RouteServiceProvider;
7-
use App\User;
88
use Illuminate\Foundation\Auth\RegistersUsers;
99
use Illuminate\Support\Facades\Hash;
1010
use Illuminate\Support\Facades\Validator;
@@ -60,7 +60,7 @@ protected function validator(array $data)
6060
* Create a new user instance after a valid registration.
6161
*
6262
* @param array $data
63-
* @return \App\User
63+
* @return \App\Models\User
6464
*/
6565
protected function create(array $data)
6666
{

app/User.php renamed to app/Models/User.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22

3-
namespace App;
3+
namespace App\Models;
44

5-
use Illuminate\Contracts\Auth\MustVerifyEmail;
5+
use Illuminate\Database\Eloquent\Factories\HasFactory;
66
use Illuminate\Foundation\Auth\User as Authenticatable;
77
use Illuminate\Notifications\Notifiable;
88

@@ -19,22 +19,22 @@
1919
* @property \Illuminate\Support\Carbon|null $updated_at
2020
* @property-read \Illuminate\Notifications\DatabaseNotificationCollection|\Illuminate\Notifications\DatabaseNotification[] $notifications
2121
* @property-read int|null $notifications_count
22-
* @method static \Illuminate\Database\Eloquent\Builder|\App\User newModelQuery()
23-
* @method static \Illuminate\Database\Eloquent\Builder|\App\User newQuery()
24-
* @method static \Illuminate\Database\Eloquent\Builder|\App\User query()
25-
* @method static \Illuminate\Database\Eloquent\Builder|\App\User whereCreatedAt($value)
26-
* @method static \Illuminate\Database\Eloquent\Builder|\App\User whereEmail($value)
27-
* @method static \Illuminate\Database\Eloquent\Builder|\App\User whereEmailVerifiedAt($value)
28-
* @method static \Illuminate\Database\Eloquent\Builder|\App\User whereId($value)
29-
* @method static \Illuminate\Database\Eloquent\Builder|\App\User whereName($value)
30-
* @method static \Illuminate\Database\Eloquent\Builder|\App\User wherePassword($value)
31-
* @method static \Illuminate\Database\Eloquent\Builder|\App\User whereRememberToken($value)
32-
* @method static \Illuminate\Database\Eloquent\Builder|\App\User whereUpdatedAt($value)
22+
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User newModelQuery()
23+
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User newQuery()
24+
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User query()
25+
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User whereCreatedAt($value)
26+
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User whereEmail($value)
27+
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User whereEmailVerifiedAt($value)
28+
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User whereId($value)
29+
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User whereName($value)
30+
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User wherePassword($value)
31+
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User whereRememberToken($value)
32+
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User whereUpdatedAt($value)
3333
* @mixin \Eloquent
3434
*/
3535
class User extends Authenticatable
3636
{
37-
use Notifiable;
37+
use Notifiable, HasFactory;
3838

3939
/**
4040
* The attributes that are mass assignable.

app/Providers/AppServiceProvider.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace App\Providers;
44

5+
use Illuminate\Pagination\Paginator;
56
use Illuminate\Support\ServiceProvider;
67

78
class AppServiceProvider extends ServiceProvider
@@ -23,6 +24,6 @@ public function register()
2324
*/
2425
public function boot()
2526
{
26-
//
27+
Paginator::useBootstrap();
2728
}
2829
}

composer.json

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@
88
],
99
"license": "MIT",
1010
"require": {
11-
"php": "^7.2.5",
11+
"php": "^7.3.0",
1212
"doctrine/dbal": "^2.10",
1313
"fideloper/proxy": "^4.0",
1414
"jeroennoten/laravel-adminlte": "^3.0",
15-
"laravel/framework": "^7.0",
15+
"laravel/framework": "^8.0",
1616
"laravel/tinker": "^2.0",
17-
"laravel/ui": "^2.0"
17+
"laravel/ui": "^3.0"
1818
},
1919
"require-dev": {
2020
"barryvdh/laravel-ide-helper": "^2.6",
21-
"facade/ignition": "^2.0",
21+
"facade/ignition": "^2.3.6",
2222
"fzaninotto/faker": "^1.4",
2323
"mockery/mockery": "^1.0",
24-
"nunomaduro/collision": "^4.1",
25-
"phpunit/phpunit": "^8.5"
24+
"nunomaduro/collision": "^5.1",
25+
"phpunit/phpunit": "^9.0"
2626
},
2727
"config": {
2828
"optimize-autoloader": true,
@@ -36,12 +36,10 @@
3636
},
3737
"autoload": {
3838
"psr-4": {
39-
"App\\": "app/"
40-
},
41-
"classmap": [
42-
"database/seeds",
43-
"database/factories"
44-
]
39+
"App\\": "app/",
40+
"Database\\Factories\\": "database/factories/",
41+
"Database\\Seeders\\": "database/seeders/"
42+
}
4543
},
4644
"autoload-dev": {
4745
"psr-4": {

0 commit comments

Comments
 (0)