Skip to content

Commit b1ab964

Browse files
committed
Update for Laravel 5.5
1 parent 71fdfd3 commit b1ab964

File tree

2 files changed

+21
-9
lines changed

2 files changed

+21
-9
lines changed

README.md

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,32 @@ This package adds the routes under `genealabs/laravel-caffeine`. Please verify
2424
that these don't collide with your existing routes.
2525

2626
### Dependencies
27-
- Your project must be running Laravel 5.1 (LTS) or 5.3 (CURRENT).
27+
- Your project must be running one of the following Laravel versions:
28+
- 5.1 (LTS)
29+
- 5.3
30+
- 5.4
31+
- 5.5 (LTS)
2832
- PHP 7.0.0 or higher.
2933

3034
## Installation
31-
1. Installation for Laravel LTS (5.1) or CURRENT (5.3):
32-
35+
For Laravel 5.2, follow the directions here: https://github.com/GeneaLabs/laravel-caffeine/tree/166e2ca08af7cc62a59360f33e03d1cb8478df6a
36+
37+
1. Install the package:
3338
```sh
3439
composer require genealabs/laravel-caffeine
3540
```
3641

37-
For Laravel 5.2, follow the directions here: https://github.com/GeneaLabs/laravel-caffeine/tree/166e2ca08af7cc62a59360f33e03d1cb8478df6a
3842

39-
2. Add the service provider entry in `config/app.php`:
43+
2. **This is only required for Laravel 5.4 or below:**
44+
Add the service provider entry in `config/app.php`:
4045
```php
4146
// 'providers' => [
4247
GeneaLabs\LaravelCaffeine\Providers\LaravelCaffeineService::class,
4348
// ],
4449
```
4550

46-
3. You no longer have to register the middleware manually. If you have done so
47-
previously, please remove the following middleware from `app/Http/Kernel.php`:
51+
3. If you have previously registered the middleware, please remove the following
52+
middleware from `app/Http/Kernel.php`:
4853
```php
4954
// protected $middleware = [
5055
GeneaLabs\LaravelCaffeine\Http\Middleware\LaravelCaffeineDripMiddleware::class,

composer.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,14 @@
1515
},
1616
"require": {
1717
"php": ">=7.0.0",
18-
"illuminate/support": "5.1.* || 5.3.* || 5.4.*",
19-
"illuminate/routing": "5.1.* || 5.3.* || 5.4.*"
18+
"illuminate/support": "5.1.* || 5.3.* || 5.4.* || 5.5.*",
19+
"illuminate/routing": "5.1.* || 5.3.* || 5.4.* || 5.5.*"
20+
},
21+
"extra": {
22+
"laravel": {
23+
"providers": [
24+
"GeneaLabs\\LaravelCaffeine\\Providers\\LaravelCaffeineService"
25+
]
26+
}
2027
}
2128
}

0 commit comments

Comments
 (0)