Fix static checks (#157)

webgriffe · Nov 27, 2023 · 60b2caf · 60b2caf
1 parent b33d29e
commit 60b2caf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Controller/WebhookController.php b/src/Controller/WebhookController.php
@@ -82,8 +82,9 @@ public function postAction(Request $request): Response
             return new Response('', Response::HTTP_UNAUTHORIZED);
         }
 
+        /** @var string|resource $body on Symfony 5 the annotation is resource|string */
         $body = $request->getContent();
-        $expectedSignature = hash_hmac('sha256', $timestamp . '.' . $body, $this->secret);
+        $expectedSignature = hash_hmac('sha256', $timestamp . '.' . (string) $body, $this->secret);
         if (false === hash_equals($signature, $expectedSignature)) {
             $this->logger->debug('The hash does not match! The request is not from Akeneo or the secret is wrong.');
 
@@ -100,7 +101,7 @@ public function postAction(Request $request): Response
          *
          * @var AkeneoEvents $akeneoEvents
          */
-        $akeneoEvents = json_decode($body, true, 512, JSON_THROW_ON_ERROR);
+        $akeneoEvents = json_decode((string) $body, true, 512, JSON_THROW_ON_ERROR);
 
         foreach ($akeneoEvents['events'] as $akeneoEvent) {
             $this->logger->debug(sprintf('Received event %s with id "%s"', $akeneoEvent['action'], $akeneoEvent['event_id']));

diff --git a/src/DependencyInjection/WebgriffeSyliusAkeneoExtension.php b/src/DependencyInjection/WebgriffeSyliusAkeneoExtension.php
@@ -115,6 +115,7 @@ final class WebgriffeSyliusAkeneoExtension extends AbstractResourceExtension imp
 
     public function load(array $configs, ContainerBuilder $container): void
     {
+        /** @var array{resources: array|mixed, api_client: array<array-key, ?string>, webhook: array{secret: ?string}, value_handlers: array} $config */
         $config = $this->processConfiguration($this->getConfiguration([], $container), $configs);
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../../config'));
 
@@ -254,6 +255,9 @@ private function registerTemporaryDirectoryParameter(ContainerBuilder $container
         $container->setParameter($parameterKey, sys_get_temp_dir());
     }
 
+    /**
+     * @param array{secret: ?string} $webhook
+     */
     private function registerWebhookParameters(array $webhook, ContainerBuilder $container): void
     {
         $container->setParameter('webgriffe_sylius_akeneo.webhook.secret', $webhook['secret']);