Skip to content

Commit

Permalink
Merge pull request #25 from overtrue/analysis-qoe51B
Browse files Browse the repository at this point in the history
Apply fixes from StyleCI
  • Loading branch information
overtrue authored Aug 29, 2018
2 parents 5fe5b64 + 7467a96 commit a3c4d9f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/Calendar.php
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ public function ganZhiYear($lunarYear, $termIndex = null)
/**
* 据维基百科干支词条:『在西历新年后,华夏新年或干支历新年之前,则续用上一年之干支』
* 所以干支年份应该不需要根据节气校正,为免影响现有系统,此处暂时保留原有逻辑
* https://zh.wikipedia.org/wiki/%E5%B9%B2%E6%94%AF
* https://zh.wikipedia.org/wiki/%E5%B9%B2%E6%94%AF.
*
* 即使考虑节气,有的年份没有立春,有的年份有两个立春,此处逻辑仍不能处理该特殊情况
*/
Expand Down
10 changes: 4 additions & 6 deletions tests/CalendarTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@

class CalendarTest extends TestCase
{

#region ganZhiYear
//region ganZhiYear

public function testJiaZiGanZhiYear()
{
Expand All @@ -29,8 +28,7 @@ public function testKuiHaiGanZhiYear()
$this->assertEquals('癸亥', $ganZhi);
}

#endregion ganZhiYear

//endregion ganZhiYear

public function testSameNormalDateDiffInYears()
{
Expand Down Expand Up @@ -4893,9 +4891,9 @@ public function testSubDaysOverYears()
$this->assertEquals(false, $newLunar['is_leap']);
}

#endregion subDays
//endregion subDays

#region getAnimal
//region getAnimal

public function testMouseGetAnimal()
{
Expand Down

0 comments on commit a3c4d9f

Please sign in to comment.