Merge pull request #12 from Innmind/cs

Use promoted properties

Author: Baptouuuu

src/LineParser/ApacheAccess.php

@@ -33,11 +33,8 @@ final class ApacheAccess implements LineParser
 {
     private const FORMAT = '~^(?P<client>\S+) - (?P<user>\S+) \[(?P<time>\d{2}/[a-zA-Z]{3}/\d{4}:\d{2}:\d{2}:\d{2} [+\-]\d{4})] "(?P<method>[A-Z]{3,}) (?P<path>.+) HTTP/(?P<protocol>\d\.\d)" (?P<code>\d+) (?P<size>\d+)$~';
 
-    private Clock $clock;
-
-    private function __construct(Clock $clock)
+    private function __construct(private Clock $clock)
     {
-        $this->clock = $clock;
     }
 
     #[\Override]

src/LineParser/Monolog.php

@@ -32,13 +32,10 @@ final class Monolog implements LineParser
     private const FORMAT = '~^\[(?P<time>\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})\] (?P<channel>[a-zA-Z-_]+)\.(?P<level>EMERGENCY|ALERT|CRITICAL|ERROR|WARNING|NOTICE|INFO|DEBUG): (?P<message>.+) (?P<context>[\{\[].*[\]\}]) (?P<extra>[\{\[].*[\]\}])$~';
     private const FORMAT_WITHOUT_EXTRA = '~^\[(?P<time>\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})\] (?P<channel>[a-zA-Z-_]+)\.(?P<level>EMERGENCY|ALERT|CRITICAL|ERROR|WARNING|NOTICE|INFO|DEBUG): (?P<message>.+) (?P<context>[\{\[].*[\]\}])$~';
 
-    private Clock $clock;
-    private string $format;
-
-    private function __construct(Clock $clock, ?string $format = null)
-    {
-        $this->clock = $clock;
-        $this->format = $format ?? self::FORMAT;
+    private function __construct(
+        private Clock $clock,
+        private string $format,
+    ) {
     }
 
     #[\Override]

src/Log.php

@@ -16,19 +16,14 @@
  */
 final class Log
 {
-    private Point $time;
-    private Str $raw;
-    /** @var Set<Attribute> */
-    private Set $attributes;
-
     /**
      * @param Set<Attribute> $attributes
      */
-    private function __construct(Point $time, Str $raw, Set $attributes)
-    {
-        $this->time = $time;
-        $this->raw = $raw;
-        $this->attributes = $attributes;
+    private function __construct(
+        private Point $time,
+        private Str $raw,
+        private Set $attributes,
+    ) {
     }
 
     /**

src/Log/Attribute/Monolog/Channel.php

@@ -14,11 +14,8 @@
  */
 final class Channel implements Attribute
 {
-    private string $value;
-
-    private function __construct(string $value)
+    private function __construct(private string $value)
     {
-        $this->value = $value;
     }
 
     /**

src/Log/Attribute/Monolog/Level.php

@@ -12,11 +12,8 @@
  */
 final class Level implements Attribute
 {
-    private string $value;
-
-    private function __construct(string $value)
+    private function __construct(private string $value)
     {
-        $this->value = $value;
     }
 
     /**

src/Log/Attribute/Monolog/Message.php

@@ -14,11 +14,8 @@
  */
 final class Message implements Attribute
 {
-    private string $value;
-
-    private function __construct(string $value)
+    private function __construct(private string $value)
     {
-        $this->value = $value;
     }
 
     /**

src/Reader.php

@@ -11,11 +11,8 @@
  */
 final class Reader
 {
-    private LineParser $parse;
-
-    private function __construct(LineParser $parser)
+    private function __construct(private LineParser $parse)
     {
-        $this->parse = $parser;
     }
 
     #[\NoDiscard]