L9

Author: dpslwk

.env.example

@@ -24,7 +24,7 @@ PASSPORT_REFRESH_TOKEN_EXPIRE_DAYS=30
 
 BROADCAST_DRIVER=pusher
 CACHE_DRIVER=redis
-FILESYSTEM_DRIVER=local
+FILESYSTEM_DISK=local
 QUEUE_CONNECTION=sync
 SESSION_DRIVER=redis
 SESSION_LIFETIME=120
@@ -122,3 +122,5 @@ MIX_STRIPE_KEY="${STRIPE_KEY}"
 
 #DISCORD_TOKEN=
 #DISCORD_GUILD_ID=
+
+MONEY_DEFAULTS_CURRENCY=GBP

.gitattributes

@@ -1,5 +1,11 @@
 * text=auto
-*.css linguist-vendored
-*.scss linguist-vendored
-*.js linguist-vendored
+
+*.blade.php diff=html
+*.css diff=css
+*.html diff=html
+*.md diff=markdown
+*.php diff=php
+
+/.github export-ignore
 CHANGELOG.md export-ignore
+.styleci.yml export-ignore

.gitignore

@@ -1,21 +1,22 @@
 ### Laravel ###
 /node_modules
+/public/build
 /public/hot
 /public/storage
 /storage/*.key
-/public/build
 /vendor
-/.idea
-/.vscode
-/.vagrant*
+.env
+.env.backup
+.env.production
+.phpunit.result.cache
 Homestead.json
 Homestead.yaml
+auth.json
 npm-debug.log
 yarn-error.log
-.env
-.env.backup
-database/database.sqlite
-.phpunit.result.cache
+/.fleet
+/.idea
+/.vscode
 
 ### OS generated files ###
 .DS_Store
@@ -27,6 +28,7 @@ Icon?
 ehthumbs.db
 Thumbs.db
 
+/.vagrant*
 /public/css
 /public/js
 /public/fonts/vendor

app/Exceptions/Handler.php

@@ -12,17 +12,26 @@
 
 class Handler extends ExceptionHandler
 {
+    /**
+     * A list of exception types with their corresponding custom log levels.
+     *
+     * @var array<class-string<\Throwable>, \Psr\Log\LogLevel::*>
+     */
+    protected $levels = [
+        //
+    ];
+
     /**
      * A list of the exception types that are not reported.
      *
-     * @var array<int, class-string<Throwable>>
+     * @var array<int, class-string<\Throwable>>
      */
     protected $dontReport = [
         //
     ];
 
     /**
-     * A list of the inputs that are never flashed for validation exceptions.
+     * A list of the inputs that are never flashed to the session on validation exceptions.
      *
      * @var array<int, string>
      */

app/Http/Kernel.php

@@ -16,7 +16,7 @@ class Kernel extends HttpKernel
     protected $middleware = [
         // \App\Http\Middleware\TrustHosts::class,
         \App\Http\Middleware\TrustProxies::class,
-        \Fruitcake\Cors\HandleCors::class,
+        \Illuminate\Http\Middleware\HandleCors::class,
         \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
@@ -33,14 +33,15 @@ class Kernel extends HttpKernel
             \App\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
-            // \Illuminate\Session\Middleware\AuthenticateSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
+            // \Illuminate\Routing\Middleware\SubstituteBindings::class,
             \LaravelDoctrine\ORM\Middleware\SubstituteBindings::class,
             \Laravel\Passport\Http\Middleware\CreateFreshApiToken::class,
         ],
 
         'api' => [
+            // \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class,
             'throttle:api',
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
             \LaravelDoctrine\ORM\Middleware\SubstituteBindings::class,
@@ -57,11 +58,12 @@ class Kernel extends HttpKernel
     protected $routeMiddleware = [
         'auth' => \App\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
+        'auth.session' => \Illuminate\Session\Middleware\AuthenticateSession::class,
         '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,
+        'signed' => \App\Http\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequestsWithRedis::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
         'ipcheck' => \App\Http\Middleware\IpCheck::class,

app/Http/Middleware/ValidateSignature.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Routing\Middleware\ValidateSignature as Middleware;
+
+class ValidateSignature extends Middleware
+{
+    /**
+     * The names of the query string parameters that should be ignored.
+     *
+     * @var array<int, string>
+     */
+    protected $except = [
+        // 'fbclid',
+        // 'utm_campaign',
+        // 'utm_content',
+        // 'utm_medium',
+        // 'utm_source',
+        // 'utm_term',
+    ];
+}

app/Listeners/LogSentMessage.php

@@ -8,6 +8,7 @@
 use HMS\Repositories\UserRepository;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Events\MessageSending;
+use Illuminate\Mail\Events\MessageSent;
 
 class LogSentMessage implements ShouldQueue
 {
@@ -48,18 +49,25 @@ public function __construct(
     /**
      * Handle the event.
      *
-     * @param IlluminateMailEventsMessageSending $event
+     * @param MessageSending $event
      *
      * @return void
      */
-    public function handle(MessageSending $event)
+    public function handle(MessageSent $event)
     {
-        // grab the various bits of info from the Swift_Message
-        $messageId = $event->message->getHeaders()->get('message-id')->getId();
-        $toAddresses = $event->message->getHeaders()->get('to')->getNameAddresses();
-        $subject = $event->message->getHeaders()->get('subject')->getValue();
-        $body = $event->message->getBody();
-        $fullString = $event->message->toString();
+        // grab the various bits of info from the Symfony Sent Message
+        $messageId = $event->sent->getMessageId();
+        $toAddresses = collect($event->sent->getOriginalMessage()->getTo())
+            ->mapWithKeys(fn ($a, $k) => [$a->getAddress() => $a->getName() ?: null])
+            ->toArray();
+        $subject = $event->sent->getOriginalMessage()->getSubject();
+        $body = collect(
+            $event->sent->getOriginalMessage()->getBody()->getParts()
+        )
+            ->filter(fn ($tp) => $tp->getMediaSubtype() == 'html')
+            ->first()
+            ->getBody();
+        $fullString = $event->sent->getOriginalMessage()->toString();
 
         $email = new Email($toAddresses, $subject, $body, $fullString, $messageId);
 

app/Providers/AuthServiceProvider.php

@@ -15,7 +15,7 @@
 class AuthServiceProvider extends ServiceProvider
 {
     /**
-     * The policy mappings for the application.
+     * The model to policy mappings for the application.
      *
      * @var array<class-string, class-string>
      */
@@ -37,7 +37,6 @@ public function boot(EntityManagerInterface $em, PasswordStore $passwordStore)
         });
 
         // Passport bits.
-        Passport::routes();
         Passport::cookie(Str::slug(config('app.name'), '_') . '_passport');
         Passport::tokensExpireIn(
             now()->addDays(config('hms.passport_token_expire_days', 15))

app/Providers/EventServiceProvider.php

@@ -15,7 +15,7 @@
 class EventServiceProvider extends ServiceProvider
 {
     /**
-     * The event listener mappings for the application.
+     * The event to listener mappings for the application.
      *
      * @var array<class-string, array<int, class-string>>
      */

app/Providers/HorizonServiceProvider.php

@@ -23,28 +23,22 @@ public function register()
 
     /**
      * Bootstrap any application services.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         parent::boot();
 
         // Horizon::routeSmsNotificationsTo('15556667777');
         // Horizon::routeMailNotificationsTo('example@example.com');
         // Horizon::routeSlackNotificationsTo('slack-webhook-url', '#channel');
-
-        Horizon::night();
     }
 
     /**
      * Register the Horizon gate.
      *
      * This gate determines who can access Horizon in non-local environments.
-     *
-     * @return void
      */
-    protected function gate()
+    protected function gate(): void
     {
         Gate::define('viewHorizon', function ($user) {
             return $user->can('horizon.view');