Remove deprecations and harden code

src/Block/Service/MatomoStatisticBlockService.php

@@ -34,12 +34,9 @@
 
 final class MatomoStatisticBlockService extends AbstractBlockService implements EditableBlockService, LoggerAwareInterface
 {
-    /**
-     * @var LoggerInterface
-     */
-    private LoggerInterface|NullLogger $logger;
+    private readonly ClientFactoryInterface $factory;
 
-    private ClientFactoryInterface $factory;
+    private LoggerInterface $logger;
 
     public function __construct(Environment $twig, ClientFactoryInterface $factory)
     {
@@ -67,19 +64,19 @@
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function configureEditForm(FormMapper $formMapper, BlockInterface $block): void
+    public function configureEditForm(FormMapper $form, BlockInterface $block): void
     {
-        $formMapper->add('settings', ImmutableArrayType::class, [
+        $form->add('settings', ImmutableArrayType::class, [
             'keys'               => [
                 ['title', TextType::class, [
                     'required' => false,
                     'label'    => 'form.label_title',
                 ]],
                 ['translation_domain', TextType::class, [
                     'label'    => 'form.label_translation_domain',
                     'required' => false,
                 ]],
                 ['icon', TextType::class, [
                     'label'    => 'form.label_icon',
                     'required' => false,
                 ]],
@@ -177,7 +174,7 @@
      *
      * @return array<mixed>
      */
-    protected function getData(array $settings = []): ?array
+    private function getData(array $settings = []): ?array
     {
         try {
             $client = $this->factory->createClient((string) $settings['host'], (string) $settings['token']);

src/Block/Service/MatomoTrackerBlockService.php

@@ -43,9 +43,9 @@ public function configureCreateForm(FormMapper $form, BlockInterface $block): vo
         $this->configureEditForm($form, $block);
     }
 
-    public function configureEditForm(FormMapper $formMapper, BlockInterface $block): void
+    public function configureEditForm(FormMapper $form, BlockInterface $block): void
     {
-        $formMapper->add('settings', ImmutableArrayType::class, [
+        $form->add('settings', ImmutableArrayType::class, [
             'keys'               => [
                 ['host', TextType::class, [
                     'required' => false,

src/Client/Client.php

@@ -17,37 +17,26 @@
 
 final class Client implements ClientInterface
 {
-    private ConnectionInterface $connection;
+    private readonly ConnectionInterface $connection;
 
-    private string $token;
+    private readonly string $token;
 
     /**
-     * Initialize Matomo client.
-     *
      * @param ConnectionInterface $connection Matomo active connection
      * @param string              $token      auth token
      */
     public function __construct(ConnectionInterface $connection, string $token = 'anonymous')
     {
         $this->connection = $connection;
-        $this->setToken($token);
+        $this->token      = $token;
     }
 
-    public function setToken(string $token): void
-    {
-        $this->token = $token;
-    }
-
-    public function call(string $method, array $params = [], string $format = 'php')
+    public function call(string $method, array $params = []): mixed
     {
         $params['method']     = $method;
         $params['token_auth'] = $this->token;
         $params['format']     = 'json';
-        $data                 = $this->getConnection()->send($params);
-
-        if ('php' !== $format) {
-            @trigger_error(sprintf('Argument #3 of %s is deprecated and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
-        }
+        $data                 = $this->connection->send($params);
 
         try {
             $object = json_decode($data, true, 512, JSON_THROW_ON_ERROR);
@@ -57,9 +46,4 @@ public function call(string $method, array $params = [], string $format = 'php')
 
         return $object;
     }
-
-    public function getConnection(): ConnectionInterface
-    {
-        return $this->connection;
-    }
 }

src/Client/ClientFactoryInterface.php

@@ -13,8 +13,5 @@
 
 interface ClientFactoryInterface
 {
-    /**
-     * Creates new Matomo Client.
-     */
     public function createClient(string $host, string $token): ClientInterface;
 }

src/Client/ClientInterface.php

@@ -11,36 +11,17 @@
 
 namespace Nucleos\MatomoBundle\Client;
 
-use Nucleos\MatomoBundle\Connection\ConnectionInterface;
 use Nucleos\MatomoBundle\Exception\MatomoException;
 
 interface ClientInterface
 {
     /**
-     * Set Matomo API token.
-     *
-     * @param string $token auth token
-     *
-     * @deprecated use constructor to set client token
-     */
-    public function setToken(string $token): void;
-
-    /**
-     * Call specific method & return it's response.
-     *
      * @param string               $method method name
      * @param array<string, mixed> $params method parameters
      *
      * @return array<mixed>|string
      *
      * @throws MatomoException
      */
-    public function call(string $method, array $params = [], string $format = 'php');
-
-    /**
-     * Return active connection.
-     *
-     * @deprecated without any replacement
-     */
-    public function getConnection(): ConnectionInterface;
+    public function call(string $method, array $params = []): mixed;
 }

src/Client/PsrClientFactory.php

@@ -17,13 +17,10 @@
 
 final class PsrClientFactory implements ClientFactoryInterface
 {
-    private PsrClientInterface $client;
+    private readonly PsrClientInterface $client;
 
-    private RequestFactoryInterface $requestFactory;
+    private readonly RequestFactoryInterface $requestFactory;
 
-    /**
-     * Initialize client.
-     */
     public function __construct(PsrClientInterface $client, RequestFactoryInterface $requestFactory)
     {
         $this->client         = $client;

src/Connection/ConnectionInterface.php

@@ -16,8 +16,6 @@
 interface ConnectionInterface
 {
     /**
-     * Calls specific method on Matomo API.
-     *
      * @param array<string, mixed> $params
      *
      * @return string response

src/Connection/PsrClientConnection.php

@@ -20,15 +20,13 @@
 
 final class PsrClientConnection implements ConnectionInterface
 {
-    private PsrClientInterface $client;
+    private readonly PsrClientInterface $client;
 
-    private RequestFactoryInterface $requestFactory;
+    private readonly RequestFactoryInterface $requestFactory;
 
-    private string $apiUrl;
+    private readonly string $apiUrl;
 
     /**
-     * Initialize client.
-     *
      * @param string $apiUrl base API URL
      */
     public function __construct(PsrClientInterface $client, RequestFactoryInterface $requestFactory, string $apiUrl)

tests/Client/ClientTest.php

@@ -29,13 +29,6 @@ protected function setUp(): void
         $this->connection = $this->createMock(ConnectionInterface::class);
     }
 
-    public function testGetConnection(): void
-    {
-        $client = new Client($this->connection);
-
-        static::assertSame($this->connection, $client->getConnection());
-    }
-
     public function testCall(): void
     {
         $this->connection
@@ -72,7 +65,7 @@ public function testCallWithCustomFormat(): void
         ;
 
         $client = new Client($this->connection, 'MY_TOKEN');
-        $result = $client->call('foo/method', ['foo' => 'bar'], 'custom');
+        $result = $client->call('foo/method', ['foo' => 'bar']);
 
         static::assertCount(30, $result);
     }