ChineseCalendar changes

spatie · Jan 27, 2024 · 9bb7bb2 · 9bb7bb2
1 parent 57ff3b2
commit 9bb7bb2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/src/Calendars/ChineseCalendar.php b/src/Calendars/ChineseCalendar.php
@@ -8,11 +8,11 @@
 
 trait ChineseCalendar
 {
-    protected string $asianTimezone = 'Asia/Shanghai';
+    protected string $chineseCalendarTimezone = 'Asia/Shanghai';
 
-    public function setTimezoneForChineseCalendar(string $asianTimezone): static
+    public function setChineseCalendarTimezone(string $chineseCalendarTimezone): static
     {
-        $this->asianTimezone = $asianTimezone;
+        $this->chineseCalendarTimezone = $chineseCalendarTimezone;
 
         return $this;
     }
@@ -23,7 +23,7 @@ protected function chineseToGregorianDate(string $input, int $year): CarbonImmut
 
         return (new CarbonImmutable())
             ->setTimeStamp($timestamp)
-            ->setTimezone(new DateTimeZone($this->asianTimezone));
+            ->setTimezone(new DateTimeZone($this->chineseCalendarTimezone));
     }
 
     protected function getFormatter(): IntlDateFormatter
@@ -32,7 +32,7 @@ protected function getFormatter(): IntlDateFormatter
             locale: 'zh-CN@calendar=chinese',
             dateType: IntlDateFormatter::SHORT,
             timeType: IntlDateFormatter::NONE,
-            timezone: $this->asianTimezone,
+            timezone: $this->chineseCalendarTimezone,
             calendar: IntlDateFormatter::TRADITIONAL
         );
     }

diff --git a/src/Countries/Vietnam.php b/src/Countries/Vietnam.php
@@ -3,6 +3,7 @@
 namespace Spatie\Holidays\Countries;
 
 use Carbon\CarbonImmutable;
+use Carbon\CarbonInterface;
 use Spatie\Holidays\Calendars\ChineseCalendar;
 
 class Vietnam extends Country
@@ -31,7 +32,7 @@ protected function allHolidays(int $year): array
     /** @return array<string, CarbonImmutable> */
     protected function variableHolidays(int $year): array
     {
-        $this->setTimezoneForChineseCalendar('Asia/Ho_Chi_Minh');
+        $this->setChineseCalendarTimezone('Asia/Ho_Chi_Minh');
 
         return array_merge(
             $this->getHungKingsFestival($year),
@@ -82,31 +83,31 @@ protected function getTheExtraDayForIndependenceDay(int $year): array
         $independenceDay = CarbonImmutable::parse("$year-09-02")
             ->setTimeZone('Asia/Ho_Chi_Minh');
 
-        if ($independenceDay->dayOfWeek == CarbonImmutable::MONDAY) {
+        if ($independenceDay->dayOfWeek === CarbonInterface::MONDAY) {
             return ['Ngày Sau Quốc Khánh' => $independenceDay->addDay()];
         }
 
-        if ($independenceDay->dayOfWeek == CarbonImmutable::TUESDAY) {
+        if ($independenceDay->dayOfWeek === CarbonInterface::TUESDAY) {
             return ['Ngày Trước Quốc Khánh' => $independenceDay->subDay()];
         }
 
-        if ($independenceDay->dayOfWeek == CarbonImmutable::WEDNESDAY) {
+        if ($independenceDay->dayOfWeek === CarbonInterface::WEDNESDAY) {
             return ['Ngày Trước Quốc Khánh' => $independenceDay->subDay()];
         }
 
-        if ($independenceDay->dayOfWeek == CarbonImmutable::THURSDAY) {
+        if ($independenceDay->dayOfWeek === CarbonInterface::THURSDAY) {
             return ['Ngày Sau Quốc Khánh' => $independenceDay->addDay()];
         }
 
-        if ($independenceDay->dayOfWeek == CarbonImmutable::FRIDAY) {
+        if ($independenceDay->dayOfWeek === CarbonInterface::FRIDAY) {
             return ['Ngày Trước Quốc Khánh' => $independenceDay->subDay()];
         }
 
-        if ($independenceDay->dayOfWeek == CarbonImmutable::SATURDAY) {
+        if ($independenceDay->dayOfWeek === CarbonInterface::SATURDAY) {
             return ['Ngày Trước Quốc Khánh' => $independenceDay->subDay()];
         }
 
-        if ($independenceDay->dayOfWeek == CarbonImmutable::SUNDAY) {
+        if ($independenceDay->dayOfWeek === CarbonInterface::SUNDAY) {
             return ['Ngày Sau Quốc Khánh' => $independenceDay->addDays(2)];
         }