heiglandreas / holidayChecker

src/Holiday.php

Indentation +26 added lines, -26 removed lines

@@ -34,30 +34,30 @@
 
 class Holiday
 {
-	/** @var bool */
-	private $holiday;
-
-	/** @var string */
-	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;
-	}
+    /** @var bool */
+    private $holiday;
+
+    /** @var string */
+    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/HolidayIteratorFactory.php

Indentation +110 added lines, -110 removed lines

@@ -52,114 +52,114 @@
 
 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');
-		}
-
-		$element = $dom->documentElement;
-		if ($element === null) {
-			return $iterator;
-		}
-		foreach ($element->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');
+        }
+
+        $element = $dom->documentElement;
+        if ($element === null) {
+            return $iterator;
+        }
+        foreach ($element->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/Factory/DateFollowupFactory.php

Indentation +26 added lines, -26 removed lines

@@ -18,30 +18,30 @@
 
 class DateFollowupFactory implements ItemFromDomElementCreator
 {
-	public function itemFromDomElement(DOMElement $element): ?HolidayIteratorItemInterface
-	{
-		if ($element->nodeName !== 'dateFollowUp') {
-			return null;
-		}
-
-		$day = CalendarDayFactory::createCalendarDay(
-			(int) $element->getAttribute('day'),
-			(int) $element->getAttribute('month'),
-			($element->hasAttribute('calendar') ? $element->getAttribute('calendar') : 'gregorian')
-		);
-
-		$replaced = [];
-		if ($element->hasAttribute('replaced')) {
-			/** @var array<"sunday"|"monday"|"tuesday"|"wednesday"|"thursday"|"friday"|"saturday"> $replaced */
-			$replaced = explode(' ', $element->getAttribute('replaced'));
-		}
-
-		return new DateFollowUp(
-			$element->textContent,
-			$element->getAttribute('free') === "true",
-			$day,
-			$element->getAttribute('followup'),
-			$replaced
-		);
-	}
+    public function itemFromDomElement(DOMElement $element): ?HolidayIteratorItemInterface
+    {
+        if ($element->nodeName !== 'dateFollowUp') {
+            return null;
+        }
+
+        $day = CalendarDayFactory::createCalendarDay(
+            (int) $element->getAttribute('day'),
+            (int) $element->getAttribute('month'),
+            ($element->hasAttribute('calendar') ? $element->getAttribute('calendar') : 'gregorian')
+        );
+
+        $replaced = [];
+        if ($element->hasAttribute('replaced')) {
+            /** @var array<"sunday"|"monday"|"tuesday"|"wednesday"|"thursday"|"friday"|"saturday"> $replaced */
+            $replaced = explode(' ', $element->getAttribute('replaced'));
+        }
+
+        return new DateFollowUp(
+            $element->textContent,
+            $element->getAttribute('free') === "true",
+            $day,
+            $element->getAttribute('followup'),
+            $replaced
+        );
+    }
 }

src/IteratorItem/Easter.php

Indentation +57 added lines, -57 removed lines

@@ -43,61 +43,61 @@
 
 class Easter implements HolidayIteratorItemInterface
 {
-	/** @var int */
-	private $offset;
-
-	/** @var bool */
-	private $holiday;
-
-	/** @var string */
-	private $name;
-
-	public function __construct(string $name, bool $holiday, int $offset)
-	{
-		$this->offset = $offset;
-		$this->holiday = $holiday;
-		$this->name = $name;
-	}
-
-	public function dateMatches(DateTimeInterface $date): bool
-	{
-		$year = (int) $date->format('Y');
-
-		$easter = $this->getEaster($year);
-		$day = $this->getOffsetDay($easter, $this->offset);
-
-		$comparator = new DateIntervalComparator();
-		return 0 > $comparator->compare($day->diff($date), new DateInterval('P1D'));
-	}
-
-	protected function getEaster(int $year): DateTimeImmutable
-	{
-		$base = new DateTimeImmutable($year . "-03-21", new DateTimeZone('UTC'));
-		$days = easter_days($year);
-
-		return $base->add(new DateInterval("P{$days}D"));
-	}
-
-	/**
-	 * @param DateTime|DateTimeImmutable $date
-	 * @return DateTime|DateTimeImmutable
-	 */
-	private function getOffsetDay($date, int $offset)
-	{
-		if ($offset < 0) {
-			return $date->sub(new DateInterval('P' . $offset * -1 . 'D'));
-		}
-
-		return $date->add(new DateInterval('P' . $offset . 'D'));
-	}
-
-	public function getName(): string
-	{
-		return $this->name;
-	}
-
-	public function isHoliday(): bool
-	{
-		return $this->holiday;
-	}
+    /** @var int */
+    private $offset;
+
+    /** @var bool */
+    private $holiday;
+
+    /** @var string */
+    private $name;
+
+    public function __construct(string $name, bool $holiday, int $offset)
+    {
+        $this->offset = $offset;
+        $this->holiday = $holiday;
+        $this->name = $name;
+    }
+
+    public function dateMatches(DateTimeInterface $date): bool
+    {
+        $year = (int) $date->format('Y');
+
+        $easter = $this->getEaster($year);
+        $day = $this->getOffsetDay($easter, $this->offset);
+
+        $comparator = new DateIntervalComparator();
+        return 0 > $comparator->compare($day->diff($date), new DateInterval('P1D'));
+    }
+
+    protected function getEaster(int $year): DateTimeImmutable
+    {
+        $base = new DateTimeImmutable($year . "-03-21", new DateTimeZone('UTC'));
+        $days = easter_days($year);
+
+        return $base->add(new DateInterval("P{$days}D"));
+    }
+
+    /**
+     * @param DateTime|DateTimeImmutable $date
+     * @return DateTime|DateTimeImmutable
+     */
+    private function getOffsetDay($date, int $offset)
+    {
+        if ($offset < 0) {
+            return $date->sub(new DateInterval('P' . $offset * -1 . 'D'));
+        }
+
+        return $date->add(new DateInterval('P' . $offset . 'D'));
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function isHoliday(): bool
+    {
+        return $this->holiday;
+    }
 }

src/IteratorItem/DateFollowUp.php

Indentation +79 added lines, -79 removed lines

@@ -41,83 +41,83 @@
 
 class DateFollowUp implements HolidayIteratorItemInterface
 {
-	/** @var CalendarDay */
-	private $day;
-
-	/** @var bool */
-	private $holiday;
-
-	/** @var string */
-	private $name;
-
-	/** @var string */
-	private $followup;
-
-	/** @var IntlCalendar::DOW*[] */
-	private $replaced;
-
-	/**
-	 * @param array<"sunday"|"monday"|"tuesday"|"wednesday"|"thursday"|"friday"|"saturday"> $replaced
-	 */
-	public function __construct(string $name, bool $holiday, CalendarDay $day, string $followup, array $replaced = [])
-	{
-		$this->day = $day;
-		$this->followup = $followup;
-		$this->holiday = $holiday;
-		$this->name = $name;
-		$this->replaced = $this->replacedDays($replaced);
-	}
-
-	/**
-	 * @param array<"sunday"|"monday"|"tuesday"|"wednesday"|"thursday"|"friday"|"saturday"|"foo"> $replaced
-	 * @return IntlCalendar::DOW_*[]
-	 */
-	private static function replacedDays(array $replaced): array
-	{
-		$daymap = [
-			'sunday' => IntlCalendar::DOW_SUNDAY,
-			'monday' => IntlCalendar::DOW_MONDAY,
-			'tuesday' => IntlCalendar::DOW_TUESDAY,
-			'wednesday' => IntlCalendar::DOW_WEDNESDAY,
-			'thursday' => IntlCalendar::DOW_THURSDAY,
-			'friday' => IntlCalendar::DOW_FRIDAY,
-			'saturday' => IntlCalendar::DOW_SATURDAY,
-		];
-
-		if ([] === $replaced) {
-			return [
-				IntlCalendar::DOW_SATURDAY,
-				IntlCalendar::DOW_SUNDAY,
-			];
-		}
-
-		return array_filter(array_map(function (string $day) use ($daymap) {
-			if (!isset($daymap[$day])) {
-				return null;
-			}
-			return $daymap[$day];
-		}, $replaced));
-	}
-
-	public function dateMatches(DateTimeInterface $date): bool
-	{
-		$gregorianYear = (int) $date->format('Y');
-		$weekday = $this->day->getWeekdayForGregorianYear($gregorianYear);
-
-		if (in_array($weekday, $this->replaced)) {
-			return $this->day->isFollowUpDay($date, $this->followup);
-		}
-
-		return $this->day->isSameDay($date);
-	}
-
-	public function getName(): string
-	{
-		return $this->name;
-	}
-
-	public function isHoliday(): bool
-	{
-		return $this->holiday;
-	}
+    /** @var CalendarDay */
+    private $day;
+
+    /** @var bool */
+    private $holiday;
+
+    /** @var string */
+    private $name;
+
+    /** @var string */
+    private $followup;
+
+    /** @var IntlCalendar::DOW*[] */
+    private $replaced;
+
+    /**
+     * @param array<"sunday"|"monday"|"tuesday"|"wednesday"|"thursday"|"friday"|"saturday"> $replaced
+     */
+    public function __construct(string $name, bool $holiday, CalendarDay $day, string $followup, array $replaced = [])
+    {
+        $this->day = $day;
+        $this->followup = $followup;
+        $this->holiday = $holiday;
+        $this->name = $name;
+        $this->replaced = $this->replacedDays($replaced);
+    }
+
+    /**
+     * @param array<"sunday"|"monday"|"tuesday"|"wednesday"|"thursday"|"friday"|"saturday"|"foo"> $replaced
+     * @return IntlCalendar::DOW_*[]
+     */
+    private static function replacedDays(array $replaced): array
+    {
+        $daymap = [
+            'sunday' => IntlCalendar::DOW_SUNDAY,
+            'monday' => IntlCalendar::DOW_MONDAY,
+            'tuesday' => IntlCalendar::DOW_TUESDAY,
+            'wednesday' => IntlCalendar::DOW_WEDNESDAY,
+            'thursday' => IntlCalendar::DOW_THURSDAY,
+            'friday' => IntlCalendar::DOW_FRIDAY,
+            'saturday' => IntlCalendar::DOW_SATURDAY,
+        ];
+
+        if ([] === $replaced) {
+            return [
+                IntlCalendar::DOW_SATURDAY,
+                IntlCalendar::DOW_SUNDAY,
+            ];
+        }
+
+        return array_filter(array_map(function (string $day) use ($daymap) {
+            if (!isset($daymap[$day])) {
+                return null;
+            }
+            return $daymap[$day];
+        }, $replaced));
+    }
+
+    public function dateMatches(DateTimeInterface $date): bool
+    {
+        $gregorianYear = (int) $date->format('Y');
+        $weekday = $this->day->getWeekdayForGregorianYear($gregorianYear);
+
+        if (in_array($weekday, $this->replaced)) {
+            return $this->day->isFollowUpDay($date, $this->followup);
+        }
+
+        return $this->day->isSameDay($date);
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function isHoliday(): bool
+    {
+        return $this->holiday;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
 			];
 		}
 
-		return array_filter(array_map(function (string $day) use ($daymap) {
+		return array_filter(array_map(function(string $day) use ($daymap) {
 			if (!isset($daymap[$day])) {
 				return null;
 			}

src/IteratorItem/Relative.php

Indentation +54 added lines, -54 removed lines

@@ -39,58 +39,58 @@
 
 class Relative implements HolidayIteratorItemInterface
 {
-	/** @var int */
-	private $day;
-
-	/** @var int */
-	private $month;
-
-	/** @var string */
-	private $relation;
-
-	/** @var bool */
-	private $holiday;
-
-	/** @var string */
-	private $name;
-
-	public function __construct(string $name, bool $holiday, int $day, int $month, string $relation)
-	{
-		$this->day = $day;
-		$this->month = $month;
-		$this->relation = $relation;
-		$this->holiday = $holiday;
-		$this->name = $name;
-	}
-
-	public function dateMatches(DateTimeInterface $date): bool
-	{
-		$year = (int) $date->format('Y');
-
-		$day = new DateTimeImmutable(sprintf(
-			'%s-%s-%s',
-			$year,
-			$this->month,
-			$this->day
-		));
-
-		/** @var DateTimeImmutable|false $day */
-		$day = $day->modify($this->relation);
-
-		if ($day === false) {
-			return false;
-		}
-
-		return $date->format('Y-m-d') === $day->format('Y-m-d');
-	}
-
-	public function getName(): string
-	{
-		return $this->name;
-	}
-
-	public function isHoliday(): bool
-	{
-		return $this->holiday;
-	}
+    /** @var int */
+    private $day;
+
+    /** @var int */
+    private $month;
+
+    /** @var string */
+    private $relation;
+
+    /** @var bool */
+    private $holiday;
+
+    /** @var string */
+    private $name;
+
+    public function __construct(string $name, bool $holiday, int $day, int $month, string $relation)
+    {
+        $this->day = $day;
+        $this->month = $month;
+        $this->relation = $relation;
+        $this->holiday = $holiday;
+        $this->name = $name;
+    }
+
+    public function dateMatches(DateTimeInterface $date): bool
+    {
+        $year = (int) $date->format('Y');
+
+        $day = new DateTimeImmutable(sprintf(
+            '%s-%s-%s',
+            $year,
+            $this->month,
+            $this->day
+        ));
+
+        /** @var DateTimeImmutable|false $day */
+        $day = $day->modify($this->relation);
+
+        if ($day === false) {
+            return false;
+        }
+
+        return $date->format('Y-m-d') === $day->format('Y-m-d');
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function isHoliday(): bool
+    {
+        return $this->holiday;
+    }
 }

src/SwapRule.php

Indentation +33 added lines, -33 removed lines

@@ -12,37 +12,37 @@
 
 class SwapRule
 {
-	/** @var SwapDirection */
-	private $swapDirection;
-
-	/** @var GregorianWeekday */
-	private $swapToDay;
-
-	/** @var GregorianWeekday[] */
-	private $swapWhenDay;
-
-	public function __construct(SwapDirection $direction, GregorianWeekday $swapToGregorianDay, GregorianWeekday ...$swapWhenGregorianDay)
-	{
-		$this->swapDirection = $direction;
-		$this->swapToDay = $swapToGregorianDay;
-		$this->swapWhenDay = $swapWhenGregorianDay;
-	}
-
-	public function getDirection(): SwapDirection
-	{
-		return $this->swapDirection;
-	}
-
-	public function getSwapToDay(): GregorianWeekday
-	{
-		return $this->swapToDay;
-	}
-
-	/**
-	 * @return GregorianWeekday[]
-	 */
-	public function getSwapWhenDays(): array
-	{
-		return $this->swapWhenDay;
-	}
+    /** @var SwapDirection */
+    private $swapDirection;
+
+    /** @var GregorianWeekday */
+    private $swapToDay;
+
+    /** @var GregorianWeekday[] */
+    private $swapWhenDay;
+
+    public function __construct(SwapDirection $direction, GregorianWeekday $swapToGregorianDay, GregorianWeekday ...$swapWhenGregorianDay)
+    {
+        $this->swapDirection = $direction;
+        $this->swapToDay = $swapToGregorianDay;
+        $this->swapWhenDay = $swapWhenGregorianDay;
+    }
+
+    public function getDirection(): SwapDirection
+    {
+        return $this->swapDirection;
+    }
+
+    public function getSwapToDay(): GregorianWeekday
+    {
+        return $this->swapToDay;
+    }
+
+    /**
+     * @return GregorianWeekday[]
+     */
+    public function getSwapWhenDays(): array
+    {
+        return $this->swapWhenDay;
+    }
 }

src/GregorianWeekday.php

Indentation +132 added lines, -132 removed lines

@@ -20,136 +20,136 @@
 
 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
-	{
-		$weekday = strtolower($weekday);
-		$callable = [self::class, $weekday];
-		if (! is_callable($callable)) {
-			throw new RuntimeException(sprintf(
-				'Weekday "%s" is not known',
-				$weekday
-			));
-		}
-
-		/** @var GregorianWeekday $gregorianWeekday */
-		$gregorianWeekday = $callable();
-
-		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
+    {
+        $weekday = strtolower($weekday);
+        $callable = [self::class, $weekday];
+        if (! is_callable($callable)) {
+            throw new RuntimeException(sprintf(
+                'Weekday "%s" is not known',
+                $weekday
+            ));
+        }
+
+        /** @var GregorianWeekday $gregorianWeekday */
+        $gregorianWeekday = $callable();
+
+        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;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
 	{
 		$weekday = strtolower($weekday);
 		$callable = [self::class, $weekday];
-		if (! is_callable($callable)) {
+		if (!is_callable($callable)) {
 			throw new RuntimeException(sprintf(
 				'Weekday "%s" is not known',
 				$weekday

src/Holidaychecker.php

Indentation +18 added lines, -18 removed lines

@@ -36,22 +36,22 @@
 
 class Holidaychecker
 {
-	/** @var HolidayIterator */
-	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);
-	}
+    /** @var HolidayIterator */
+    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);
+    }
 }