Merge pull request #1 from spatie/analysis-86EQPP

Apply fixes from StyleCI
spatie · Jun 13, 2019 · 10ac927 · 10ac927
2 parents 5e16ced + 821a82d
commit 10ac927
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 42 deletions.
diff --git a/config/webhook-client.php b/config/webhook-client.php
@@ -44,5 +44,5 @@
          * This should be set to a class that extends \Spatie\WebhookClient\Spatie\WebhookClient.
          */
         'process_webhook_job' => '',
-    ]
+    ],
 ];
diff --git a/src/Events/InvalidSignatureEvent.php b/src/Events/InvalidSignatureEvent.php
@@ -19,4 +19,3 @@ public function __construct(Request $request, ?string $invalidSignature)
         $this->invalidSignature = $invalidSignature;
     }
 }
-
diff --git a/src/Exceptions/InvalidConfig.php b/src/Exceptions/InvalidConfig.php
@@ -4,8 +4,8 @@
 
 use Exception;
 use Spatie\WebhookClient\ProcessWebhookJob;
-use Spatie\WebhookClient\SignatureValidator\SignatureValidator;
 use Spatie\WebhookClient\WebhookProfile\WebhookProfile;
+use Spatie\WebhookClient\SignatureValidator\SignatureValidator;
 
 class InvalidConfig extends Exception
 {
@@ -35,4 +35,3 @@ public static function invalidProcessWebhookJob(string $processWebhookJob)
         return new static("`{$processWebhookJob}` is not a valid process webhook job class. A valid class should implement `{$abstractProcessWebhookJob}`.");
     }
 }
-
diff --git a/src/Models/WebhookCall.php b/src/Models/WebhookCall.php
@@ -36,4 +36,3 @@ public function clearException()
         return $this;
     }
 }
-
diff --git a/src/ProcessWebhookClass.php b/src/ProcessWebhookClass.php
@@ -4,6 +4,4 @@
 
 class ProcessWebhookClass
 {
-
 }
-
diff --git a/src/ProcessWebhookJob.php b/src/ProcessWebhookJob.php
@@ -3,10 +3,10 @@
 namespace Spatie\WebhookClient;
 
 use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
 use Spatie\WebhookClient\Models\WebhookCall;
 
 abstract class ProcessWebhookJob implements ShouldQueue
@@ -23,4 +23,3 @@ public function __construct(WebhookCall $webhookCall)
 
     abstract public function handle();
 }
-
diff --git a/src/SignatureValidator/DefaultSignatureValidator.php b/src/SignatureValidator/DefaultSignatureValidator.php
@@ -3,8 +3,8 @@
 namespace Spatie\WebhookClient\SignatureValidator;
 
 use Illuminate\Http\Request;
-use Spatie\WebhookClient\Exceptions\WebhookFailed;
 use Spatie\WebhookClient\WebhookConfig;
+use Spatie\WebhookClient\Exceptions\WebhookFailed;
 
 class DefaultSignatureValidator implements SignatureValidator
 {
@@ -27,4 +27,3 @@ public function isValid(Request $request, WebhookConfig $config)
         return hash_equals($signature, $computedSignature);
     }
 }
-
diff --git a/src/WebhookConfig.php b/src/WebhookConfig.php
@@ -3,8 +3,8 @@
 namespace Spatie\WebhookClient;
 
 use Spatie\WebhookClient\Exceptions\InvalidConfig;
-use Spatie\WebhookClient\SignatureValidator\SignatureValidator;
 use Spatie\WebhookClient\WebhookProfile\WebhookProfile;
+use Spatie\WebhookClient\SignatureValidator\SignatureValidator;
 
 class WebhookConfig
 {
@@ -17,7 +17,7 @@ class WebhookConfig
     /** @var string */
     public $signatureHeaderName;
 
-    /** @var \Spatie\WebhookClient\SignatureValidator\SignatureValidator  */
+    /** @var \Spatie\WebhookClient\SignatureValidator\SignatureValidator */
     public $signatureValidator;
 
     /** @var \Spatie\WebhookClient\WebhookProfile\WebhookProfile */
@@ -55,4 +55,3 @@ public function __construct(array $properties)
         $this->processWebhookJob = app($properties['process_webhook_job']);
     }
 }
-
diff --git a/src/WebhookController.php b/src/WebhookController.php
@@ -2,9 +2,9 @@
 
 namespace Spatie\WebhookClient;
 
+use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Route;
-use Illuminate\Support\Str;
 use Spatie\WebhookClient\Exceptions\InvalidConfig;
 
 class WebhookController
@@ -36,4 +36,3 @@ protected function getConfig(): WebhookConfig
         return new WebhookConfig($config);
     }
 }
-
diff --git a/src/WebhookProcessor.php b/src/WebhookProcessor.php
@@ -4,12 +4,9 @@
 
 use Exception;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Route;
-use Illuminate\Support\Str;
-use Spatie\WebhookClient\Events\InvalidSignatureEvent;
-use Spatie\WebhookClient\Exceptions\WebhookFailed;
-use Spatie\WebhookClient\Exceptions\InvalidConfig;
 use Spatie\WebhookClient\Models\WebhookCall;
+use Spatie\WebhookClient\Exceptions\WebhookFailed;
+use Spatie\WebhookClient\Events\InvalidSignatureEvent;
 
 class WebhookProcessor
 {
@@ -30,7 +27,7 @@ public function process()
     {
         $this->guardAgainstInvalidSignature();
 
-        if (!$this->config->webhookProfile->shouldProcess($this->request)) {
+        if (! $this->config->webhookProfile->shouldProcess($this->request)) {
             return;
         }
 
@@ -45,12 +42,12 @@ protected function guardAgainstInvalidSignature()
 
         $signature = $this->request->header($headerName);
 
-        if (!$signature) {
+        if (! $signature) {
             event(new InvalidSignatureEvent($this->request, $signature));
             throw WebhookFailed::missingSignature($headerName);
         }
 
-        if (!$this->config->signatureValidator->isValid($this->request, $this->config)) {
+        if (! $this->config->signatureValidator->isValid($this->request, $this->config)) {
             event(new InvalidSignatureEvent($this->request, $signature));
 
             throw WebhookFailed::invalidSignature($signature, $this->config->signatureHeaderName);
@@ -82,4 +79,3 @@ protected function processWebhook(WebhookCall $webhookCall): void
         }
     }
 }
-
diff --git a/src/WebhookProfile/ProcessEverythingWebhookProfile.php b/src/WebhookProfile/ProcessEverythingWebhookProfile.php
@@ -11,4 +11,3 @@ public function shouldProcess(Request $request): bool
         return true;
     }
 }
-
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -34,7 +34,7 @@ protected function getEnvironmentSetUp($app)
 
     protected function setUpDatabase()
     {
-        include_once __DIR__ . '/../migrations/create_webhook_calls_table.php.stub';
+        include_once __DIR__.'/../migrations/create_webhook_calls_table.php.stub';
 
         (new CreateWebhookCallsTable())->up();
     }

diff --git a/tests/TestClasses/ProcessNothingWebhookProfile.php b/tests/TestClasses/ProcessNothingWebhookProfile.php
@@ -12,4 +12,3 @@ public function shouldProcess(Request $request): bool
         return false;
     }
 }
-
diff --git a/tests/TestClasses/ProcessWebhookJobTestClass.php b/tests/TestClasses/ProcessWebhookJobTestClass.php
@@ -8,7 +8,5 @@ class ProcessWebhookJobTestClass extends ProcessWebhookJob
 {
     public function handle()
     {
-
     }
 }
-
diff --git a/tests/WebhookConfigTest.php b/tests/WebhookConfigTest.php
@@ -2,11 +2,11 @@
 
 namespace Spatie\WebhookClient\Tests;
 
-use Spatie\WebhookClient\Exceptions\InvalidConfig;
+use Spatie\WebhookClient\WebhookConfig;
 use Spatie\WebhookClient\Models\WebhookCall;
+use Spatie\WebhookClient\Exceptions\InvalidConfig;
 use Spatie\WebhookClient\SignatureValidator\DefaultSignatureValidator;
 use Spatie\WebhookClient\Tests\TestClasses\ProcessWebhookJobTestClass;
-use Spatie\WebhookClient\WebhookConfig;
 use Spatie\WebhookClient\WebhookProfile\ProcessEverythingWebhookProfile;
 
 class WebhookConfigTest extends TestCase
@@ -73,4 +73,3 @@ protected function getValidConfig(): array
         ];
     }
 }
-
diff --git a/tests/WebhookControllerTest.php b/tests/WebhookControllerTest.php
@@ -2,15 +2,14 @@
 
 namespace Spatie\WebhookClient\Tests;
 
-use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Queue;
 use Illuminate\Support\Facades\Route;
-use Spatie\WebhookClient\Events\InvalidSignatureEvent;
 use Spatie\WebhookClient\Models\WebhookCall;
-use Spatie\WebhookClient\Tests\TestClasses\ProcessNothingWebhookProfile;
+use Spatie\WebhookClient\Events\InvalidSignatureEvent;
 use Spatie\WebhookClient\Tests\TestClasses\ProcessWebhookJobTestClass;
+use Spatie\WebhookClient\Tests\TestClasses\ProcessNothingWebhookProfile;
 
 class WebhookControllerTest extends TestCase
 {
@@ -39,7 +38,7 @@ public function setUp(): void
         $this->payload = ['a' => 1];
 
         $this->headers = [
-            config('webhook-client.0.signature_header_name') => $this->determineSignature($this->payload)
+            config('webhook-client.0.signature_header_name') => $this->determineSignature($this->payload),
         ];
     }
 
@@ -57,7 +56,8 @@ public function it_can_process_a_webhook_request()
 
         Queue::assertPushed(ProcessWebhookJobTestClass::class, function (ProcessWebhookJobTestClass $job) {
             $this->assertEquals(1, $job->webhookCall->id);
-                return true;
+
+            return true;
         });
     }
 
@@ -104,7 +104,6 @@ public function it_can_work_with_an_alternative_config()
         $this
             ->postJson('incoming-webhooks-alternative-config', $this->payload, $this->headers)
             ->assertSuccessful();
-
     }
 
     private function determineSignature(array $payload): string
@@ -122,9 +121,9 @@ protected function getValidPayloadAndHeaders(): array
         $payload = ['a' => 1];
 
         $headers = [
-            config('webhook-client.0.signature_header_name') => $this->determineSignature($payload)
+            config('webhook-client.0.signature_header_name') => $this->determineSignature($payload),
         ];
+
         return [$payload, $headers];
     }
 }
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,5 +44,5 @@ @@
              * This should be set to a class that extends \Spatie\WebhookClient\Spatie\WebhookClient.
              */
             'process_webhook_job' => '',
-        ]
+        ],
     ];
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,4 +19,3 @@ public function __construct(Request $request, ?string $invalidSignature)
		$this->invalidSignature = $invalidSignature;
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,4 +36,3 @@ public function clearException()
		return $this;
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,4 +11,3 @@ public function shouldProcess(Request $request): bool
		return true;
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,4 +12,3 @@ public function shouldProcess(Request $request): bool
		return false;
		}
		}