Merge branch 'develop' into patch-1

Author: DaneEveritt

CHANGELOG.md

@@ -3,6 +3,10 @@ This file is a running track of new features and fixes to each version of the pa
 
 This project follows [Semantic Versioning](http://semver.org) guidelines.
 
+## v0.7.12 (Derelict Dermodactylus)
+### Updated
+* Upgraded core to use Laravel `5.7.14`.
+
 ## v0.7.11 (Derelict Dermodactylus)
 ### Fixed
 * Fixes an issue with certain systems not handling an API folder that was named `API` but referenced as `Api` in the namespace.

app/Console/Commands/Environment/AppSettingsCommand.php

@@ -132,7 +132,7 @@ public function handle()
         );
 
         $selected = $this->config->get('queue.default', 'redis');
-        $this->variables['QUEUE_DRIVER'] = $this->option('queue') ?? $this->choice(
+        $this->variables['QUEUE_CONNECTION'] = $this->option('queue') ?? $this->choice(
             trans('command/messages.environment.app.queue_driver'),
             self::ALLOWED_QUEUE_DRIVERS,
             array_key_exists($selected, self::ALLOWED_QUEUE_DRIVERS) ? $selected : null

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -27,6 +27,6 @@ protected function sendResetLinkFailedResponse(Request $request, $response): Red
         // exist on the system.
         event(new FailedPasswordReset($request->ip(), $request->input('email')));
 
-        return $this->sendResetLinkResponse(Password::RESET_LINK_SENT);
+        return $this->sendResetLinkResponse($request, Password::RESET_LINK_SENT);
     }
 }

app/Http/Controllers/Auth/LoginController.php

@@ -242,6 +242,6 @@ private function getField(string $input = null): string
      */
     private function fireFailedLoginEvent(Authenticatable $user = null, array $credentials = [])
     {
-        event(new Failed($user, $credentials));
+        event(new Failed(config('auth.defaults.guard'), $user, $credentials));
     }
 }

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -3,6 +3,7 @@
 namespace Pterodactyl\Http\Controllers\Auth;
 
 use Illuminate\Support\Str;
+use Illuminate\Http\Request;
 use Prologue\Alerts\AlertsMessageBag;
 use Illuminate\Contracts\Hashing\Hasher;
 use Illuminate\Auth\Events\PasswordReset;
@@ -109,10 +110,11 @@ protected function resetPassword($user, $password)
     /**
      * Get the response for a successful password reset.
      *
-     * @param string $response
+     * @param  \Illuminate\Http\Request  $request
+     * @param  string  $response
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
      */
-    protected function sendResetResponse($response)
+    protected function sendResetResponse(Request $request, $response)
     {
         if ($this->hasTwoFactor) {
             $this->alerts->success('Your password was successfully updated. Please log in to continue.')->flash();

composer.json

@@ -24,7 +24,7 @@
         "hashids/hashids": "^2.0",
         "igaster/laravel-theme": "^2.0.6",
         "laracasts/utilities": "^3.0",
-        "laravel/framework": "5.6.*",
+        "laravel/framework": "~5.7.14",
         "laravel/tinker": "^1.0",
         "lord/laroute": "^2.4",
         "matriphe/iso-639": "^1.2",
@@ -34,15 +34,15 @@
         "prologue/alerts": "^0.4",
         "ramsey/uuid": "^3.7",
         "s1lentium/iptools": "^1.1",
-        "sofa/eloquence-base": "v5.6",
+        "sofa/eloquence-base": "v5.6.2",
         "sofa/eloquence-validable": "v5.6",
-        "spatie/laravel-fractal": "^5.3",
+        "spatie/laravel-fractal": "^5.4",
         "webmozart/assert": "^1.2",
         "znck/belongs-to-through": "^2.3"
     },
     "require-dev": {
-        "barryvdh/laravel-debugbar": "^3.1",
-        "barryvdh/laravel-ide-helper": "^2.4",
+        "barryvdh/laravel-debugbar": "^3.2",
+        "barryvdh/laravel-ide-helper": "^2.5",
         "codedungeon/phpunit-result-printer": "^0.17.1",
         "filp/whoops": "^2.1",
         "friendsofphp/php-cs-fixer": "^2.11.1",