Resolve upstream conflict

Author: nickfls

src/Event.php

@@ -16,7 +16,7 @@ final class Event implements WebhookEvent
     /**
      * Create new Event.
      *
-     * @param array $attributes
+     * @param  array  $attributes
      */
     public function __construct($attributes)
     {

src/Jobs/HandleDelivered.php

@@ -20,7 +20,7 @@ class HandleDelivered
     /**
      * Create new Job.
      *
-     * @param Spatie\WebhookClient\Models\WebhookCall $webhookCall
+     * @param  Spatie\WebhookClient\Models\WebhookCall  $webhookCall
      */
     public function __construct(WebhookCall $webhookCall)
     {

src/LobSignatureValidator.php

@@ -26,9 +26,8 @@ class LobSignatureValidator implements SignatureValidator
     /**
      * True if the signature has been valiates.
      *
-     * @param  Illuminate\Http\Request       $request
-     * @param  Spatie\WebhookClient\WebhookConfig $config
-     *
+     * @param  Illuminate\Http\Request  $request
+     * @param  Spatie\WebhookClient\WebhookConfig  $config
      * @return bool
      */
     public function isValid(Request $request, WebhookConfig $config): bool
@@ -53,7 +52,7 @@ public function isValid(Request $request, WebhookConfig $config): bool
     /**
      * Compile the payload.
      *
-     * @param  Illuminate\Http\Request       $request
+     * @param  Illuminate\Http\Request  $request
      * @return string
      */
     protected function payload(Request $request): string

src/LobWebhooksController.php

@@ -12,8 +12,8 @@ class LobWebhooksController
     /**
      * Invoke controller method.
      *
-     * @param  \Illuminate\Http\Request $request
-     * @param  string|null $configKey
+     * @param  \Illuminate\Http\Request  $request
+     * @param  string|null  $configKey
      * @return \Illuminate\Http\Response
      */
     public function __invoke(Request $request, string $configKey = null)

src/Webhook.php

@@ -8,8 +8,8 @@ class Webhook
      * Validate and raise an appropriate event.
      *
      * @param  $payload
-     * @param  array $signature
-     * @param  string $secret
+     * @param  array  $signature
+     * @param  string  $secret
      * @return BinaryCats\LobWebhooks\Event
      */
     public static function constructEvent(array $payload, array $signature, string $secret): Event

src/WebhookSignature.php

@@ -53,6 +53,7 @@ public static function make($signatureArray, string $secret): self
      * True if the signature is valid.
      *
      * @return bool
+     *
      * @throws BinaryCats\LobWebhooks\Exceptions\SignatureVerificationException when validation fails
      */
     public function verify(): bool
@@ -82,7 +83,7 @@ protected function computeSignature()
     /**
      * Magically access items from signature array.
      *
-     * @param  string $attribute
+     * @param  string  $attribute
      * @return mixed
      */
     public function __get($attribute)

tests/TestCase.php

@@ -21,7 +21,7 @@ public function setUp(): void
     /**
      * Set up the environment.
      *
-     * @param \Illuminate\Foundation\Application $app
+     * @param  \Illuminate\Foundation\Application  $app
      */
     protected function getEnvironmentSetUp($app)
     {
@@ -45,8 +45,7 @@ protected function setUpDatabase()
     }
 
     /**
-     * @param \Illuminate\Foundation\Application $app
-     *
+     * @param  \Illuminate\Foundation\Application  $app
      * @return array
      */
     protected function getPackageProviders($app)
@@ -58,7 +57,8 @@ protected function getPackageProviders($app)
 
     protected function disableExceptionHandling()
     {
-        $this->app->instance(ExceptionHandler::class, new class extends Handler {
+        $this->app->instance(ExceptionHandler::class, new class extends Handler
+        {
             public function __construct()
             {
             }
@@ -77,9 +77,9 @@ public function render($request, Exception $exception)
     /**
      * Compile lob.com siangure.
      *
-     * @param  array       $payload
-     * @param  int         $timestamp
-     * @param  string|null $configKey
+     * @param  array  $payload
+     * @param  int  $timestamp
+     * @param  string|null  $configKey
      * @return string
      */
     protected function determineLobSignature(array $payload, $timestamp, string $configKey = null): string