heiglandreas / holidayChecker

src/SwapDirection.php

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
 
 	public static function forward(): self
 	{
-		if (! isset(self::$instances[self::FORWARD])) {
+		if (!isset(self::$instances[self::FORWARD])) {
 			self::$instances[self::FORWARD] = new self(self::FORWARD);
 		}
 
@@ -52,7 +52,7 @@ 
 
 	public static function rewind(): self
 	{
-		if (! isset(self::$instances[self::REWIND])) {
+		if (!isset(self::$instances[self::REWIND])) {
 			self::$instances[self::REWIND] = new self(self::REWIND);
 		}
 

Indentation +44 added lines, -44 removed lines

@@ -12,52 +12,52 @@
 
 final class SwapDirection
 {
-	/** @var string */
-	private $value;
+    /** @var string */
+    private $value;
 
-	/** @var array<string, self> */
-	private static $instances = [];
+    /** @var array<string, self> */
+    private static $instances = [];
 
-	private const FORWARD = 'forward';
-	private const REWIND = 'rewind';
+    private const FORWARD = 'forward';
+    private const REWIND = 'rewind';
 
-	private function __construct(string $value)
+    private function __construct(string $value)
     {
-		$this->value = $value;
-	}
-
-	public function getValue(): string
-	{
-		return $this->value;
-	}
-
-	public function getDateTimeDirection(): string
-	{
-		switch ($this->value) {
-			case self::REWIND:
-				return 'previous';
-			case self::FORWARD:
-				return 'next';
-		}
-
-		return '';
-	}
-
-	public static function forward(): self
-	{
-		if (! isset(self::$instances[self::FORWARD])) {
-			self::$instances[self::FORWARD] = new self(self::FORWARD);
-		}
-
-		return self::$instances[self::FORWARD];
-	}
-
-	public static function rewind(): self
-	{
-		if (! isset(self::$instances[self::REWIND])) {
-			self::$instances[self::REWIND] = new self(self::REWIND);
-		}
-
-		return self::$instances[self::REWIND];
-	}
+        $this->value = $value;
+    }
+
+    public function getValue(): string
+    {
+        return $this->value;
+    }
+
+    public function getDateTimeDirection(): string
+    {
+        switch ($this->value) {
+            case self::REWIND:
+                return 'previous';
+            case self::FORWARD:
+                return 'next';
+        }
+
+        return '';
+    }
+
+    public static function forward(): self
+    {
+        if (! isset(self::$instances[self::FORWARD])) {
+            self::$instances[self::FORWARD] = new self(self::FORWARD);
+        }
+
+        return self::$instances[self::FORWARD];
+    }
+
+    public static function rewind(): self
+    {
+        if (! isset(self::$instances[self::REWIND])) {
+            self::$instances[self::REWIND] = new self(self::REWIND);
+        }
+
+        return self::$instances[self::REWIND];
+    }
 }

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 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;
-	}
-
-	/**
-	 * 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);
-	}
-
-	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 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;
+    }
+
+    /**
+     * 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);
+    }
+
+    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/SwapDecoratorFactory.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 		return new SwapRule(
 			$direction,
 			GregorianWeekday::fromString($to),
-			...array_map(function ($item) {
+			...array_map(function($item) {
 				return GregorianWeekday::fromString($item);
 			}, explode(' ', $when))
 		);

Indentation +45 added lines, -45 removed lines

@@ -22,57 +22,57 @@
 
 final class SwapDecoratorFactory implements DecorateFromDomElement
 {
-	public function decorate(HolidayIteratorItemInterface $element, DOMElement $domElement): HolidayIteratorItemInterface
-	{
-		$rules = $this->getRulesFromDomElement($domElement);
+    public function decorate(HolidayIteratorItemInterface $element, DOMElement $domElement): HolidayIteratorItemInterface
+    {
+        $rules = $this->getRulesFromDomElement($domElement);
 
-		if ($rules === []) {
-			return $element;
-		}
+        if ($rules === []) {
+            return $element;
+        }
 
-		$day = CalendarDayFactory::createCalendarDay(
-			(int) $domElement->getAttribute('day'),
-			(int) $domElement->getAttribute('month'),
-			($domElement->hasAttribute('calendar') ? $domElement->getAttribute('calendar') : 'gregorian')
-		);
+        $day = CalendarDayFactory::createCalendarDay(
+            (int) $domElement->getAttribute('day'),
+            (int) $domElement->getAttribute('month'),
+            ($domElement->hasAttribute('calendar') ? $domElement->getAttribute('calendar') : 'gregorian')
+        );
 
-		if ($domElement->hasAttribute('year')) {
-			$day->setYear((int) $domElement->getAttribute('year'));
-		}
+        if ($domElement->hasAttribute('year')) {
+            $day->setYear((int) $domElement->getAttribute('year'));
+        }
 
-		return new SwapDecorator($element, $day, ...$rules);
-	}
+        return new SwapDecorator($element, $day, ...$rules);
+    }
 
-	private function createRuleFrom(string $to, string $when, SwapDirection $direction): SwapRule
-	{
-		return new SwapRule(
-			$direction,
-			GregorianWeekday::fromString($to),
-			...array_map(function ($item) {
-				return GregorianWeekday::fromString($item);
-			}, explode(' ', $when))
-		);
-	}
+    private function createRuleFrom(string $to, string $when, SwapDirection $direction): SwapRule
+    {
+        return new SwapRule(
+            $direction,
+            GregorianWeekday::fromString($to),
+            ...array_map(function ($item) {
+                return GregorianWeekday::fromString($item);
+            }, explode(' ', $when))
+        );
+    }
 
-	/**
-	 * @return SwapRule[]
-	 */
-	private function getRulesFromDomElement(DOMElement $domElement): array
-	{
-		$attributes = [
-			'forward' => SwapDirection::forward(),
-			'alternateforward' => SwapDirection::forward(),
-			'rewind' => SwapDirection::rewind(),
-			'alternaterewind' => SwapDirection::rewind(),
-		];
+    /**
+     * @return SwapRule[]
+     */
+    private function getRulesFromDomElement(DOMElement $domElement): array
+    {
+        $attributes = [
+            'forward' => SwapDirection::forward(),
+            'alternateforward' => SwapDirection::forward(),
+            'rewind' => SwapDirection::rewind(),
+            'alternaterewind' => SwapDirection::rewind(),
+        ];
 
-		$rules = [];
-		foreach ($attributes as $attribute => $direction) {
-			if ($domElement->hasAttribute($attribute . 'to') && $domElement->hasAttribute($attribute . 'when')) {
-				$rules[] = $this->createRuleFrom($domElement->getAttribute($attribute . 'to'), $domElement->getAttribute($attribute . 'when'), $direction);
-			}
-		}
+        $rules = [];
+        foreach ($attributes as $attribute => $direction) {
+            if ($domElement->hasAttribute($attribute . 'to') && $domElement->hasAttribute($attribute . 'when')) {
+                $rules[] = $this->createRuleFrom($domElement->getAttribute($attribute . 'to'), $domElement->getAttribute($attribute . 'when'), $direction);
+            }
+        }
 
-		return $rules;
-	}
+        return $rules;
+    }
 }

src/Factory/DateFactory.php

Indentation +22 added lines, -22 removed lines

@@ -22,28 +22,28 @@
 
 class DateFactory implements ItemFromDomElementCreator
 {
-	public function itemFromDomElement(DOMElement $element): ?HolidayIteratorItemInterface
-	{
-		if ($element->nodeName !== 'date') {
-			return null;
-		}
-
-		$day = CalendarDayFactory::createCalendarDay(
-			(int) $element->getAttribute('day'),
-			(int) $element->getAttribute('month'),
-			($element->hasAttribute('calendar') ? $element->getAttribute('calendar') : 'gregorian')
-		);
-
-		if ($element->hasAttribute('year')) {
-			$day->setYear((int) $element->getAttribute('year'));
-		}
-
-		$date = new Date(
-			$element->textContent,
+    public function itemFromDomElement(DOMElement $element): ?HolidayIteratorItemInterface
+    {
+        if ($element->nodeName !== 'date') {
+            return null;
+        }
+
+        $day = CalendarDayFactory::createCalendarDay(
+            (int) $element->getAttribute('day'),
+            (int) $element->getAttribute('month'),
+            ($element->hasAttribute('calendar') ? $element->getAttribute('calendar') : 'gregorian')
+        );
+
+        if ($element->hasAttribute('year')) {
+            $day->setYear((int) $element->getAttribute('year'));
+        }
+
+        $date = new Date(
+            $element->textContent,
             $element->getAttribute('free') === "true",
-			$day,
-		);
+            $day,
+        );
 
-		return $date;
-	}
+        return $date;
+    }
 }

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);
-	}
-
-	public function getName(): string
-	{
-		return $this->rule->getName();
-	}
-
-	public function isHoliday(): bool
-	{
-		return $this->rule->isHoliday();
-	}
-
-	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);
-	}
+    /** @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);
+    }
+
+    public function getName(): string
+    {
+        return $this->rule->getName();
+    }
+
+    public function isHoliday(): bool
+    {
+        return $this->rule->isHoliday();
+    }
+
+    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);
+    }
 }

src/SwapRule.php

Indentation +31 added lines, -31 removed lines

@@ -12,35 +12,35 @@
 
 class SwapRule
 {
-	private $swapDirection;
-
-	private $swapToDay;
-
-	/** @var GregorianWeekday[] */
-	private $swapWhenDay;
-
-	/**
-	 * @param GregorianWeekday[] $swapWhenGregorianDay
-	 */
-	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;
-	}
-
-	public function getSwapWhenDays(): array
-	{
-		return $this->swapWhenDay;
-	}
+    private $swapDirection;
+
+    private $swapToDay;
+
+    /** @var GregorianWeekday[] */
+    private $swapWhenDay;
+
+    /**
+     * @param GregorianWeekday[] $swapWhenGregorianDay
+     */
+    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;
+    }
+
+    public function getSwapWhenDays(): array
+    {
+        return $this->swapWhenDay;
+    }
 }

src/IteratorItem/Relative.php

Indentation +4 added lines, -4 removed lines

@@ -69,12 +69,12 @@
             $this->day
         ));
 
-		/** @var DateTimeImmutable|false $day */
+        /** @var DateTimeImmutable|false $day */
         $day = $day->modify($this->relation);
 
-		if ($day === false) {
-			return false;
-		}
+        if ($day === false) {
+            return false;
+        }
 
         return $date->format('Y-m-d') === $day->format('Y-m-d');
     }

src/GregorianWeekday.php

Indentation +128 added lines, -128 removed lines

@@ -20,136 +20,136 @@
 
 final class GregorianWeekday
 {
-	/** @var string */
-	private $value;
+    /** @var string */
+    private $value;
 
-	/** @var array<string, GregorianWeekday> */
-	private static $instances = [];
+    /** @var array<string, GregorianWeekday> */
+    private static $instances = [];
 
-	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';
+    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';
 
-	private function __construct(string $value)
+    private function __construct(string $value)
     {
-		$this->value = $value;
-	}
-
-	public function getValue(): string
-	{
-		return $this->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 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 fromDateTimeInterface(DateTimeInterface $date): self
-	{
-		return self::fromString($date->format('l'));
-	}
-
-	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();
-	}
+        $this->value = $value;
+    }
+
+    public function getValue(): string
+    {
+        return $this->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 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 fromDateTimeInterface(DateTimeInterface $date): self
+    {
+        return self::fromString($date->format('l'));
+    }
+
+    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();
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -46,7 +46,7 @@ 
 
 	public static function monday(): self
 	{
-		if (! isset(self::$instances[self::MONDAY])) {
+		if (!isset(self::$instances[self::MONDAY])) {
 			self::$instances[self::MONDAY] = new self(self::MONDAY);
 		}
 
@@ -55,7 +55,7 @@ 
 
 	public static function tuesday(): self
 	{
-		if (! isset(self::$instances[self::TUESDAY])) {
+		if (!isset(self::$instances[self::TUESDAY])) {
 			self::$instances[self::TUESDAY] = new self(self::TUESDAY);
 		}
 
@@ -64,7 +64,7 @@ 
 
 	public static function wednesday(): self
 	{
-		if (! isset(self::$instances[self::WEDNESDAY])) {
+		if (!isset(self::$instances[self::WEDNESDAY])) {
 			self::$instances[self::WEDNESDAY] = new self(self::WEDNESDAY);
 		}
 
@@ -73,7 +73,7 @@ 
 
 	public static function thursday(): self
 	{
-		if (! isset(self::$instances[self::THURSDAY])) {
+		if (!isset(self::$instances[self::THURSDAY])) {
 			self::$instances[self::THURSDAY] = new self(self::THURSDAY);
 		}
 
@@ -82,7 +82,7 @@ 
 
 	public static function friday(): self
 	{
-		if (! isset(self::$instances[self::FRIDAY])) {
+		if (!isset(self::$instances[self::FRIDAY])) {
 			self::$instances[self::FRIDAY] = new self(self::FRIDAY);
 		}
 
@@ -91,7 +91,7 @@ 
 
 	public static function saturday(): self
 	{
-		if (! isset(self::$instances[self::SATURDAY])) {
+		if (!isset(self::$instances[self::SATURDAY])) {
 			self::$instances[self::SATURDAY] = new self(self::SATURDAY);
 		}
 
@@ -100,7 +100,7 @@ 
 
 	public static function sunday(): self
 	{
-		if (! isset(self::$instances[self::SUNDAY])) {
+		if (!isset(self::$instances[self::SUNDAY])) {
 			self::$instances[self::SUNDAY] = new self(self::SUNDAY);
 		}
 
@@ -109,7 +109,7 @@ 
 
 	public static function fromString(string $weekday): self
 	{
-		if (! method_exists(self::class, strtolower($weekday))) {
+		if (!method_exists(self::class, strtolower($weekday))) {
 			throw new RuntimeException(sprintf(
 				'Weekday "%s" is not known',
 				$weekday
@@ -138,7 +138,7 @@ 
 			IntlCalendar::DOW_FRIDAY    => 'friday',
 			IntlCalendar::DOW_SATURDAY  => 'saturday',
 		];
-		if (! isset($mapper[$weekday])) {
+		if (!isset($mapper[$weekday])) {
 			throw new UnexpectedValueException(sprintf(
 				'IntlCalendar weekday %s could not be resolved',
 				$weekday

src/CalendarDay.php

Indentation +29 added lines, -29 removed lines

@@ -91,41 +91,41 @@
         return $cal->get(IntlCalendar::FIELD_DAY_OF_MONTH) === $this->calendar->get(IntlCalendar::FIELD_DAY_OF_MONTH);
     }
 
-	public function getCalendar(): IntlCalendar
-	{
-		return clone $this->calendar;
-	}
+    public function getCalendar(): IntlCalendar
+    {
+        return clone $this->calendar;
+    }
 
-	public function hasYearSet(): bool
-	{
-		return null !== $this->year;
-	}
+    public function hasYearSet(): bool
+    {
+        return null !== $this->year;
+    }
 
     public function isFollowUpDay(DateTimeInterface $dateTime, string $followUpDay): bool
     {
-	    return $this->isModifiedDate($dateTime, $followUpDay, 'next');
+        return $this->isModifiedDate($dateTime, $followUpDay, 'next');
     }
 
-	private function isModifiedDate(DateTimeInterface $dateTime, string $modifiedDay, string $direction): bool
-	{
-		$cal = clone $this->calendar;
-		$cal = self::setGregorianYearForDate((int) $dateTime->format('Y'), $cal);
-		$day = $cal->toDateTime();
-		$day->modify($direction . ' ' . $modifiedDay);
-		$cal->setTime($day->getTimestamp() * 1000);
-		$cal2         = clone $this->calendar;
-		$cal2->setTime($dateTime->getTimestamp() * 1000);
-
-		if (null !== $this->year && $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);
-	}
+    private function isModifiedDate(DateTimeInterface $dateTime, string $modifiedDay, string $direction): bool
+    {
+        $cal = clone $this->calendar;
+        $cal = self::setGregorianYearForDate((int) $dateTime->format('Y'), $cal);
+        $day = $cal->toDateTime();
+        $day->modify($direction . ' ' . $modifiedDay);
+        $cal->setTime($day->getTimestamp() * 1000);
+        $cal2         = clone $this->calendar;
+        $cal2->setTime($dateTime->getTimestamp() * 1000);
+
+        if (null !== $this->year && $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 getWeekdayForGregorianYear(int $year): int
     {