Promote some properties to the constructor.

Signed-off-by: Sacha Telgenhof <me@sachatelgenhof.com>

src/Yasumi/Filters/BetweenFilter.php

@@ -35,9 +35,6 @@ class BetweenFilter extends AbstractFilter
     /** end date of the time frame to check against */
     private string $endDate;
 
-    /** indicates whether the start and end dates should be included in the comparison */
-    private bool $equal;
-
     /**
      * Construct the Between FilterIterator Object.
      *
@@ -51,10 +48,9 @@ public function __construct(
         \Iterator $iterator,
         \DateTimeInterface $startDate,
         \DateTimeInterface $endDate,
-        bool $equal = true
+        private bool $equal = true
     ) {
         parent::__construct($iterator);
-        $this->equal = $equal;
         $this->startDate = $startDate->format(self::DATE_FORMAT);
         $this->endDate = $endDate->format(self::DATE_FORMAT);
     }

src/Yasumi/Holiday.php

@@ -64,14 +64,6 @@ class Holiday extends \DateTime implements \JsonSerializable
      */
     public string $shortName;
 
-    /**
-     * @var array<string, string> list of translations of this holiday
-     */
-    public array $translations;
-
-    /** identifies the type of holiday */
-    protected string $type;
-
     /** locale (i.e. language) in which the holiday information needs to be displayed in. (Default 'en_US') */
     protected string $displayLocale;
 
@@ -87,7 +79,7 @@ class Holiday extends \DateTime implements \JsonSerializable
      * (DateTimeInterface) has the correct timezone set. Otherwise, the default system timezone is used.
      *
      * @param string                $key           Holiday key
-     * @param array<string, string> $names         An array containing the name/description of this holiday in various
+     * @param array<string, string> $translations  An array containing the name/description of this holiday in various
      *                                             languages. Overrides global translations
      * @param \DateTimeInterface    $date          A DateTimeInterface instance representing the date of the holiday
      * @param string                $displayLocale Locale (i.e. language) in which the holiday information needs to be
@@ -102,10 +94,10 @@ class Holiday extends \DateTime implements \JsonSerializable
      */
     public function __construct(
         string $key,
-        array $names,
+        public array $translations,
         \DateTimeInterface $date,
         string $displayLocale = self::DEFAULT_LOCALE,
-        string $type = self::TYPE_OFFICIAL
+        protected string $type = self::TYPE_OFFICIAL
     ) {
         // Validate if key is not empty
         if ('' === $key) {
@@ -124,9 +116,7 @@ public function __construct(
 
         // Set additional attributes
         $this->shortName = $key;
-        $this->translations = $names;
         $this->displayLocale = $displayLocale;
-        $this->type = $type;
 
         // Construct instance
         parent::__construct($date->format('Y-m-d'), $date->getTimezone());

src/Yasumi/Provider/AbstractProvider.php

@@ -83,9 +83,6 @@ abstract class AbstractProvider implements \Countable, ProviderInterface, \Itera
      */
     private array $holidays = [];
 
-    /** global translations */
-    private ?TranslationsInterface $globalTranslations;
-
     /**
      * Creates a new holiday provider (i.e. country/state).
      *
@@ -97,13 +94,12 @@ abstract class AbstractProvider implements \Countable, ProviderInterface, \Itera
     public function __construct(
         int $year,
         ?string $locale = null,
-        ?TranslationsInterface $globalTranslations = null
+        private ?TranslationsInterface $globalTranslations = null
     ) {
         $this->clearHolidays();
 
         $this->year = $year ?: (int) date('Y');
         $this->locale = $locale ?? 'en_US';
-        $this->globalTranslations = $globalTranslations;
 
         $this->initialize();
     }

src/Yasumi/Translations.php

@@ -24,17 +24,12 @@ class Translations implements TranslationsInterface
      */
     public array $translations = [];
 
-    /**
-     * @var array<string> list of all defined locales
-     */
-    private array $availableLocales;
-
     /**
      * Constructor.
      *
      * @param array<string> $availableLocales list of all defined locales
      */
-    public function __construct(array $availableLocales)
+    public function __construct(private array $availableLocales)
     {
         $this->availableLocales = $availableLocales;
     }