Skip to content

Commit dd38099

Browse files
committed
update package
1 parent e2f2ea6 commit dd38099

File tree

3 files changed

+2148
-1401
lines changed

3 files changed

+2148
-1401
lines changed
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?php
2+
3+
namespace App\Http\Controllers\Auth;
4+
5+
use App\Http\Controllers\Controller;
6+
use App\Providers\RouteServiceProvider;
7+
use Illuminate\Foundation\Auth\ConfirmsPasswords;
8+
9+
class ConfirmPasswordController extends Controller
10+
{
11+
/*
12+
|--------------------------------------------------------------------------
13+
| Confirm Password Controller
14+
|--------------------------------------------------------------------------
15+
|
16+
| This controller is responsible for handling password confirmations and
17+
| uses a simple trait to include the behavior. You're free to explore
18+
| this trait and override any functions that require customization.
19+
|
20+
*/
21+
22+
use ConfirmsPasswords;
23+
24+
/**
25+
* Where to redirect users when the intended url fails.
26+
*
27+
* @var string
28+
*/
29+
protected $redirectTo = RouteServiceProvider::HOME;
30+
31+
/**
32+
* Create a new controller instance.
33+
*
34+
* @return void
35+
*/
36+
public function __construct()
37+
{
38+
$this->middleware('auth');
39+
}
40+
}

laravel/composer.json

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,33 @@
55
"license": "MIT",
66
"type": "project",
77
"require": {
8-
"php": "^7.0",
8+
"php": "^7.2",
99
"auroralzdf/big-file-upload": "^2.0",
10-
"baijunyao/laravel-scout-elasticsearch": "^2.1",
11-
"barryvdh/laravel-cors": "^0.11.2",
12-
"fideloper/proxy": "^3.0",
10+
"baijunyao/laravel-scout-elasticsearch": "^5.1",
11+
"fideloper/proxy": "^4.0",
1312
"guzzlehttp/guzzle": "^6.3",
14-
"hhxsv5/laravel-s": "~3.5.0",
15-
"jaeger/querylist": "^4.0",
13+
"hhxsv5/laravel-s": "~3.7.0",
14+
"jaeger/querylist": "^4.2",
1615
"jenssegers/agent": "^2.6",
1716
"jxlwqq/chinese-typesetting": "^1.2",
18-
"laravel/framework": "5.5.*",
19-
"laravel/tinker": "^1.0",
17+
"laravel/framework": "^6.2",
18+
"laravel/tinker": "^2.0",
2019
"lisgroup/curl-http": "^1.2",
2120
"orangehill/iseed": "^2.6",
22-
"phpoffice/phpspreadsheet": "^1.6",
21+
"phpoffice/phpspreadsheet": "^1.13",
2322
"predis/predis": "^1.1",
2423
"qiniu/php-sdk": "^7.2",
25-
"tymon/jwt-auth": "1.*@rc",
26-
"vinkla/hashids": "3.3.0",
24+
"tymon/jwt-auth": "1.0",
25+
"vinkla/hashids": "^7.0",
2726
"y-ui/laravel-running-time": "^1.1",
2827
"zhuzhichao/ip-location-zh": "^2.4"
2928
},
3029
"require-dev": {
31-
"filp/whoops": "~2.0",
32-
"fzaninotto/faker": "~1.4",
33-
"mockery/mockery": "~1.0",
34-
"nunomaduro/collision": "^2.0",
35-
"phpunit/phpunit": "~6.0",
36-
"symfony/thanks": "^1.0"
30+
"facade/ignition": "^1.4",
31+
"fzaninotto/faker": "^1.9.1",
32+
"mockery/mockery": "^1.0",
33+
"nunomaduro/collision": "^3.0",
34+
"phpunit/phpunit": "^8.0"
3735
},
3836
"autoload": {
3937
"classmap": [

0 commit comments

Comments
 (0)