Code style fixes, added scripts to composer.json

Author: wardtd

.gitignore

@@ -3,3 +3,4 @@
 /tools/
 
 .idea
+.php_cs.cache

.php_cs.dist

@@ -0,0 +1,16 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->exclude('somedir')
+    ->notPath('src/Symfony/Component/Translation/Tests/fixtures/resources.php')
+    ->in(__DIR__ . DIRECTORY_SEPARATOR . 'src')
+    ->in(__DIR__ . DIRECTORY_SEPARATOR . 'tests')
+;
+
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@PSR2' => true,
+        'array_syntax' => ['syntax' => 'short'],
+    ])
+    ->setFinder($finder)
+;

composer.json

@@ -39,5 +39,19 @@
                 "MiamiOH\\SnsHandler\\ServiceProvider"
             ]
         }
+    },
+    "scripts": {
+        "phpcs-7.3": [
+            "phpcs -p src --standard=PHPCompatibility --runtime-set testVersion 7.3"
+        ],
+        "phpcs-7.4": [
+            "phpcs -p src --standard=PHPCompatibility --runtime-set testVersion 7.4"
+        ],
+        "cs-fix": [
+            "php-cs-fixer fix --diff"
+        ],
+        "phpstan": [
+            "phpstan analyze"
+        ]
     }
 }

src/ServiceProvider.php

@@ -3,7 +3,6 @@
 
 namespace MiamiOH\SnsHandler;
 
-
 use Illuminate\Support\ServiceProvider as BaseServiceProvider;
 use MiamiOH\SnsHandler\Controllers\SnsMessageController;
 

src/SnsBroker.php

@@ -8,7 +8,6 @@
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
 
-
 class SnsBroker
 {
     /**
@@ -19,10 +18,6 @@ class SnsBroker
      * @var MessageValidator
      */
     private $validator;
-    /**
-     * @var HttpClient
-     */
-    private $httpClient;
     /**
      * @var Log
      */
@@ -66,6 +61,7 @@ public function handleRequest(SnsHttpRequest $request): void
 
             case SnsMessage::SUBSCRIBE_TYPE:
                 Log::info(sprintf('Confirming subscription to topic %s', $message->topicArn()));
+                //TODO Make this work with Laravel 6, as the Http facade was introduced in Laravel 7
                 $response = Http::get($message->subscribeUrl());
                 if ($response->successful()) {
                     return;

tests/Feature/SnsHandlerTest.php

@@ -12,7 +12,6 @@
 use Tests\MiamiOH\SnsHandler\MakesSnsTests;
 use Tests\MiamiOH\SnsHandler\Unit\SnsMessageHandlerStub;
 
-
 class SnsHandlerTest extends \Tests\MiamiOH\SnsHandler\TestCase
 {
     use MakesSnsTests;
@@ -37,8 +36,6 @@ protected function getPackageProviders($app)
 
     public function testReturnsNotFoundForUnknownTopicArn(): void
     {
-
-
         $data = $this->makeSnsMessageData([
             'Type' => SnsMessage::NOTIFICATION_TYPE,
             'TopicArn' => 'arn:aws:sns:us-west-2:123456789012:Unknown',
@@ -76,7 +73,6 @@ public function testRespondsWithOkAfterConfirmsSubscription(): void
         ]);
 
         $response = $this->postJson('/sns/message', $data);
-        print_r($response->getContent());
 
         $this->assertEquals(200, $response->status());
     }

tests/TestCase.php

@@ -3,8 +3,6 @@
 
 namespace Tests\MiamiOH\SnsHandler;
 
-
 class TestCase extends \Orchestra\Testbench\TestCase
 {
-
-}
+}

tests/Unit/SnsBrokerTest.php

@@ -15,8 +15,6 @@
 use Tests\MiamiOH\SnsHandler\TestCase;
 use Illuminate\Support\Facades\Http;
 
-
-
 class SnsBrokerTest extends TestCase
 {
     use MakesSnsTests;
@@ -89,7 +87,7 @@ public function testConfirmsSubscriptionUsingSubscribeUrl(): void
                 'SubscribeURL' => 'https://aws.amazon.com/subscribe/123',
             ]));
 
-        Http::fake(['https://aws.amazon.com/subscribe/123' => Http::response([], 200,[])]);
+        Http::fake(['https://aws.amazon.com/subscribe/123' => Http::response([], 200, [])]);
 
         $this->broker->handleRequest($request);
     }
@@ -140,5 +138,4 @@ public function testValidatesSnsMessage(): void
 
         $this->broker->handleRequest($request);
     }
-
 }

tests/Unit/SnsMessageTest.php

@@ -7,7 +7,6 @@
 use Tests\MiamiOH\SnsHandler\MakesSnsTests;
 use Tests\MiamiOH\SnsHandler\TestCase;
 
-
 class SnsMessageTest extends TestCase
 {
     use MakesSnsTests;