Skip to content

Commit df813ec

Browse files
committed
Upgrading for Laravel 7.0 & PHP 7.4
1 parent c7eaec3 commit df813ec

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+27341
-67590
lines changed

.editorconfig

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
end_of_line = lf
6+
insert_final_newline = true
7+
indent_style = space
8+
indent_size = 4
9+
trim_trailing_whitespace = true
10+
11+
[*.md]
12+
trim_trailing_whitespace = false
13+
14+
[*.{yml,yaml}]
15+
indent_size = 2

.env.example

+10-3
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,27 @@ DB_PASSWORD=secret
1515

1616
BROADCAST_DRIVER=log
1717
CACHE_DRIVER=file
18+
QUEUE_CONNECTION=sync
1819
SESSION_DRIVER=file
1920
SESSION_LIFETIME=120
20-
QUEUE_DRIVER=sync
2121

22-
REDIS_HOST=redis
22+
REDIS_HOST=127.0.0.1
2323
REDIS_PASSWORD=null
2424
REDIS_PORT=6379
2525

26-
MAIL_DRIVER=smtp
26+
MAIL_MAILER=smtp
2727
MAIL_HOST=smtp.mailtrap.io
2828
MAIL_PORT=2525
2929
MAIL_USERNAME=null
3030
MAIL_PASSWORD=null
3131
MAIL_ENCRYPTION=null
32+
MAIL_FROM_ADDRESS=null
33+
MAIL_FROM_NAME="${APP_NAME}"
34+
35+
AWS_ACCESS_KEY_ID=
36+
AWS_SECRET_ACCESS_KEY=
37+
AWS_DEFAULT_REGION=us-east-1
38+
AWS_BUCKET=
3239

3340
PUSHER_APP_ID=
3441
PUSHER_APP_KEY=

.gitignore

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
/public/storage
44
/storage/*.key
55
/vendor
6-
/.idea
7-
/.vscode
8-
/.vagrant
6+
.env
7+
.env.backup
8+
.phpunit.result.cache
99
Homestead.json
1010
Homestead.yaml
1111
npm-debug.log
1212
yarn-error.log
13-
.env

.styleci.yml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
php:
2+
preset: laravel
3+
disabled:
4+
- unused_use
5+
finder:
6+
not-name:
7+
- index.php
8+
- server.php
9+
js:
10+
finder:
11+
not-name:
12+
- webpack.mix.js
13+
css: true

CHANGELOG.md

-143
This file was deleted.

readme.md renamed to README.md

+23-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
## Prerequisites ##
55

6-
- Docker
7-
- Docker-compose
6+
- Docker >= 17.06 CE
7+
- Docker Compose
88
- Make
99
- Git
1010

@@ -27,6 +27,19 @@ Execute in a terminal
2727
make install
2828
```
2929

30+
31+
If you don't have **make** installed, you can install it with
32+
33+
```
34+
sudo apt install make
35+
```
36+
37+
38+
Now you can access the application via http://localhost:8000.
39+
40+
**There is no need to run ```php artisan serve```. PHP is already running in a dedicated container.**
41+
42+
3043
## Desinstall ##
3144

3245
Execute in a terminal
@@ -63,3 +76,11 @@ Into a container
6376
docker exec -ti NAME_CONTAINER bash
6477
```
6578

79+
80+
## Contributing
81+
82+
Do not hesitate to contribute to the project by adapting or adding features ! Bug reports or pull requests are welcome.
83+
84+
## License
85+
86+
This project is released under the [MIT](http://opensource.org/licenses/MIT) license.

app/Console/Kernel.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ class Kernel extends ConsoleKernel
2424
*/
2525
protected function schedule(Schedule $schedule)
2626
{
27-
// $schedule->command('inspire')
28-
// ->hourly();
27+
// $schedule->command('inspire')->hourly();
2928
}
3029

3130
/**

app/Exceptions/Handler.php

+10-8
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace App\Exceptions;
44

5-
use Exception;
65
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
6+
use Throwable;
77

88
class Handler extends ExceptionHandler
99
{
@@ -29,12 +29,12 @@ class Handler extends ExceptionHandler
2929
/**
3030
* Report or log an exception.
3131
*
32-
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
33-
*
34-
* @param \Exception $exception
32+
* @param \Throwable $exception
3533
* @return void
34+
*
35+
* @throws \Exception
3636
*/
37-
public function report(Exception $exception)
37+
public function report(Throwable $exception)
3838
{
3939
parent::report($exception);
4040
}
@@ -43,10 +43,12 @@ public function report(Exception $exception)
4343
* Render an exception into an HTTP response.
4444
*
4545
* @param \Illuminate\Http\Request $request
46-
* @param \Exception $exception
47-
* @return \Illuminate\Http\Response
46+
* @param \Throwable $exception
47+
* @return \Symfony\Component\HttpFoundation\Response
48+
*
49+
* @throws \Throwable
4850
*/
49-
public function render($request, Exception $exception)
51+
public function render($request, Throwable $exception)
5052
{
5153
return parent::render($request, $exception);
5254
}

app/Http/Controllers/Auth/ForgotPasswordController.php

-32
This file was deleted.

app/Http/Controllers/Auth/LoginController.php

-39
This file was deleted.

0 commit comments

Comments
 (0)