diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index ede386128b..bc8f6e9fd1 100755 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -107,11 +107,9 @@ class Handler extends ExceptionHandler * Convert an authentication exception into an unauthenticated response. * * @param \Illuminate\Http\Request $request - * @param \Illuminate\Auth\AuthenticationException $exception - * * @return \Illuminate\Http\Response */ - protected function unauthenticated($request, AuthenticationException $exception) + protected function unauthenticated($request) { if ($request->expectsJson()) { return response()->json(['error' => 'Unauthenticated.'], 401); diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php index 5eb4f8e4dc..d91227f2c0 100644 --- a/app/Http/Controllers/Auth/PasswordController.php +++ b/app/Http/Controllers/Auth/PasswordController.php @@ -23,6 +23,7 @@ use Illuminate\Support\Facades\Password; * Class PasswordController * * @package FireflyIII\Http\Controllers\Auth + * @method getEmailSubject */ class PasswordController extends Controller { diff --git a/config/auth.php b/config/auth.php index edada161de..9346dbd727 100755 --- a/config/auth.php +++ b/config/auth.php @@ -69,11 +69,6 @@ return [ 'driver' => 'eloquent', 'model' => FireflyIII\User::class, ], - - // 'users' => [ - // 'driver' => 'database', - // 'table' => 'users', - // ], ], /* diff --git a/config/cache.php b/config/cache.php index 98207bf6de..39461ff24d 100755 --- a/config/cache.php +++ b/config/cache.php @@ -57,7 +57,6 @@ return [ env('MEMCACHED_PASSWORD'), ], 'options' => [ - // Memcached::OPT_CONNECT_TIMEOUT => 2000, ], 'servers' => [ [ diff --git a/config/twigbridge.php b/config/twigbridge.php index 432746a282..886f44d6e1 100644 --- a/config/twigbridge.php +++ b/config/twigbridge.php @@ -41,7 +41,6 @@ return [ 'debug' => env('APP_DEBUG', false), // The charset used by the templates. - // default: utf-8 'charset' => 'utf-8', // The base template class to use for generated templates. diff --git a/routes/web.php b/routes/web.php index c613156818..e6573fa07b 100755 --- a/routes/web.php +++ b/routes/web.php @@ -275,8 +275,6 @@ Route::group( Route::get('/piggy-banks/remove/{piggyBank}', ['uses' => 'PiggyBankController@remove', 'as' => 'piggy-banks.removeMoney']); Route::get('/piggy-banks/add-money/{piggyBank}', ['uses' => 'PiggyBankController@addMobile', 'as' => 'piggy-banks.add-money-mobile']); Route::get('/piggy-banks/remove-money/{piggyBank}', ['uses' => 'PiggyBankController@removeMobile', 'as' => 'piggy-banks.remove-money-mobile']); - // Route::post('/piggy-banks/add-money/{piggyBank}', ['uses' => 'PiggyBankController@postAddMobile', 'as' => 'piggy-banks.post-add-mobile']); - // Route::post('/piggy-banks/remove-money/{piggyBank}', ['uses' => 'PiggyBankController@postRemoveMobile', 'as' => 'piggy-banks.post-remove-mobile']); Route::get('/piggy-banks/create', ['uses' => 'PiggyBankController@create', 'as' => 'piggy-banks.create']); Route::get('/piggy-banks/edit/{piggyBank}', ['uses' => 'PiggyBankController@edit', 'as' => 'piggy-banks.edit']); Route::get('/piggy-banks/delete/{piggyBank}', ['uses' => 'PiggyBankController@delete', 'as' => 'piggy-banks.delete']);