Simplify some stuff in the Client

Author: loevgaard

composer.json

@@ -21,13 +21,13 @@
         "webmozart/assert": "^1.11"
     },
     "require-dev": {
-        "infection/infection": "^0.26",
-        "kriswallsmith/buzz": "^1.2",
-        "nyholm/psr7": "^1.5",
-        "phpunit/phpunit": "^9.5",
-        "psalm/plugin-phpunit": "^0.17",
-        "setono/code-quality-pack": "^2.2",
-        "shipmonk/composer-dependency-analyser": "^1.8"
+        "infection/infection": "^0.26.21",
+        "kriswallsmith/buzz": "^1.3",
+        "nyholm/psr7": "^1.8",
+        "phpunit/phpunit": "^9.6",
+        "psalm/plugin-phpunit": "^0.19",
+        "setono/code-quality-pack": "^2.9",
+        "shipmonk/composer-dependency-analyser": "^1.8.2"
     },
     "prefer-stable": true,
     "autoload": {
@@ -48,11 +48,6 @@
         },
         "sort-packages": true
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0-dev"
-        }
-    },
     "scripts": {
         "analyse": "psalm",
         "check-style": "ecs check",

psalm.xml

@@ -1,9 +1,13 @@
 <?xml version="1.0"?>
 <psalm
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    errorLevel="1"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    findUnusedVariablesAndParams="false"
+    findUnusedPsalmSuppress="false"
+    findUnusedCode="false"
+    findUnusedBaselineEntry="false"
+    errorLevel="1"
     phpVersion="8.1"
 >
     <projectFiles>

src/Client/Client.php

@@ -5,7 +5,7 @@
 namespace Setono\MetaConversionsApi\Client;
 
 use Buzz\Client\Curl;
-use Composer\InstalledVersions;
+use FacebookAds\ApiConfig;
 use Nyholm\Psr7\Factory\Psr17Factory;
 use Psr\Http\Client\ClientInterface as HttpClientInterface;
 use Psr\Http\Message\RequestFactoryInterface;
@@ -16,7 +16,6 @@
 use Psr\Log\NullLogger;
 use Setono\MetaConversionsApi\Event\Event;
 use Setono\MetaConversionsApi\Exception\ClientException;
-use Webmozart\Assert\Assert;
 
 final class Client implements ClientInterface, LoggerAwareInterface
 {
@@ -60,7 +59,7 @@ public function sendEvent(Event $event): void
 
             $request = $requestFactory->createRequest(
                 'POST',
-                sprintf('https://graph.facebook.com/%s/%s/events', self::getEndpointVersion(), $pixel->id),
+                sprintf('https://graph.facebook.com/%s/%s/events', sprintf('v%s', ApiConfig::APIVersion), $pixel->id),
             )
             ->withHeader('Content-Type', 'application/x-www-form-urlencoded')
             ->withHeader('Accept', 'application/json')
@@ -162,14 +161,4 @@ public function setLogger(LoggerInterface $logger): void
     {
         $this->logger = $logger;
     }
-
-    private static function getEndpointVersion(): string
-    {
-        $version = InstalledVersions::getVersion('facebook/php-business-sdk');
-        Assert::notNull($version);
-
-        [$major, $minor] = explode('.', $version, 3);
-
-        return sprintf('v%s.%s', $major, $minor);
-    }
 }

tests/Client/ClientTest.php

@@ -84,13 +84,17 @@ public function sendRequest(RequestInterface $request): ResponseInterface
 
 final class TestLogger extends AbstractLogger
 {
-    /** @var list<string> */
+    /** @var list<non-empty-string> */
     public array $messages = [];
 
-    public function log($level, $message, array $context = []): void
+    public function log($level, string|\Stringable $message, array $context = []): void
     {
-        /** @psalm-suppress RedundantCastGivenDocblockType */
-        $this->messages[] = (string) $message;
+        $message = (string) $message;
+        if ('' === $message) {
+            return;
+        }
+
+        $this->messages[] = $message;
     }
 
     public function hasMessageMatching(string $regexp): bool