Skip to content

Commit 42af56a

Browse files
authored
Merge pull request #9 from AnowarCST/laravel-7
Laravel 7
2 parents cba0e07 + 59ac7bc commit 42af56a

File tree

7 files changed

+1311
-666
lines changed

7 files changed

+1311
-666
lines changed

Jenkinsfile

Lines changed: 0 additions & 11 deletions
This file was deleted.

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
## About Repository
55

6-
A very simple Laravel 6/7 + Vue 2 + AdminLTE 3 based Curd Starter template for SPA Application.
6+
A very simple Laravel 7 + Vue 2 + AdminLTE 3 based Curd Starter template for SPA Application.
77
<p align="center">
88
<img src="https://i.imgur.com/mZAHbUL.png">
99
<img src="https://i.imgur.com/3hhoQnq.png">
@@ -13,7 +13,7 @@ A very simple Laravel 6/7 + Vue 2 + AdminLTE 3 based Curd Starter template for S
1313

1414
## Tech Specification
1515

16-
- Laravel 6 + 7 (Branch: [laravel-7](https://github.com/AnowarCST/laravel-vue-crud-starter/tree/laravel-7))
16+
- Laravel 7
1717
- Vue 2 + VueRouter + vue-progressbar + sweetalert2 + laravel-vue-pagination
1818
- Laravel Passport
1919
- Admin LTE 3 + Bootstrap 4 + Font Awesome 5
@@ -55,7 +55,7 @@ A very simple Laravel 6/7 + Vue 2 + AdminLTE 3 based Curd Starter template for S
5555
- `php artisan passport:install`
5656
- Application http://localhost:8008/
5757
- Adminer for Database http://localhost:8080/
58-
- host: yourIP:3307, user: root, Password: 123456
58+
- DBhost: yourIP:3307, user: root, Password: 123456
5959

6060

6161
## Unit Test

app/Exceptions/Handler.php

Lines changed: 10 additions & 6 deletions
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,10 +29,12 @@ class Handler extends ExceptionHandler
2929
/**
3030
* Report or log an exception.
3131
*
32-
* @param \Exception $exception
32+
* @param \Throwable $exception
3333
* @return void
34+
*
35+
* @throws \Exception
3436
*/
35-
public function report(Exception $exception)
37+
public function report(Throwable $exception)
3638
{
3739
parent::report($exception);
3840
}
@@ -41,10 +43,12 @@ public function report(Exception $exception)
4143
* Render an exception into an HTTP response.
4244
*
4345
* @param \Illuminate\Http\Request $request
44-
* @param \Exception $exception
45-
* @return \Illuminate\Http\Response
46+
* @param \Throwable $exception
47+
* @return \Symfony\Component\HttpFoundation\Response
48+
*
49+
* @throws \Throwable
4650
*/
47-
public function render($request, Exception $exception)
51+
public function render($request, Throwable $exception)
4852
{
4953
return parent::render($request, $exception);
5054
}

composer.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,19 @@
88
],
99
"license": "MIT",
1010
"require": {
11-
"php": "^7.2",
11+
"php": "^7.2.5",
1212
"fideloper/proxy": "^4.0",
13-
"laravel/framework": "^6.2",
13+
"laravel/framework": "^7.0",
1414
"laravel/passport": "^8.3",
15-
"laravel/tinker": "^2.0"
15+
"laravel/tinker": "^2.0",
16+
"laravel/ui": "^2.0"
1617
},
1718
"require-dev": {
18-
"facade/ignition": "^1.4",
19+
"facade/ignition": "^2.0",
1920
"fzaninotto/faker": "^1.4",
2021
"mockery/mockery": "^1.0",
21-
"nunomaduro/collision": "^3.0",
22-
"phpunit/phpunit": "^8.0"
22+
"nunomaduro/collision": "^4.1",
23+
"phpunit/phpunit": "^8.5"
2324
},
2425
"config": {
2526
"optimize-autoloader": true,

0 commit comments

Comments
 (0)