Replace annotations with types on properties when possible

Enalean · May 28, 2021 · 08b06f7 · 08b06f7
1 parent aa0b485
commit 08b06f7
Show file tree

Hide file tree

Showing 17 changed files with 36 additions and 60 deletions.
diff --git a/src/Counter.php b/src/Counter.php
@@ -16,8 +16,7 @@
  */
 final class Counter extends Metric
 {
-    /** @var CounterStorage */
-    private $storage;
+    private CounterStorage $storage;
 
     public function __construct(CounterStorage $storage, MetricName $name, string $help, ?MetricLabelNames $labelNames = null)
     {

diff --git a/src/Gauge.php b/src/Gauge.php
@@ -13,8 +13,7 @@
  */
 final class Gauge extends Metric
 {
-    /** @var GaugeStorage */
-    private $storage;
+    private GaugeStorage $storage;
 
     public function __construct(GaugeStorage $storage, MetricName $name, string $help, ?MetricLabelNames $labelNames = null)
     {

diff --git a/src/Histogram.php b/src/Histogram.php
@@ -36,11 +36,10 @@ final class Histogram extends Metric
         10.0,
     ];
 
-    /** @var HistogramStorage */
-    private $storage;
+    private HistogramStorage $storage;
 
     /** @var float[] */
-    private $buckets;
+    private array $buckets;
 
     /**
      * @param float[] $buckets

diff --git a/src/MetricFamilySamples.php b/src/MetricFamilySamples.php
@@ -11,16 +11,13 @@
  */
 final class MetricFamilySamples
 {
-    /** @var string */
-    private $name;
-    /** @var string */
-    private $type;
-    /** @var string */
-    private $help;
+    private string $name;
+    private string $type;
+    private string $help;
     /** @var string[] */
-    private $labelNames;
+    private array $labelNames;
     /** @var Sample[] */
-    private $samples;
+    private array $samples;
 
     /**
      * @param string[] $labelNames

diff --git a/src/PushGateway/PSR18Pusher.php b/src/PushGateway/PSR18Pusher.php
@@ -17,14 +17,10 @@
 
 final class PSR18Pusher implements Pusher
 {
-    /** @var string */
-    private $address;
-    /** @var ClientInterface */
-    private $client;
-    /** @var RequestFactoryInterface */
-    private $requestFactory;
-    /** @var StreamFactoryInterface */
-    private $streamFactory;
+    private string $address;
+    private ClientInterface $client;
+    private RequestFactoryInterface $requestFactory;
+    private StreamFactoryInterface $streamFactory;
 
     public function __construct(string $address, ClientInterface $client, RequestFactoryInterface $requestFactory, StreamFactoryInterface $streamFactory)
     {

diff --git a/src/PushGateway/PSR18UnexpectedPushGatewayResponse.php b/src/PushGateway/PSR18UnexpectedPushGatewayResponse.php
@@ -10,10 +10,8 @@
 
 final class PSR18UnexpectedPushGatewayResponse extends UnexpectedPushGatewayResponse
 {
-    /** @var RequestInterface */
-    private $request;
-    /** @var ResponseInterface|null */
-    private $response;
+    private RequestInterface $request;
+    private ?ResponseInterface $response;
 
     private function __construct(RequestInterface $request, ?ResponseInterface $response, ?ClientExceptionInterface $clientException)
     {

diff --git a/src/Registry/CollectorRegistry.php b/src/Registry/CollectorRegistry.php
@@ -22,11 +22,11 @@ final class CollectorRegistry implements Registry, Collector
     /** @var CounterStorage&GaugeStorage&HistogramStorage&Store */
     private $storageAdapter;
     /** @var Gauge[] */
-    private $gauges = [];
+    private array $gauges = [];
     /** @var Counter[] */
-    private $counters = [];
+    private array $counters = [];
     /** @var Histogram[] */
-    private $histograms = [];
+    private array $histograms = [];
 
     /**
      * @param CounterStorage|GaugeStorage|HistogramStorage|Store $storage

diff --git a/src/Renderer/IncoherentMetricLabelNamesAndValues.php b/src/Renderer/IncoherentMetricLabelNamesAndValues.php
@@ -12,8 +12,7 @@
 
 final class IncoherentMetricLabelNamesAndValues extends RuntimeException
 {
-    /** @var MetricFamilySamples */
-    private $metric;
+    private MetricFamilySamples $metric;
 
     public function __construct(MetricFamilySamples $metric, int $nbLabelNames, int $nbLabelValues)
     {

diff --git a/src/Sample.php b/src/Sample.php
@@ -11,14 +11,12 @@
  */
 final class Sample
 {
-    /** @var string */
-    private $name;
+    private string $name;
     /** @var string[] */
-    private $labelNames;
+    private array $labelNames;
     /** @var string[] */
-    private $labelValues;
-    /** @var float */
-    private $value;
+    private array $labelValues;
+    private float $value;
 
     /**
      * @param string[] $labelNames

diff --git a/src/Storage/InMemoryStore.php b/src/Storage/InMemoryStore.php
@@ -35,23 +35,23 @@ final class InMemoryStore implements Store, CounterStorage, GaugeStorage, Histog
      *      samples: array<string, float>
      * }>
      */
-    private $counters = [];
+    private array $counters = [];
     /**
      * @var array<string,string[][]>
      * @psalm-var array<string, array{
      *      meta: array{name:string, help:string, labelNames:string[]},
      *      samples: array<string, float>
      * }>
      */
-    private $gauges = [];
+    private array $gauges = [];
     /**
      * @var array<string,string[][]>
      * @psalm-var array<string, array{
      *      meta: array{name:string, help:string, labelNames:string[], buckets:array<int|float>},
      *      samples: array<string, float>
      * }>
      */
-    private $histograms = [];
+    private array $histograms = [];
 
     /**
      * @inheritdoc

diff --git a/src/Storage/RedisStore.php b/src/Storage/RedisStore.php
@@ -28,11 +28,9 @@ final class RedisStore implements Store, CounterStorage, GaugeStorage, Histogram
 {
     public const PROMETHEUS_METRIC_KEYS_SUFFIX = '_METRIC_KEYS';
 
-    /** @var string */
-    private $prefix;
+    private string $prefix;
 
-    /** @var Redis */
-    private $redis;
+    private Redis $redis;
 
     public function __construct(Redis $redisClient, string $keyPrefix = 'PROMETHEUS_')
     {

diff --git a/src/Value/HistogramLabelNames.php b/src/Value/HistogramLabelNames.php
@@ -16,8 +16,7 @@ final class HistogramLabelNames implements LabelNames
 {
     private const RESERVED_LABEL_HISTOGRAM = 'le';
 
-    /** @var MetricLabelNames */
-    private $names;
+    private MetricLabelNames $names;
 
     private function __construct(MetricLabelNames $names)
     {

diff --git a/src/Value/MetricLabelNames.php b/src/Value/MetricLabelNames.php
@@ -20,7 +20,7 @@ final class MetricLabelNames implements LabelNames
     private const RESERVED_LABEL_PREFIX = '__';
 
     /** @var string[] */
-    private $names;
+    private array $names;
 
     private function __construct(string ...$names)
     {

diff --git a/src/Value/MetricName.php b/src/Value/MetricName.php
@@ -16,8 +16,7 @@ final class MetricName
 {
     private const METRIC_NAME_REGEX = '/^[a-zA-Z_:][a-zA-Z0-9_:]*$/';
 
-    /** @var string */
-    private $name;
+    private string $name;
 
     private function __construct(string $name)
     {

diff --git a/tests/functionnal/BlackBoxTest.php b/tests/functionnal/BlackBoxTest.php
@@ -16,13 +16,10 @@ final class BlackBoxTest extends TestCase
 {
     private const BASE_URI = 'http://nginx:80/';
 
-    /** @var HttpAsyncClient */
-    private $client;
-    /** @var RequestFactoryInterface */
-    private $requestFactory;
+    private HttpAsyncClient $client;
+    private RequestFactoryInterface $requestFactory;
 
-    /** @var string */
-    private $adapter;
+    private string $adapter;
 
     protected function setUp(): void
     {

diff --git a/tests/unit/Storage/CollectorRegistryBaseTest.php b/tests/unit/Storage/CollectorRegistryBaseTest.php
@@ -20,8 +20,7 @@
 
 abstract class CollectorRegistryBaseTest extends TestCase
 {
-    /** @var RenderTextFormat */
-    private $renderer;
+    private RenderTextFormat $renderer;
 
     /**
      * @return CounterStorage&GaugeStorage&HistogramStorage&Store

diff --git a/tests/unit/Storage/Redis/ConfigureRedisStorage.php b/tests/unit/Storage/Redis/ConfigureRedisStorage.php
@@ -11,8 +11,7 @@
 
 trait ConfigureRedisStorage
 {
-    /** @var RedisStore */
-    public $adapter;
+    public RedisStore $adapter;
 
     private function getRedisClient(): Redis
     {