more constructor propery promotion (#309)

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
CycloneDX · Jun 1, 2023 · 88bb611 · 88bb611
1 parent dd32d3b
commit 88bb611
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 21 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -15,10 +15,12 @@ All notable changes to this project will be documented in this file.
 * Style
   * Applied latest PHP Coding Standards (via [#302])  
     Some parameters allow nullables implicitly, was explicitly.
+  * Wrote some class properties with constructor promotion (via [#309])
 
 [#302]: https://github.com/CycloneDX/cyclonedx-php-library/pull/302
 [#305]: https://github.com/CycloneDX/cyclonedx-php-library/issues/305
 [#306]: https://github.com/CycloneDX/cyclonedx-php-library/pull/306
+[#309]: https://github.com/CycloneDX/cyclonedx-php-library/pull/309
 
 ## 2.1.2 - 2023-04-05
 

diff --git a/src/Core/Serialization/DOM/_BaseNormalizer.php b/src/Core/Serialization/DOM/_BaseNormalizer.php
@@ -33,11 +33,9 @@
  */
 abstract class _BaseNormalizer
 {
-    private readonly NormalizerFactory $normalizerFactory;
-
-    public function __construct(NormalizerFactory $normalizerFactory)
-    {
-        $this->normalizerFactory = $normalizerFactory;
+    public function __construct(
+        private readonly NormalizerFactory $normalizerFactory
+    ) {
     }
 
     public function getNormalizerFactory(): NormalizerFactory

diff --git a/src/Core/Serialization/JSON/_BaseNormalizer.php b/src/Core/Serialization/JSON/_BaseNormalizer.php
@@ -33,11 +33,9 @@
  */
 abstract class _BaseNormalizer
 {
-    private readonly NormalizerFactory $normalizerFactory;
-
-    public function __construct(NormalizerFactory $normalizerFactory)
-    {
-        $this->normalizerFactory = $normalizerFactory;
+    public function __construct(
+        private readonly NormalizerFactory $normalizerFactory
+    ) {
     }
 
     public function getNormalizerFactory(): NormalizerFactory

diff --git a/src/Core/Validation/BaseValidator.php b/src/Core/Validation/BaseValidator.php
@@ -30,12 +30,10 @@
  */
 abstract class BaseValidator implements Validator
 {
-    /** @TODO in next major version: use `\CycloneDX\Core\Enums\Version` */
-    private readonly Spec $spec;
-
-    public function __construct(Spec $spec)
-    {
-        $this->spec = $spec;
+    public function __construct(
+        /* @TODO in next major version: use `\CycloneDX\Core\Enums\Version` instead of `Spec` */
+        private readonly Spec $spec
+    ) {
     }
 
     public function getSpec(): Spec

diff --git a/src/Core/Validation/ValidationError.php b/src/Core/Validation/ValidationError.php
@@ -30,16 +30,14 @@
  */
 class ValidationError
 {
-    private readonly string $message;
-
     /**
      * keep for internal debug purposes.
      */
     protected ?object $error = null;
 
-    final protected function __construct(string $message)
-    {
-        $this->message = $message;
+    final protected function __construct(
+        private readonly string $message
+    ) {
     }
 
     public function getMessage(): string