v1.3.5 修复闰月月相错误。

Author: 6tail

CHANGELOG.md

@@ -101,3 +101,6 @@
 2. 新增：月相获取公历日、公历时刻。
 3. 优化：更新△T参数。
 4. 修复：农历闰月干支错误(应随上月)。
+
+## [1.3.5] - 2025-09-30
+1. 修复：闰月月相错误。

src/culture/Phase.php

@@ -36,7 +36,7 @@ protected function __construct(int $lunarYear, int $lunarMonth, ?int $index = nu
             parent::__construct(static::$NAMES, $index);
             $m = LunarMonth::fromYm($lunarYear, $lunarMonth)->next(intdiv($index, $this->getSize()));
             $this->lunarYear = $m->getYear();
-            $this->lunarMonth = $m->getMonth();
+            $this->lunarMonth = $m->getMonthWithLeap();
         } else if ($name !== null) {
             parent::__construct(static::$NAMES, null, $name);
             $this->lunarYear = $lunarYear;
@@ -66,7 +66,7 @@ function next(int $n): static
         if ($i != 0) {
             $m = $m->next($i);
         }
-        return static::fromIndex($m->getYear(), $m->getMonth(), $this->nextIndex($n));
+        return static::fromIndex($m->getYear(), $m->getMonthWithLeap(), $this->nextIndex($n));
     }
 
     function getStartSolarTime(): SolarTime

src/lunar/LunarDay.php

@@ -296,9 +296,9 @@ function getPhaseDay(): PhaseDay
     {
         $today = $this->getSolarDay();
         $m = $this->month->next(1);
-        $p = Phase::fromIndex($m->getYear(), $m->getMonth(), 0);
+        $p = Phase::fromIndex($m->getYear(), $m->getMonthWithLeap(), 0);
         $d = $p->getSolarDay();
-        while ($p->getSolarDay()->isAfter($today)) {
+        while ($d->isAfter($today)) {
             $p = $p->next(-1);
             $d = $p->getSolarDay();
         }

src/solar/SolarDay.php

@@ -471,7 +471,7 @@ function getRabByungDay(): RabByungDay
     function getPhaseDay(): PhaseDay
     {
         $month = $this->getLunarDay()->getLunarMonth()->next(1);
-        $p = Phase::fromIndex($month->getYear(), $month->getMonth(), 0);
+        $p = Phase::fromIndex($month->getYear(), $month->getMonthWithLeap(), 0);
         $d = $p->getSolarDay();
         while ($d->isAfter($this)) {
             $p = $p->next(-1);

src/solar/SolarTime.php

@@ -296,7 +296,7 @@ function getSixtyCycleHour(): SixtyCycleHour
     function getPhase(): Phase
     {
         $month = $this->getLunarHour()->getLunarDay()->getLunarMonth()->next(1);
-        $p = Phase::fromIndex($month->getYear(), $month->getMonth(), 0);
+        $p = Phase::fromIndex($month->getYear(), $month->getMonthWithLeap(), 0);
         while ($p->getSolarTime()->isAfter($this)) {
             $p = $p->next(-1);
         }

src/util/ShouXingUtil.php

@@ -390,8 +390,7 @@ static function eLon($t, $n)
     }
     $v /= static::$XL0[0];
     $t2 = $t * $t;
-    $v += (-0.0728 - 2.7702 * $t - 1.1019 * $t2 - 0.0996 * $t2 * $t) / static::SECOND_PER_RAD;
-    return $v;
+    return $v + (-0.0728 - 2.7702 * $t - 1.1019 * $t2 - 0.0996 * $t2 * $t) / static::SECOND_PER_RAD;
   }
 
   static function mLon($t, $n): float
@@ -433,8 +432,7 @@ static function mLon($t, $n): float
       }
       $v += $c * $tn;
     }
-    $v /= static::SECOND_PER_RAD;
-    return $v;
+    return $v / static::SECOND_PER_RAD;
   }
 
   static function gxcSunLon($t): float
@@ -493,8 +491,7 @@ static function dtT($t): float
   static function mv($t): float
   {
     $v = 8399.71 - 914 * sin(0.7848 + 8328.691425 * $t + 0.0001523 * $t * $t);
-    $v -= 179 * sin(2.543 + 15542.7543 * $t) + 160 * sin(0.1874 + 7214.0629 * $t) + 62 * sin(3.14 + 16657.3828 * $t) + 34 * sin(4.827 + 16866.9323 * $t) + 22 * sin(4.9 + 23871.4457 * $t) + 12 * sin(2.59 + 14914.4523 * $t) + 7 * sin(0.23 + 6585.7609 * $t) + 5 * sin(0.9 + 25195.624 * $t) + 5 * sin(2.32 - 7700.3895 * $t) + 5 * sin(3.88 + 8956.9934 * $t) + 5 * sin(0.49 + 7771.3771 * $t);
-    return $v;
+    return $v - (179 * sin(2.543 + 15542.7543 * $t) + 160 * sin(0.1874 + 7214.0629 * $t) + 62 * sin(3.14 + 16657.3828 * $t) + 34 * sin(4.827 + 16866.9323 * $t) + 22 * sin(4.9 + 23871.4457 * $t) + 12 * sin(2.59 + 14914.4523 * $t) + 7 * sin(0.23 + 6585.7609 * $t) + 5 * sin(0.9 + 25195.624 * $t) + 5 * sin(2.32 - 7700.3895 * $t) + 5 * sin(3.88 + 8956.9934 * $t) + 5 * sin(0.49 + 7771.3771 * $t));
   }
 
   static function saLonT($w): float
@@ -503,18 +500,15 @@ static function saLonT($w): float
     $t = ($w - 1.75347 - M_PI) / $v;
     $v = static::ev($t);
     $t += ($w - static::saLon($t, 10)) / $v;
-    $v = static::ev($t);
-    $t += ($w - static::saLon($t, -1)) / $v;
-    return $t;
+    return $t + (($w - static::saLon($t, -1)) / static::ev($t));
   }
 
   static function saLonT2($w): float
   {
     $v = 628.3319653318;
     $t = ($w - 1.75347 - M_PI) / $v;
     $t -= (0.000005297 * $t * $t + 0.0334166 * cos(4.669257 + 628.307585 * $t) + 0.0002061 * cos(2.67823 + 628.307585 * $t) * $t) / $v;
-    $t += ($w - static::eLon($t, 8) - M_PI + (20.5 + 17.2 * sin(2.1824 - 33.75705 * $t)) / static::SECOND_PER_RAD) / $v;
-    return $t;
+    return $t + (($w - static::eLon($t, 8) - M_PI + (20.5 + 17.2 * sin(2.1824 - 33.75705 * $t)) / static::SECOND_PER_RAD) / $v);
   }
 
   static function msaLon($t, $mn, $sn): float
@@ -529,8 +523,7 @@ static function msaLonT($w): float
     $t += ($w - static::msaLon($t, 3, 3)) / $v;
     $v = static::mv($t) - static::ev($t);
     $t += ($w - static::msaLon($t, 20, 10)) / $v;
-    $t += ($w - static::msaLon($t, -1, 60)) / $v;
-    return $t;
+    return $t + (($w - static::msaLon($t, -1, 60)) / $v);
   }
 
   static function msaLonT2($w): float
@@ -541,8 +534,7 @@ static function msaLonT2($w): float
     $t -= (-0.00003309 * $t2 + 0.10976 * cos(0.784758 + 8328.6914246 * $t + 0.000152292 * $t2) + 0.02224 * cos(0.18740 + 7214.0628654 * $t - 0.00021848 * $t2) - 0.03342 * cos(4.669257 + 628.307585 * $t)) / $v;
     $l = static::mLon($t, 20) - (4.8950632 + 628.3319653318 * $t + 0.000005297 * $t * $t + 0.0334166 * cos(4.669257 + 628.307585 * $t) + 0.0002061 * cos(2.67823 + 628.307585 * $t) * $t + 0.000349 * cos(4.6261 + 1256.61517 * $t) - 20.5 / static::SECOND_PER_RAD);
     $v = 7771.38 - 914 * sin(0.7848 + 8328.691425 * $t + 0.0001523 * $t * $t) - 179 * sin(2.543 + 15542.7543 * $t) - 160 * sin(0.1874 + 7214.0629 * $t);
-    $t += ($w - $l) / $v;
-    return $t;
+    return $t + ($w - $l) / $v;
   }
 
   static function qiHigh($w): float