Add (strict) typing

Classes/Collector/AbstractCollector.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 namespace Flownative\Prometheus\Collector;
 
 /*
@@ -14,22 +15,22 @@ abstract class AbstractCollector
     /**
      * @var StorageInterface
      */
-    protected $storage;
+    protected StorageInterface $storage;
 
     /**
      * @var string
      */
-    protected $name;
+    protected string $name;
 
     /**
      * @var string
      */
-    protected $help = '';
+    protected string $help = '';
 
     /**
      * @var array
      */
-    protected $labels = [];
+    protected array $labels = [];
 
     /**
      * @param StorageInterface $storage

Classes/Collector/Counter.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 namespace Flownative\Prometheus\Collector;
 
 /*

Classes/Collector/Gauge.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 namespace Flownative\Prometheus\Collector;
 
 /*

Classes/CollectorRegistry.php

@@ -18,17 +18,17 @@ class CollectorRegistry
     /**
      * @var StorageInterface
      */
-    protected $storage;
+    protected StorageInterface $storage;
 
     /**
      * @var array
      */
-    protected $counters = [];
+    protected array $counters = [];
 
     /**
      * @var array
      */
-    protected $gauges = [];
+    protected array $gauges = [];
 
     /**
      * @param StorageInterface $storage

Classes/Configuration.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 namespace Flownative\Prometheus;
 
 /*
@@ -16,17 +17,17 @@ class Configuration
     /**
      * @var string
      */
-    protected $type;
+    protected string $type;
 
     /**
      * @var string
      */
-    protected $help = '';
+    protected string $help = '';
 
     /**
      * @var array
      */
-    protected $labels = [];
+    protected array $labels = [];
 
     /**
      * @param string $type

Classes/DefaultCollectorRegistry.php

@@ -20,7 +20,7 @@ final class DefaultCollectorRegistry extends CollectorRegistry
      * @Flow\InjectConfiguration(path="metrics")
      * @var array
      */
-    protected $settings;
+    protected array $settings = [];
 
     /**
      * @throws Exception\InvalidCollectorTypeException

Classes/Http/MetricsExporterMiddleware.php

@@ -28,17 +28,17 @@ class MetricsExporterMiddleware implements MiddlewareInterface
     /**
      * @var CollectorRegistry
      */
-    protected $collectorRegistry;
+    protected CollectorRegistry $collectorRegistry;
 
     /**
-     * @var LoggerInterface
+     * @var LoggerInterface|null
      */
-    protected $logger;
+    protected ?LoggerInterface $logger = null;
 
     /**
      * @var array
      */
-    protected $options = [
+    protected array $options = [
         'telemetryPath' => '/metrics',
         'basicAuth' => []
     ];

Classes/Renderer.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 namespace Flownative\Prometheus;
 
 /*

Classes/Sample.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 namespace Flownative\Prometheus;
 
 /*
@@ -12,12 +13,12 @@ class Sample
     /**
      * @var string
      */
-    private $name;
+    private string $name;
 
     /**
      * @var array
      */
-    private $labels;
+    private array $labels;
 
     /**
      * @var int|float

Classes/SampleCollection.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 namespace Flownative\Prometheus;
 
 /*
@@ -12,27 +13,27 @@ class SampleCollection
     /**
      * @var string
      */
-    private $name;
+    private string $name;
 
     /**
      * @var string
      */
-    private $type;
+    private string $type;
 
     /**
      * @var string
      */
-    private $help;
+    private string $help;
 
     /**
      * @var array
      */
-    private $labels;
+    private array $labels;
 
     /**
      * @var Sample[]
      */
-    private $samples = [];
+    private array $samples;
 
     /**
      * @param string $name

Classes/Storage/CounterUpdate.php

@@ -15,7 +15,7 @@ class CounterUpdate
      *
      * @var string
      */
-    private $operation;
+    private string $operation;
 
     /**
      * A positive number
@@ -27,7 +27,7 @@ class CounterUpdate
     /**
      * @var array
      */
-    private $labels;
+    private array $labels;
 
     /**
      * @param string $operation

Classes/Storage/GaugeUpdate.php

@@ -15,7 +15,7 @@ class GaugeUpdate
      *
      * @var string
      */
-    private $operation;
+    private string $operation;
 
     /**
      * A positive number
@@ -27,7 +27,7 @@ class GaugeUpdate
     /**
      * @var array
      */
-    private $labels;
+    private array $labels;
 
     /**
      * @param string $operation

Classes/Storage/InMemoryStorage.php

@@ -19,12 +19,12 @@ class InMemoryStorage extends AbstractStorage
     /**
      * @var array
      */
-    private $countersData = [];
+    private array $countersData = [];
 
     /**
      * @var array
      */
-    private $gaugesData = [];
+    private array $gaugesData = [];
 
     /**
      * @return SampleCollection[]

Classes/Storage/RedisStorage.php

@@ -31,57 +31,57 @@ class RedisStorage extends AbstractStorage
     /**
      * @var Counter[]
      */
-    protected $counters;
+    protected array $counters = [];
 
     /**
      * @var Gauge[]
      */
-    protected $gauges;
+    protected array $gauges = [];
 
     /**
      * @var Predis\Client
      */
-    protected $redis;
+    protected Predis\Client $redis;
 
     /**
      * @var string
      */
-    protected $hostname = '127.0.0.1';
+    protected string $hostname = '127.0.0.1';
 
     /**
      * @var int
      */
-    protected $port = 6379;
+    protected int $port = 6379;
 
     /**
      * @var array
      */
-    protected $sentinels = [];
+    protected array $sentinels = [];
 
     /**
      * @var string
      */
-    protected $service = 'mymaster';
+    protected string $service = 'mymaster';
 
     /**
      * @var int
      */
-    protected $database = 0;
+    protected int $database = 0;
 
     /**
      * @var string
      */
-    protected $password = '';
+    protected string $password = '';
 
     /**
      * @var string
      */
-    protected $keyPrefix = 'flownative_prometheus';
+    protected string $keyPrefix = 'flownative_prometheus';
 
     /**
      * @var bool
      */
-    protected $ignoreConnectionErrors = false;
+    protected bool $ignoreConnectionErrors = false;
 
     /**
      * @param array $options

Tests/Unit/Http/DummyRequestHandler.php

@@ -18,7 +18,7 @@ class DummyRequestHandler implements RequestHandlerInterface
     /**
      * @var bool
      */
-    protected $handleCalled = false;
+    protected bool $handleCalled = false;
 
     /**
      * @param ServerRequestInterface $request

Tests/Unit/Storage/AbstractStorageTest.php

@@ -22,7 +22,7 @@ abstract class AbstractStorageTest extends UnitTestCase
     /**
      * @var StorageInterface
      */
-    protected $storage;
+    protected StorageInterface $storage;
 
     /**
      * @test