heiglandreas / holidayChecker

src/IteratorItem/SwapDecorator.php

Indentation +64 added lines, -64 removed lines

@@ -21,68 +21,68 @@
 
 class SwapDecorator implements HolidayIteratorItemInterface
 {
-	/** @var HolidayIteratorItemInterface */
-	private $rule;
-
-	/** @var CalendarDay */
-	private $day;
-
-	/** @var SwapRule[] */
-	private $swapRules;
-
-	public function __construct(HolidayIteratorItemInterface $rule, CalendarDay $day, SwapRule ...$swapRules)
-	{
-		$this->rule = $rule;
-		$this->day = $day;
-		$this->swapRules = $swapRules;
-	}
-
-	public function dateMatches(DateTimeInterface $date): bool
-	{
-		$year = (int) $date->format('Y');
-		$weekday = GregorianWeekday::fromIntlWeekday($this->day->getWeekdayForGregorianYear($year));
-		foreach ($this->swapRules as $rule) {
-			if ($this->ruleMatches($rule, $weekday)) {
-				return $this->isModifiedDate($date, $rule->getSwapToDay(), $rule->getDirection());
-			}
-		}
-
-		return $this->rule->dateMatches($date);
-	}
-
-	private function ruleMatches(SwapRule $rule, GregorianWeekday $weekday): bool
-	{
-		return in_array($weekday, $rule->getSwapWhenDays(), true);
-	}
-
-	private function isModifiedDate(DateTimeInterface $dateTime, GregorianWeekday $modifiedDay, SwapDirection $direction): bool
-	{
-		$cal = $this->day->getCalendar();
-		$cal = CalendarDay::setGregorianYearForDate((int) $dateTime->format('Y'), $cal);
-		$day = $cal->toDateTime();
-		$day->modify($direction->getDateTimeDirection() . ' ' . $modifiedDay);
-		$cal->setTime($day->getTimestamp() * 1000);
-		$cal2 = $this->day->getCalendar();
-		$cal2->setTime($dateTime->getTimestamp() * 1000);
-
-		if ($this->day->hasYearSet() && $cal->get(IntlCalendar::FIELD_YEAR) !== $cal2->get(IntlCalendar::FIELD_YEAR)) {
-			return false;
-		}
-
-		if ($cal->get(IntlCalendar::FIELD_MONTH) !== $cal2->get(IntlCalendar::FIELD_MONTH)) {
-			return false;
-		}
-
-		return $cal->get(IntlCalendar::FIELD_DAY_OF_MONTH) === $cal2->get(IntlCalendar::FIELD_DAY_OF_MONTH);
-	}
-
-	public function getName(): string
-	{
-		return $this->rule->getName();
-	}
-
-	public function isHoliday(): bool
-	{
-		return $this->rule->isHoliday();
-	}
+    /** @var HolidayIteratorItemInterface */
+    private $rule;
+
+    /** @var CalendarDay */
+    private $day;
+
+    /** @var SwapRule[] */
+    private $swapRules;
+
+    public function __construct(HolidayIteratorItemInterface $rule, CalendarDay $day, SwapRule ...$swapRules)
+    {
+        $this->rule = $rule;
+        $this->day = $day;
+        $this->swapRules = $swapRules;
+    }
+
+    public function dateMatches(DateTimeInterface $date): bool
+    {
+        $year = (int) $date->format('Y');
+        $weekday = GregorianWeekday::fromIntlWeekday($this->day->getWeekdayForGregorianYear($year));
+        foreach ($this->swapRules as $rule) {
+            if ($this->ruleMatches($rule, $weekday)) {
+                return $this->isModifiedDate($date, $rule->getSwapToDay(), $rule->getDirection());
+            }
+        }
+
+        return $this->rule->dateMatches($date);
+    }
+
+    private function ruleMatches(SwapRule $rule, GregorianWeekday $weekday): bool
+    {
+        return in_array($weekday, $rule->getSwapWhenDays(), true);
+    }
+
+    private function isModifiedDate(DateTimeInterface $dateTime, GregorianWeekday $modifiedDay, SwapDirection $direction): bool
+    {
+        $cal = $this->day->getCalendar();
+        $cal = CalendarDay::setGregorianYearForDate((int) $dateTime->format('Y'), $cal);
+        $day = $cal->toDateTime();
+        $day->modify($direction->getDateTimeDirection() . ' ' . $modifiedDay);
+        $cal->setTime($day->getTimestamp() * 1000);
+        $cal2 = $this->day->getCalendar();
+        $cal2->setTime($dateTime->getTimestamp() * 1000);
+
+        if ($this->day->hasYearSet() && $cal->get(IntlCalendar::FIELD_YEAR) !== $cal2->get(IntlCalendar::FIELD_YEAR)) {
+            return false;
+        }
+
+        if ($cal->get(IntlCalendar::FIELD_MONTH) !== $cal2->get(IntlCalendar::FIELD_MONTH)) {
+            return false;
+        }
+
+        return $cal->get(IntlCalendar::FIELD_DAY_OF_MONTH) === $cal2->get(IntlCalendar::FIELD_DAY_OF_MONTH);
+    }
+
+    public function getName(): string
+    {
+        return $this->rule->getName();
+    }
+
+    public function isHoliday(): bool
+    {
+        return $this->rule->isHoliday();
+    }
 }

src/HolidayIterator.php

Indentation +12 added lines, -12 removed lines

@@ -40,17 +40,17 @@
  */
 class HolidayIterator extends ArrayObject
 {
-	/**
-	 * @param mixed $value
-	 * @return void
-	 */
-	#[ReturnTypeWillChange]
-	public function append($value)
-	{
-		if (!$value instanceof HolidayIteratorItemInterface) {
-			return;
-		}
+    /**
+     * @param mixed $value
+     * @return void
+     */
+    #[ReturnTypeWillChange]
+    public function append($value)
+    {
+        if (!$value instanceof HolidayIteratorItemInterface) {
+            return;
+        }
 
-		parent::append($value);
-	}
+        parent::append($value);
+    }
 }

src/GregorianWeekday.php

Indentation +130 added lines, -130 removed lines

@@ -20,134 +20,134 @@
 
 final class GregorianWeekday
 {
-	private const MONDAY = 'monday';
-	private const TUESDAY = 'tuesday';
-	private const WEDNESDAY = 'wednesday';
-	private const THURSDAY = 'thursday';
-	private const FRIDAY = 'friday';
-	private const SATURDAY = 'saturday';
-	private const SUNDAY = 'sunday';
-	/** @var array<string, GregorianWeekday> */
-	private static $instances = [];
-	/** @var string */
-	private $value;
-
-	private function __construct(string $value)
-	{
-		$this->value = $value;
-	}
-
-	public static function monday(): self
-	{
-		if (!isset(self::$instances[self::MONDAY])) {
-			self::$instances[self::MONDAY] = new self(self::MONDAY);
-		}
-
-		return self::$instances[self::MONDAY];
-	}
-
-	public static function tuesday(): self
-	{
-		if (!isset(self::$instances[self::TUESDAY])) {
-			self::$instances[self::TUESDAY] = new self(self::TUESDAY);
-		}
-
-		return self::$instances[self::TUESDAY];
-	}
-
-	public static function wednesday(): self
-	{
-		if (!isset(self::$instances[self::WEDNESDAY])) {
-			self::$instances[self::WEDNESDAY] = new self(self::WEDNESDAY);
-		}
-
-		return self::$instances[self::WEDNESDAY];
-	}
-
-	public static function thursday(): self
-	{
-		if (!isset(self::$instances[self::THURSDAY])) {
-			self::$instances[self::THURSDAY] = new self(self::THURSDAY);
-		}
-
-		return self::$instances[self::THURSDAY];
-	}
-
-	public static function friday(): self
-	{
-		if (!isset(self::$instances[self::FRIDAY])) {
-			self::$instances[self::FRIDAY] = new self(self::FRIDAY);
-		}
-
-		return self::$instances[self::FRIDAY];
-	}
-
-	public static function saturday(): self
-	{
-		if (!isset(self::$instances[self::SATURDAY])) {
-			self::$instances[self::SATURDAY] = new self(self::SATURDAY);
-		}
-
-		return self::$instances[self::SATURDAY];
-	}
-
-	public static function sunday(): self
-	{
-		if (!isset(self::$instances[self::SUNDAY])) {
-			self::$instances[self::SUNDAY] = new self(self::SUNDAY);
-		}
-
-		return self::$instances[self::SUNDAY];
-	}
-
-	public static function fromDateTimeInterface(DateTimeInterface $date): self
-	{
-		return self::fromString($date->format('l'));
-	}
-
-	public static function fromString(string $weekday): self
-	{
-		if (!method_exists(self::class, strtolower($weekday))) {
-			throw new RuntimeException(sprintf(
-				'Weekday "%s" is not known',
-				$weekday
-			));
-		}
-
-		/** @var GregorianWeekday $gregorianWeekday */
-		$gregorianWeekday = [self::class, strtolower($weekday)]();
-
-		return $gregorianWeekday;
-	}
-
-	public static function fromIntlWeekday(int $weekday): self
-	{
-		$mapper = [
-			IntlCalendar::DOW_SUNDAY => 'sunday',
-			IntlCalendar::DOW_MONDAY => 'monday',
-			IntlCalendar::DOW_TUESDAY => 'tuesday',
-			IntlCalendar::DOW_WEDNESDAY => 'wednesday',
-			IntlCalendar::DOW_THURSDAY => 'thursday',
-			IntlCalendar::DOW_FRIDAY => 'friday',
-			IntlCalendar::DOW_SATURDAY => 'saturday',
-		];
-		if (!isset($mapper[$weekday])) {
-			throw new UnexpectedValueException(sprintf(
-				'IntlCalendar weekday %s could not be resolved',
-				$weekday
-			));
-		}
-
-		return self::fromString($mapper[$weekday]);
-	}
-
-	public function __toString(): string
-	{
-		return $this->getValue();
-	}
-
-	public function getValue(): string
-	{
-		return $this->value;
-	}
+    private const MONDAY = 'monday';
+    private const TUESDAY = 'tuesday';
+    private const WEDNESDAY = 'wednesday';
+    private const THURSDAY = 'thursday';
+    private const FRIDAY = 'friday';
+    private const SATURDAY = 'saturday';
+    private const SUNDAY = 'sunday';
+    /** @var array<string, GregorianWeekday> */
+    private static $instances = [];
+    /** @var string */
+    private $value;
+
+    private function __construct(string $value)
+    {
+        $this->value = $value;
+    }
+
+    public static function monday(): self
+    {
+        if (!isset(self::$instances[self::MONDAY])) {
+            self::$instances[self::MONDAY] = new self(self::MONDAY);
+        }
+
+        return self::$instances[self::MONDAY];
+    }
+
+    public static function tuesday(): self
+    {
+        if (!isset(self::$instances[self::TUESDAY])) {
+            self::$instances[self::TUESDAY] = new self(self::TUESDAY);
+        }
+
+        return self::$instances[self::TUESDAY];
+    }
+
+    public static function wednesday(): self
+    {
+        if (!isset(self::$instances[self::WEDNESDAY])) {
+            self::$instances[self::WEDNESDAY] = new self(self::WEDNESDAY);
+        }
+
+        return self::$instances[self::WEDNESDAY];
+    }
+
+    public static function thursday(): self
+    {
+        if (!isset(self::$instances[self::THURSDAY])) {
+            self::$instances[self::THURSDAY] = new self(self::THURSDAY);
+        }
+
+        return self::$instances[self::THURSDAY];
+    }
+
+    public static function friday(): self
+    {
+        if (!isset(self::$instances[self::FRIDAY])) {
+            self::$instances[self::FRIDAY] = new self(self::FRIDAY);
+        }
+
+        return self::$instances[self::FRIDAY];
+    }
+
+    public static function saturday(): self
+    {
+        if (!isset(self::$instances[self::SATURDAY])) {
+            self::$instances[self::SATURDAY] = new self(self::SATURDAY);
+        }
+
+        return self::$instances[self::SATURDAY];
+    }
+
+    public static function sunday(): self
+    {
+        if (!isset(self::$instances[self::SUNDAY])) {
+            self::$instances[self::SUNDAY] = new self(self::SUNDAY);
+        }
+
+        return self::$instances[self::SUNDAY];
+    }
+
+    public static function fromDateTimeInterface(DateTimeInterface $date): self
+    {
+        return self::fromString($date->format('l'));
+    }
+
+    public static function fromString(string $weekday): self
+    {
+        if (!method_exists(self::class, strtolower($weekday))) {
+            throw new RuntimeException(sprintf(
+                'Weekday "%s" is not known',
+                $weekday
+            ));
+        }
+
+        /** @var GregorianWeekday $gregorianWeekday */
+        $gregorianWeekday = [self::class, strtolower($weekday)]();
+
+        return $gregorianWeekday;
+    }
+
+    public static function fromIntlWeekday(int $weekday): self
+    {
+        $mapper = [
+            IntlCalendar::DOW_SUNDAY => 'sunday',
+            IntlCalendar::DOW_MONDAY => 'monday',
+            IntlCalendar::DOW_TUESDAY => 'tuesday',
+            IntlCalendar::DOW_WEDNESDAY => 'wednesday',
+            IntlCalendar::DOW_THURSDAY => 'thursday',
+            IntlCalendar::DOW_FRIDAY => 'friday',
+            IntlCalendar::DOW_SATURDAY => 'saturday',
+        ];
+        if (!isset($mapper[$weekday])) {
+            throw new UnexpectedValueException(sprintf(
+                'IntlCalendar weekday %s could not be resolved',
+                $weekday
+            ));
+        }
+
+        return self::fromString($mapper[$weekday]);
+    }
+
+    public function __toString(): string
+    {
+        return $this->getValue();
+    }
+
+    public function getValue(): string
+    {
+        return $this->value;
+    }
 }

src/Holiday.php

Indentation +24 added lines, -24 removed lines

@@ -34,28 +34,28 @@
 
 class Holiday
 {
-	private $holiday;
-
-	private $name;
-
-	public function __construct(bool $holiday, string $name = '')
-	{
-		$this->holiday = $holiday;
-		$this->name = $name;
-	}
-
-	public function isHoliday(): bool
-	{
-		return $this->holiday;
-	}
-
-	public function isNamed(): bool
-	{
-		return $this->name !== '';
-	}
-
-	public function getName(): string
-	{
-		return $this->name;
-	}
+    private $holiday;
+
+    private $name;
+
+    public function __construct(bool $holiday, string $name = '')
+    {
+        $this->holiday = $holiday;
+        $this->name = $name;
+    }
+
+    public function isHoliday(): bool
+    {
+        return $this->holiday;
+    }
+
+    public function isNamed(): bool
+    {
+        return $this->name !== '';
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
 }

src/HolidayIteratorItemInterface.php

Indentation +3 added lines, -3 removed lines

@@ -36,9 +36,9 @@
 
 interface HolidayIteratorItemInterface
 {
-	public function dateMatches(DateTimeInterface $date): bool;
+    public function dateMatches(DateTimeInterface $date): bool;
 
-	public function getName(): string;
+    public function getName(): string;
 
-	public function isHoliday(): bool;
+    public function isHoliday(): bool;
 }

src/HolidayIteratorFactory.php

Indentation +105 added lines, -105 removed lines

@@ -52,109 +52,109 @@
 
 class HolidayIteratorFactory
 {
-	/** @var ItemFromDomElementCreator[] */
-	private $factories;
-
-	/** @var DecorateFromDomElement[] */
-	private $decorators;
-
-	public function __construct()
-	{
-		$this->factories = [
-			new EasterFactory(),
-			new EasterOrthodoxFactory(),
-			new DateFactory(),
-			new DateFollowupFactory(),
-			new RelativeFactory(),
-		];
-
-		$this->decorators = [
-			new ObservanceDecoratorFactory(),
-			new SwapDecoratorFactory(),
-		];
-	}
-
-	/**
-	 * Create a HolidayIterator from an ISO 3166-code.
-	 *
-	 * @param string $isoCode
-	 *
-	 * @return HolidayIterator
-	 */
-	public function createIteratorFromISO3166(string $isoCode): HolidayIterator
-	{
-		$file = __DIR__ . '/../share/%s.xml';
-		$file1 = sprintf($file, $isoCode);
-
-		if (!is_readable($file1)) {
-			throw new UnexpectedValueException(sprintf(
-				'There is no holiday-file for %s',
-				$isoCode
-			));
-		}
-
-		return $this->createIteratorFromXmlFile($file1);
-	}
-
-	/**
-	 * Create a HolidayIterator from an XML-File
-	 *
-	 * The provided XML-File has to validate against the holiday.xsd-file you
-	 * can find in this projects "share" folder.
-	 *
-	 * @param string $file
-	 *
-	 * @return HolidayIterator
-	 */
-	public function createIteratorFromXmlFile(string $file): HolidayIterator
-	{
-		$iterator = new HolidayIterator();
-
-		$dom = new DOMDocument('1.0', 'UTF-8');
-		$dom->load($file);
-		$dom->xinclude();
-
-		if (!@$dom->schemaValidate(__DIR__ . '/../share/holidays.xsd')) {
-			throw new Exception('XML-File does not validate agains schema');
-		}
-		foreach ($dom->documentElement->childNodes as $child) {
-			if (!$child instanceof DOMElement) {
-				continue;
-			}
-			if ($child->nodeName === 'resources') {
-				continue;
-			}
-
-			try {
-				$element = $this->getElement($child);
-				$element = $this->decorateElement($element, $child);
-				$iterator->append($element);
-			} catch (Throwable $e) {
-				// Do nothing on purpose
-			}
-		}
-
-		return $iterator;
-	}
-
-	private function getElement(DOMElement $child): HolidayIteratorItemInterface
-	{
-		foreach ($this->factories as $factory) {
-			$element = $factory->itemFromDomElement($child);
-			if ($element instanceof HolidayIteratorItemInterface) {
-				return $element;
-			}
-		}
-
-		throw new RuntimeException('Unknown element encountered');
-	}
-
-	private function decorateElement(HolidayIteratorItemInterface $element, DOMElement $child): HolidayIteratorItemInterface
-	{
-		foreach ($this->decorators as $decorator) {
-			$element = $decorator->decorate($element, $child);
-		}
-
-		return $element;
-	}
+    /** @var ItemFromDomElementCreator[] */
+    private $factories;
+
+    /** @var DecorateFromDomElement[] */
+    private $decorators;
+
+    public function __construct()
+    {
+        $this->factories = [
+            new EasterFactory(),
+            new EasterOrthodoxFactory(),
+            new DateFactory(),
+            new DateFollowupFactory(),
+            new RelativeFactory(),
+        ];
+
+        $this->decorators = [
+            new ObservanceDecoratorFactory(),
+            new SwapDecoratorFactory(),
+        ];
+    }
+
+    /**
+     * Create a HolidayIterator from an ISO 3166-code.
+     *
+     * @param string $isoCode
+     *
+     * @return HolidayIterator
+     */
+    public function createIteratorFromISO3166(string $isoCode): HolidayIterator
+    {
+        $file = __DIR__ . '/../share/%s.xml';
+        $file1 = sprintf($file, $isoCode);
+
+        if (!is_readable($file1)) {
+            throw new UnexpectedValueException(sprintf(
+                'There is no holiday-file for %s',
+                $isoCode
+            ));
+        }
+
+        return $this->createIteratorFromXmlFile($file1);
+    }
+
+    /**
+     * Create a HolidayIterator from an XML-File
+     *
+     * The provided XML-File has to validate against the holiday.xsd-file you
+     * can find in this projects "share" folder.
+     *
+     * @param string $file
+     *
+     * @return HolidayIterator
+     */
+    public function createIteratorFromXmlFile(string $file): HolidayIterator
+    {
+        $iterator = new HolidayIterator();
+
+        $dom = new DOMDocument('1.0', 'UTF-8');
+        $dom->load($file);
+        $dom->xinclude();
+
+        if (!@$dom->schemaValidate(__DIR__ . '/../share/holidays.xsd')) {
+            throw new Exception('XML-File does not validate agains schema');
+        }
+        foreach ($dom->documentElement->childNodes as $child) {
+            if (!$child instanceof DOMElement) {
+                continue;
+            }
+            if ($child->nodeName === 'resources') {
+                continue;
+            }
+
+            try {
+                $element = $this->getElement($child);
+                $element = $this->decorateElement($element, $child);
+                $iterator->append($element);
+            } catch (Throwable $e) {
+                // Do nothing on purpose
+            }
+        }
+
+        return $iterator;
+    }
+
+    private function getElement(DOMElement $child): HolidayIteratorItemInterface
+    {
+        foreach ($this->factories as $factory) {
+            $element = $factory->itemFromDomElement($child);
+            if ($element instanceof HolidayIteratorItemInterface) {
+                return $element;
+            }
+        }
+
+        throw new RuntimeException('Unknown element encountered');
+    }
+
+    private function decorateElement(HolidayIteratorItemInterface $element, DOMElement $child): HolidayIteratorItemInterface
+    {
+        foreach ($this->decorators as $decorator) {
+            $element = $decorator->decorate($element, $child);
+        }
+
+        return $element;
+    }
 }

src/Calendar.php

Indentation +33 added lines, -33 removed lines

@@ -36,38 +36,38 @@
 
 class Calendar
 {
-	public const BUDDHIST = 'buddhist';
-	public const CHINESE = 'chinese';
-	public const COPTIC = 'coptic';
-	public const ETHIOPIAN = 'ethiopian';
-	public const GREGORIAN = 'gregorian';
-	public const HEBREW = 'hebrew';
-	public const INDIAN = 'indian';
-	public const ISLAMIC = 'islamic';
-	public const ISLAMIC_CIVIL = 'islamic-civil';
-	public const ISLAMIC_UMALQURA = 'islamic-umalqura';
-	public const ISLAMIC_RGSA = 'islamic-rgsa';
-	public const ISLAMIC_TBLA = 'islamic-tbla';
-	public const JAPANESE = 'japanese';
-	public const PERSIAN = 'persian';
+    public const BUDDHIST = 'buddhist';
+    public const CHINESE = 'chinese';
+    public const COPTIC = 'coptic';
+    public const ETHIOPIAN = 'ethiopian';
+    public const GREGORIAN = 'gregorian';
+    public const HEBREW = 'hebrew';
+    public const INDIAN = 'indian';
+    public const ISLAMIC = 'islamic';
+    public const ISLAMIC_CIVIL = 'islamic-civil';
+    public const ISLAMIC_UMALQURA = 'islamic-umalqura';
+    public const ISLAMIC_RGSA = 'islamic-rgsa';
+    public const ISLAMIC_TBLA = 'islamic-tbla';
+    public const JAPANESE = 'japanese';
+    public const PERSIAN = 'persian';
 
-	public static function isValidCalendarName(string $calendarname): bool
-	{
-		return in_array($calendarname, [
-			self::BUDDHIST,
-			self::CHINESE,
-			self::COPTIC,
-			self::ETHIOPIAN,
-			self::GREGORIAN,
-			self::HEBREW,
-			self::INDIAN,
-			self::ISLAMIC,
-			self::ISLAMIC_CIVIL,
-			self::ISLAMIC_RGSA,
-			self::ISLAMIC_TBLA,
-			self::ISLAMIC_UMALQURA,
-			self::JAPANESE,
-			self::PERSIAN,
-		]);
-	}
+    public static function isValidCalendarName(string $calendarname): bool
+    {
+        return in_array($calendarname, [
+            self::BUDDHIST,
+            self::CHINESE,
+            self::COPTIC,
+            self::ETHIOPIAN,
+            self::GREGORIAN,
+            self::HEBREW,
+            self::INDIAN,
+            self::ISLAMIC,
+            self::ISLAMIC_CIVIL,
+            self::ISLAMIC_RGSA,
+            self::ISLAMIC_TBLA,
+            self::ISLAMIC_UMALQURA,
+            self::JAPANESE,
+            self::PERSIAN,
+        ]);
+    }
 }

src/ObservanceDecorator.php

Indentation +43 added lines, -43 removed lines

@@ -14,47 +14,47 @@
 
 final class ObservanceDecorator implements HolidayIteratorItemInterface
 {
-	/** @var int|null */
-	private $firstObservance;
-
-	/** @var int|null */
-	private $lastObservance;
-
-	/** @var HolidayIteratorItemInterface */
-	private $wrapped;
-
-	public function __construct(HolidayIteratorItemInterface $wrapped, ?int $firstObservance, ?int $lastObservance)
-	{
-		$this->wrapped = $wrapped;
-		$this->firstObservance = $firstObservance;
-		$this->lastObservance = $lastObservance;
-	}
-
-	public function dateMatches(DateTimeInterface $date): bool
-	{
-		if (!$this->isWithinObservance((int) $date->format('Y'))) {
-			return false;
-		}
-
-		return $this->wrapped->dateMatches($date);
-	}
-
-	private function isWithinObservance(int $gregorianYear): bool
-	{
-		if (null !== $this->firstObservance && $this->firstObservance > $gregorianYear) {
-			return false;
-		}
-
-		return null === $this->lastObservance || $this->lastObservance >= $gregorianYear;
-	}
-
-	public function getName(): string
-	{
-		return $this->wrapped->getName();
-	}
-
-	public function isHoliday(): bool
-	{
-		return $this->wrapped->isHoliday();
-	}
+    /** @var int|null */
+    private $firstObservance;
+
+    /** @var int|null */
+    private $lastObservance;
+
+    /** @var HolidayIteratorItemInterface */
+    private $wrapped;
+
+    public function __construct(HolidayIteratorItemInterface $wrapped, ?int $firstObservance, ?int $lastObservance)
+    {
+        $this->wrapped = $wrapped;
+        $this->firstObservance = $firstObservance;
+        $this->lastObservance = $lastObservance;
+    }
+
+    public function dateMatches(DateTimeInterface $date): bool
+    {
+        if (!$this->isWithinObservance((int) $date->format('Y'))) {
+            return false;
+        }
+
+        return $this->wrapped->dateMatches($date);
+    }
+
+    private function isWithinObservance(int $gregorianYear): bool
+    {
+        if (null !== $this->firstObservance && $this->firstObservance > $gregorianYear) {
+            return false;
+        }
+
+        return null === $this->lastObservance || $this->lastObservance >= $gregorianYear;
+    }
+
+    public function getName(): string
+    {
+        return $this->wrapped->getName();
+    }
+
+    public function isHoliday(): bool
+    {
+        return $this->wrapped->isHoliday();
+    }
 }

src/Holidaychecker.php

Indentation +17 added lines, -17 removed lines

@@ -36,21 +36,21 @@
 
 class Holidaychecker
 {
-	private $iterator;
-
-	public function __construct(HolidayIterator $iterator)
-	{
-		$this->iterator = $iterator;
-	}
-
-	public function check(DateTimeInterface $date): Holiday
-	{
-		foreach ($this->iterator as $entry) {
-			if ($entry->dateMatches($date)) {
-				return new Holiday($entry->isHoliday(), $entry->getName());
-			}
-		}
-
-		return new Holiday(false);
-	}
+    private $iterator;
+
+    public function __construct(HolidayIterator $iterator)
+    {
+        $this->iterator = $iterator;
+    }
+
+    public function check(DateTimeInterface $date): Holiday
+    {
+        foreach ($this->iterator as $entry) {
+            if ($entry->dateMatches($date)) {
+                return new Holiday($entry->isHoliday(), $entry->getName());
+            }
+        }
+
+        return new Holiday(false);
+    }
 }