Merge branch 'shift-24472'

Author: driesvints

.env.example

@@ -1,3 +1,4 @@
+APP_NAME="Laravel.io"
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
@@ -12,6 +13,7 @@ MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
+MAIL_FROM_NAME="${APP_NAME}"
 
 GITHUB_ID=
 GITHUB_SECRET=

app/Exceptions/Handler.php

@@ -2,14 +2,14 @@
 
 namespace App\Exceptions;
 
-use Exception;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Illuminate\Session\TokenMismatchException;
 use Illuminate\Validation\ValidationException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
+use Throwable;
 
 class Handler extends ExceptionHandler
 {
@@ -42,7 +42,7 @@ class Handler extends ExceptionHandler
      *
      * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
      */
-    public function report(Exception $exception)
+    public function report(Throwable $exception)
     {
         parent::report($exception);
     }
@@ -51,9 +51,9 @@ public function report(Exception $exception)
      * Render an exception into an HTTP response.
      *
      * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\Response
+     * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $exception)
     {
         return parent::render($request, $exception);
     }

app/Helpers/HasLikes.php

@@ -17,12 +17,12 @@ protected static function bootHasLikes()
 
     public function likedBy(User $user)
     {
-        $this->likes()->create(['user_id' => $user->id]);
+        $this->likes()->create(['user_id' => $user->id()]);
     }
 
     public function dislikedBy(User $user)
     {
-        optional($this->likes()->where('user_id', $user->id)->first())->delete();
+        optional($this->likes()->where('user_id', $user->id())->first())->delete();
     }
 
     public function likes(): MorphMany
@@ -32,7 +32,7 @@ public function likes(): MorphMany
 
     public function isLikedBy(User $user): bool
     {
-        return $this->likes()->where('user_id', $user->id)->exists();
+        return $this->likes()->where('user_id', $user->id())->exists();
     }
 
     public function likesCount(): int

app/Http/Controllers/Auth/EmailConfirmationController.php

@@ -6,8 +6,8 @@
 use App\Jobs\ConfirmUser;
 use App\Jobs\SendEmailConfirmation;
 use App\User;
-use Auth;
 use Illuminate\Auth\Middleware\Authenticate;
+use Illuminate\Support\Facades\Auth;
 
 class EmailConfirmationController extends Controller
 {

app/Http/Kernel.php

@@ -14,11 +14,12 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middleware = [
+        \App\Http\Middleware\TrustProxies::class,
+        \Fruitcake\Cors\HandleCors::class,
         \App\Http\Middleware\CheckForMaintenanceMode::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
-        \App\Http\Middleware\TrustProxies::class,
     ];
 
     /**
@@ -40,7 +41,7 @@ class Kernel extends HttpKernel
 
         'api' => [
             'throttle:60,1',
-            'bindings',
+            \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
     ];
 
@@ -58,25 +59,9 @@ class Kernel extends HttpKernel
         'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
         'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
     ];
-
-    /**
-     * The priority-sorted list of middleware.
-     *
-     * This forces the listed middleware to always be in the given order.
-     *
-     * @var array
-     */
-    protected $middlewarePriority = [
-        \Illuminate\Session\Middleware\StartSession::class,
-        \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-        \App\Http\Middleware\Authenticate::class,
-        \Illuminate\Routing\Middleware\ThrottleRequests::class,
-        \Illuminate\Session\Middleware\AuthenticateSession::class,
-        \Illuminate\Routing\Middleware\SubstituteBindings::class,
-        \Illuminate\Auth\Middleware\Authorize::class,
-    ];
 }

app/Http/Livewire/Notifications.php

@@ -12,7 +12,8 @@
 
 final class Notifications extends Component
 {
-    use WithPagination, AuthorizesRequests;
+    use AuthorizesRequests;
+    use WithPagination;
 
     public $notificationId;
 

app/Http/Middleware/VerifyCsrfToken.php

@@ -6,13 +6,6 @@
 
 class VerifyCsrfToken extends Middleware
 {
-    /**
-     * Indicates whether the XSRF-TOKEN cookie should be set on the response.
-     *
-     * @var bool
-     */
-    protected $addHttpCookie = true;
-
     /**
      * The URIs that should be excluded from CSRF verification.
      *

app/Models/Reply.php

@@ -34,7 +34,9 @@ final class Reply extends Model
     /**
      * {@inheritdoc}
      */
-    protected $with = ['likes'];
+    protected $with = [
+        'likes',
+    ];
 
     public function id(): int
     {

composer.json

@@ -8,31 +8,32 @@
         "algolia/algoliasearch-client-php": "^2.2",
         "algolia/scout-extended": "^1.9",
         "doctrine/dbal": "^2.5",
-        "facade/ignition": "^1.0",
-        "fideloper/proxy": "^4.0",
+        "facade/ignition": "^2.0",
+        "fideloper/proxy": "^4.2",
+        "fruitcake/laravel-cors": "^1.0",
         "guzzlehttp/guzzle": "^6.3",
-        "laravel/framework": "^6.0",
-        "laravel/horizon": "^3.2.7",
-        "laravel/socialite": "^4.2",
-        "laravel/tinker": "^1.0",
+        "laravel/framework": "^7.0",
+        "laravel/horizon": "^4.0",
+        "laravel/socialite": "^4.3",
+        "laravel/tinker": "^2.0",
+        "laravel/ui": "^2.0",
         "lasserafn/php-initial-avatar-generator": "^2.0",
         "league/commonmark": "^1.0",
         "league/flysystem-aws-s3-v3": "^1.0",
-        "livewire/livewire": "^0.5.2",
+        "livewire/livewire": "^1.0",
         "predis/predis": "^1.1",
         "ramsey/uuid": "^3.7",
         "roave/security-advisories": "dev-master",
-        "spatie/laravel-backup": "^6.4",
-        "spatie/laravel-feed": "^2.0",
-        "spatie/laravel-robots-middleware": "^1.0"
+        "spatie/laravel-backup": "^6.8",
+        "spatie/laravel-feed": "^2.6",
+        "spatie/laravel-robots-middleware": "^1.2"
     },
     "require-dev": {
-        "facade/ignition": "^1.4",
         "fzaninotto/faker": "^1.9",
-        "laravel/browser-kit-testing": "^5.1.3",
-        "mockery/mockery": "^1.0",
-        "nunomaduro/collision": "^3.0",
-        "phpunit/phpunit": "^8.0"
+        "laravel/browser-kit-testing": "^6.0",
+        "mockery/mockery": "^1.3.1",
+        "nunomaduro/collision": "^4.1",
+        "phpunit/phpunit": "^8.5"
     },
     "autoload": {
         "classmap": [