Take advantage of PHP 8.0 constructor property promotion

Enalean · Nov 24, 2021 · bd2676b · bd2676b
1 parent 81bbe9a
commit bd2676b
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 77 deletions.
diff --git a/src/Counter.php b/src/Counter.php
@@ -16,12 +16,9 @@
  */
 final class Counter extends Metric
 {
-    private CounterStorage $storage;
-
-    public function __construct(CounterStorage $storage, MetricName $name, string $help, ?MetricLabelNames $labelNames = null)
+    public function __construct(private CounterStorage $storage, MetricName $name, string $help, ?MetricLabelNames $labelNames = null)
     {
         parent::__construct($name, $help, $labelNames ?? MetricLabelNames::fromNames());
-        $this->storage = $storage;
     }
 
     /**

diff --git a/src/Gauge.php b/src/Gauge.php
@@ -13,12 +13,9 @@
  */
 final class Gauge extends Metric
 {
-    private GaugeStorage $storage;
-
-    public function __construct(GaugeStorage $storage, MetricName $name, string $help, ?MetricLabelNames $labelNames = null)
+    public function __construct(private GaugeStorage $storage, MetricName $name, string $help, ?MetricLabelNames $labelNames = null)
     {
         parent::__construct($name, $help, $labelNames ?? MetricLabelNames::fromNames());
-        $this->storage = $storage;
     }
 
     /**

diff --git a/src/Histogram.php b/src/Histogram.php
@@ -36,18 +36,15 @@ final class Histogram extends Metric
         10.0,
     ];
 
-    private HistogramStorage $storage;
-
     /** @var float[] */
     private array $buckets;
 
     /**
      * @param float[] $buckets
      */
-    public function __construct(HistogramStorage $storage, MetricName $name, string $help, ?HistogramLabelNames $labelNames = null, ?array $buckets = null)
+    public function __construct(private HistogramStorage $storage, MetricName $name, string $help, ?HistogramLabelNames $labelNames = null, ?array $buckets = null)
     {
         parent::__construct($name, $help, $labelNames ?? HistogramLabelNames::fromNames());
-        $this->storage = $storage;
 
         if ($buckets === null) {
             $buckets = self::DEFAULT_BUCKETS;

diff --git a/src/Metric.php b/src/Metric.php
@@ -17,24 +17,11 @@
  */
 abstract class Metric
 {
-    /** @var MetricName */
-    private $name;
-    /** @var string */
-    private $help;
-    /**
-     * @var LabelNames
-     * @psalm-var TLabelNames
-     * */
-    private $labelNames;
-
     /**
      * @psalm-param TLabelNames $labelNames
      */
-    public function __construct(MetricName $name, string $help, LabelNames $labelNames)
+    public function __construct(private MetricName $name, private string $help, private LabelNames $labelNames)
     {
-        $this->name       = $name;
-        $this->help       = $help;
-        $this->labelNames = $labelNames;
     }
 
     /**

diff --git a/src/MetricFamilySamples.php b/src/MetricFamilySamples.php
@@ -11,25 +11,12 @@
  */
 final class MetricFamilySamples
 {
-    private string $name;
-    private string $type;
-    private string $help;
-    /** @var string[] */
-    private array $labelNames;
-    /** @var Sample[] */
-    private array $samples;
-
     /**
      * @param string[] $labelNames
      * @param Sample[] $samples
      */
-    public function __construct(string $name, string $type, string $help, array $labelNames, array $samples)
+    public function __construct(private string $name, private string $type, private string $help, private array $labelNames, private array $samples)
     {
-        $this->name       = $name;
-        $this->type       = $type;
-        $this->help       = $help;
-        $this->labelNames = $labelNames;
-        $this->samples    = $samples;
     }
 
     public function getName(): string

diff --git a/src/PushGateway/PSR18Pusher.php b/src/PushGateway/PSR18Pusher.php
@@ -18,20 +18,14 @@
 final class PSR18Pusher implements Pusher
 {
     private string $address;
-    private ClientInterface $client;
-    private RequestFactoryInterface $requestFactory;
-    private StreamFactoryInterface $streamFactory;
 
-    public function __construct(string $address, ClientInterface $client, RequestFactoryInterface $requestFactory, StreamFactoryInterface $streamFactory)
+    public function __construct(string $address, private ClientInterface $client, private RequestFactoryInterface $requestFactory, private StreamFactoryInterface $streamFactory)
     {
         if (strpos($address, '://') === false) {
             $address = 'http://' . $address;
         }
 
-        $this->address        = $address . '/metrics/job/';
-        $this->client         = $client;
-        $this->requestFactory = $requestFactory;
-        $this->streamFactory  = $streamFactory;
+        $this->address = $address . '/metrics/job/';
     }
 
     /**

diff --git a/src/PushGateway/PSR18UnexpectedPushGatewayResponse.php b/src/PushGateway/PSR18UnexpectedPushGatewayResponse.php
@@ -10,14 +10,8 @@
 
 final class PSR18UnexpectedPushGatewayResponse extends UnexpectedPushGatewayResponse
 {
-    private RequestInterface $request;
-    private ?ResponseInterface $response;
-
-    private function __construct(RequestInterface $request, ?ResponseInterface $response, ?ClientExceptionInterface $clientException)
+    private function __construct(private RequestInterface $request, private ?ResponseInterface $response, ?ClientExceptionInterface $clientException)
     {
-        $this->request  = $request;
-        $this->response = $response;
-
         $exceptionCode = 0;
 
         $message = 'Cannot connect PushGateway server to ' . $request->getUri()->__toString() . ':';

diff --git a/src/Renderer/IncoherentMetricLabelNamesAndValues.php b/src/Renderer/IncoherentMetricLabelNamesAndValues.php
@@ -12,9 +12,7 @@
 
 final class IncoherentMetricLabelNamesAndValues extends RuntimeException
 {
-    private MetricFamilySamples $metric;
-
-    public function __construct(MetricFamilySamples $metric, int $nbLabelNames, int $nbLabelValues)
+    public function __construct(private MetricFamilySamples $metric, int $nbLabelNames, int $nbLabelValues)
     {
         if ($nbLabelNames === $nbLabelValues) {
             throw new LogicException(

diff --git a/src/Sample.php b/src/Sample.php
@@ -11,23 +11,12 @@
  */
 final class Sample
 {
-    private string $name;
-    /** @var string[] */
-    private array $labelNames;
-    /** @var string[] */
-    private array $labelValues;
-    private float $value;
-
     /**
      * @param string[] $labelNames
      * @param string[] $labelValues
      */
-    public function __construct(string $name, float $value, array $labelNames, array $labelValues)
+    public function __construct(private string $name, private float $value, private array $labelNames, private array $labelValues)
     {
-        $this->name        = $name;
-        $this->labelNames  = $labelNames;
-        $this->labelValues = $labelValues;
-        $this->value       = $value;
     }
 
     public function getName(): string

diff --git a/src/Value/HistogramLabelNames.php b/src/Value/HistogramLabelNames.php
@@ -16,11 +16,8 @@ final class HistogramLabelNames implements LabelNames
 {
     private const RESERVED_LABEL_HISTOGRAM = 'le';
 
-    private MetricLabelNames $names;
-
-    private function __construct(MetricLabelNames $names)
+    private function __construct(private MetricLabelNames $names)
     {
-        $this->names = $names;
     }
 
     public static function fromNames(string ...$names): self

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