Skip to content

Commit ddf851c

Browse files
author
jeremykenedy
committed
more 5.2 conversion updates
1 parent 0074f7c commit ddf851c

File tree

3 files changed

+23
-25
lines changed

3 files changed

+23
-25
lines changed

app/Http/Controllers/Controller.php

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
<?php namespace App\Http\Controllers;
1+
<?php
22

3-
use Illuminate\Foundation\Bus\DispatchesCommands;
3+
namespace App\Http\Controllers;
4+
5+
use Illuminate\Foundation\Bus\DispatchesJobs;
46
use Illuminate\Routing\Controller as BaseController;
57
use Illuminate\Foundation\Validation\ValidatesRequests;
8+
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
9+
use Illuminate\Foundation\Auth\Access\AuthorizesResources;
610

7-
abstract class Controller extends BaseController {
8-
9-
use DispatchesCommands, ValidatesRequests;
10-
11-
}
11+
class Controller extends BaseController
12+
{
13+
use AuthorizesRequests, AuthorizesResources, DispatchesJobs, ValidatesRequests;
14+
}

composer.json

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,18 @@
3737
]
3838
},
3939
"scripts": {
40-
"post-root-package-install": [
41-
"php -r \"copy('.env.example', '.env');\""
42-
],
43-
"post-create-project-cmd": [
44-
"php artisan key:generate"
45-
],
46-
"post-install-cmd": [
47-
"Illuminate\\Foundation\\ComposerScripts::postInstall",
48-
"php artisan optimize"
49-
],
50-
"post-update-cmd": [
51-
"Illuminate\\Foundation\\ComposerScripts::postUpdate",
52-
"php artisan optimize"
53-
]
40+
"post-install-cmd": [
41+
"php artisan clear-compiled",
42+
"php artisan optimize"
43+
],
44+
"post-update-cmd": [
45+
"php artisan clear-compiled",
46+
"php artisan optimize"
47+
],
48+
"post-create-project-cmd": [
49+
"php -r \"copy('.env.example', '.env');\"",
50+
"php artisan key:generate"
51+
]
5452
},
5553
"config": {
5654
"preferred-install": "dist"

config/app.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,7 @@
130130
*/
131131
Illuminate\Auth\AuthServiceProvider::class,
132132
Illuminate\Broadcasting\BroadcastServiceProvider::class,
133-
Illuminate\Bus\BusServiceProvider::class,
134-
Illuminate\Cache\CacheServiceProvider::class,
133+
Illuminate\Cache\CacheServiceProvider::class, Illuminate\Bus\BusServiceProvider::class,
135134
Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
136135
Illuminate\Cookie\CookieServiceProvider::class,
137136
Illuminate\Database\DatabaseServiceProvider::class,
@@ -154,8 +153,6 @@
154153
* Application Service Providers...
155154
*/
156155
App\Providers\AppServiceProvider::class,
157-
App\Providers\BusServiceProvider::class,
158-
App\Providers\ConfigServiceProvider::class,
159156
App\Providers\EventServiceProvider::class,
160157
App\Providers\RouteServiceProvider::class,
161158
Collective\Html\HtmlServiceProvider::class,

0 commit comments

Comments
 (0)