[CHORE] Code styles

mobilistics · Nov 7, 2023 · 489ee83 · 489ee83
1 parent 8e6e956
commit 489ee83
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 37 deletions.
diff --git a/ecs.php b/ecs.php
@@ -13,6 +13,7 @@
     $ecsConfig->skip([
         __DIR__ . "/tests/TestBootstrap.php",
         __DIR__ . "/tests/TestBootstrapper.php",
+        __DIR__ . "/tests/Support/StorefrontControllerTestBehaviour.php",
     ]);
 
     $ecsConfig->sets([

diff --git a/phpstan.neon b/phpstan.neon
@@ -7,3 +7,4 @@ parameters:
     excludePaths:
         - tests/TestBootstrap.php
         - tests/TestBootstrapper.php
+        - tests/Support/StorefrontControllerTestBehaviour.php
diff --git a/rector.php b/rector.php
@@ -12,6 +12,7 @@
     $rectorConfig->skip([
         __DIR__ . "/tests/TestBootstrap.php",
         __DIR__ . "/tests/TestBootstrapper.php",
+        __DIR__ . "/tests/Support/StorefrontControllerTestBehaviour.php",
     ]);
 
     $rectorConfig->sets([

diff --git a/src/Controller/Mamo/MetricsController.php b/src/Controller/Mamo/MetricsController.php
@@ -104,7 +104,7 @@ private function validateHmacRequest(Request $request, string $secret): void
         }
 
         $body = $request->getContent();
-        if (! $body) {
+        if ($body === '' || $body === '0') {
             $this->logger->info('Request body is missing.');
             throw new HttpException(400);
         }

diff --git a/tests/Controller/MetricsControllerTest.php b/tests/Controller/MetricsControllerTest.php
@@ -15,7 +15,7 @@ class MetricsControllerTest extends TestCase
     use IntegrationTestBehaviour;
     use StorefrontControllerTestBehaviour;
 
-    private const TESTING_SECRET = "testing-secret";
+    private const TESTING_SECRET = 'testing-secret';
 
     public function testMetricsAction(): void
     {
@@ -55,9 +55,9 @@ public function testFailWithInvalidHmacHeader(): void
         $systemConfigService->set(MobiMamoConnector::CONFIG_KEY_SECRET, self::TESTING_SECRET);
 
         $metrics = $this->request('GET', 'mamo-connector/metrics', [
-            "header" => [
-                "Hmac" => "dummy"
-            ]
+            'header' => [
+                'Hmac' => 'dummy',
+            ],
         ]);
         $content = $metrics->getContent();
 
@@ -75,7 +75,7 @@ public function testValidRequestWithHmac(): void
         $content = '{"validateTime":' . mktime(0) . '}';
 
         $metrics = $this->request('GET', 'mamo-connector/metrics', [], [], [
-            "HTTP_Hmac" => hash_hmac('sha256', '{"validateTime":' . mktime(0) . '}', self::TESTING_SECRET),
+            'HTTP_Hmac' => hash_hmac('sha256', '{"validateTime":' . mktime(0) . '}', self::TESTING_SECRET),
         ], $content);
         $content = $metrics->getContent();
 
@@ -94,8 +94,8 @@ public function testHmacMissingBody(): void
         $content = '{"validateTime":' . mktime(0) . '}';
 
         $metrics = $this->request('GET', 'mamo-connector/metrics', [], [], [
-            "HTTP_Hmac" => hash_hmac('sha256', '{"validateTime":' . mktime(0) . '}', self::TESTING_SECRET),
-        ], ""); // <- missing request body
+            'HTTP_Hmac' => hash_hmac('sha256', '{"validateTime":' . mktime(0) . '}', self::TESTING_SECRET),
+        ], ''); // <- missing request body
         $content = $metrics->getContent();
 
         static::assertNotFalse($content);
@@ -112,8 +112,8 @@ public function testHmacMismatch(): void
         $content = '{"validateTime":' . mktime(0) . '}';
 
         $metrics = $this->request('GET', 'mamo-connector/metrics', [], [], [
-            "HTTP_Hmac" => hash_hmac('sha256', '{"validateTime":' . mktime(0) . '}', self::TESTING_SECRET),
-        ], "hmac-mismatch"); // <- missing request body
+            'HTTP_Hmac' => hash_hmac('sha256', '{"validateTime":' . mktime(0) . '}', self::TESTING_SECRET),
+        ], 'hmac-mismatch'); // <- missing request body
         $content = $metrics->getContent();
 
         static::assertNotFalse($content);

diff --git a/tests/MobiMamoConnectorTest.php b/tests/MobiMamoConnectorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MobilisticsGmbH\MamoConnector\Tests;
 
 use MobilisticsGmbH\MamoConnector\MobiMamoConnector;
@@ -9,7 +11,7 @@ class MobiMamoConnectorTest extends TestCase
 {
     public function testExecuteComposerCommandsIsSet(): void
     {
-        $plugin = new MobiMamoConnector(true, "");
+        $plugin = new MobiMamoConnector(true, '');
         static::assertTrue($plugin->executeComposerCommands());
     }
 }
diff --git a/tests/Service/ShopwareApiClientTest.php b/tests/Service/ShopwareApiClientTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MobilisticsGmbH\MamoConnector\Tests\Service;
 
 use MobilisticsGmbH\MamoConnector\Service\ShopwareApiClient;
@@ -14,31 +16,6 @@ class ShopwareApiClientTest extends TestCase
 {
     use IntegrationTestBehaviour;
 
-    private function getInstanceService(): InstanceService
-    {
-        /** @var InstanceService $instanceService */
-        $instanceService = $this->getContainer()->get(InstanceService::class);
-
-        return $instanceService;
-    }
-
-    /**
-     * @param MockResponse[] $responses
-     * @return HttpClientInterface
-     */
-    private function getMockedHttpClient(array $responses): HttpClientInterface
-    {
-        return new MockHttpClient($responses);
-    }
-
-    private function getMockApiClient(array $responses): ShopwareApiClient
-    {
-        return new ShopwareApiClient(
-            $this->getInstanceService(),
-            $this->getMockedHttpClient($responses),
-        );
-    }
-
     public function testEmptryReponseBody(): void
     {
         $client = $this->getMockApiClient([
@@ -62,7 +39,8 @@ public function testEmptyResponseFromApi(): void
     public function testPluginResponsesFromApi(): void
     {
         $responses = [
-            new MockResponse(<<<JSON
+            new MockResponse(
+                <<<JSON
 {
     "data": [
         {
@@ -99,4 +77,31 @@ public function testPluginResponsesFromApi(): void
         static::assertSame('MobiSecondPlugin', $result[1]->name);
         static::assertSame('2.0.0', $result[1]->version);
     }
+
+    private function getInstanceService(): InstanceService
+    {
+        /** @var InstanceService $instanceService */
+        $instanceService = $this->getContainer()->get(InstanceService::class);
+
+        return $instanceService;
+    }
+
+    /**
+     * @param MockResponse[] $responses
+     */
+    private function getMockedHttpClient(array $responses): HttpClientInterface
+    {
+        return new MockHttpClient($responses);
+    }
+
+    /**
+     * @param MockResponse[] $responses
+     */
+    private function getMockApiClient(array $responses): ShopwareApiClient
+    {
+        return new ShopwareApiClient(
+            $this->getInstanceService(),
+            $this->getMockedHttpClient($responses),
+        );
+    }
 }