fix: Fix lose of values of layout, weekStartsAt, weekendDays and lang when create new carbon instance #303

Author: kuafuRace

boundary.go

@@ -6,7 +6,7 @@ func (c *Carbon) StartOfCentury() *Carbon {
 	if c.IsInvalid() {
 		return c
 	}
-	return create(c.Year()/YearsPerCentury*YearsPerCentury, 1, 1, 0, 0, 0, 0).SetLocation(c.loc)
+	return c.create(c.Year()/YearsPerCentury*YearsPerCentury, 1, 1, 0, 0, 0, 0)
 }
 
 // EndOfCentury returns a Carbon instance for end of the century.
@@ -15,7 +15,7 @@ func (c *Carbon) EndOfCentury() *Carbon {
 	if c.IsInvalid() {
 		return c
 	}
-	return create(c.Year()/YearsPerCentury*YearsPerCentury+99, 12, 31, 23, 59, 59, 999999999).SetLocation(c.loc)
+	return c.create(c.Year()/YearsPerCentury*YearsPerCentury+99, 12, 31, 23, 59, 59, 999999999)
 }
 
 // StartOfDecade returns a Carbon instance for start of the decade.
@@ -24,7 +24,7 @@ func (c *Carbon) StartOfDecade() *Carbon {
 	if c.IsInvalid() {
 		return c
 	}
-	return create(c.Year()/YearsPerDecade*YearsPerDecade, 1, 1, 0, 0, 0, 0).SetLocation(c.loc)
+	return c.create(c.Year()/YearsPerDecade*YearsPerDecade, 1, 1, 0, 0, 0, 0)
 }
 
 // EndOfDecade returns a Carbon instance for end of the decade.
@@ -33,7 +33,7 @@ func (c *Carbon) EndOfDecade() *Carbon {
 	if c.IsInvalid() {
 		return c
 	}
-	return create(c.Year()/YearsPerDecade*YearsPerDecade+9, 12, 31, 23, 59, 59, 999999999).SetLocation(c.loc)
+	return c.create(c.Year()/YearsPerDecade*YearsPerDecade+9, 12, 31, 23, 59, 59, 999999999)
 }
 
 // StartOfYear returns a Carbon instance for start of the year.
@@ -42,7 +42,7 @@ func (c *Carbon) StartOfYear() *Carbon {
 	if c.IsInvalid() {
 		return c
 	}
-	return create(c.Year(), 1, 1, 0, 0, 0, 0).SetLocation(c.loc)
+	return c.create(c.Year(), 1, 1, 0, 0, 0, 0)
 }
 
 // EndOfYear returns a Carbon instance for end of the year.
@@ -51,7 +51,7 @@ func (c *Carbon) EndOfYear() *Carbon {
 	if c.IsInvalid() {
 		return c
 	}
-	return create(c.Year(), 12, 31, 23, 59, 59, 999999999).SetLocation(c.loc)
+	return c.create(c.Year(), 12, 31, 23, 59, 59, 999999999)
 }
 
 // StartOfQuarter returns a Carbon instance for start of the quarter.
@@ -61,7 +61,7 @@ func (c *Carbon) StartOfQuarter() *Carbon {
 		return c
 	}
 	year, quarter, day := c.Year(), c.Quarter(), 1
-	return create(year, 3*quarter-2, day, 0, 0, 0, 0).SetLocation(c.loc)
+	return c.create(year, 3*quarter-2, day, 0, 0, 0, 0)
 }
 
 // EndOfQuarter returns a Carbon instance for end of the quarter.
@@ -77,7 +77,7 @@ func (c *Carbon) EndOfQuarter() *Carbon {
 	case 2, 3:
 		day = 30
 	}
-	return create(year, 3*quarter, day, 23, 59, 59, 999999999).SetLocation(c.loc)
+	return c.create(year, 3*quarter, day, 23, 59, 59, 999999999)
 }
 
 // StartOfMonth returns a Carbon instance for start of the month.
@@ -87,7 +87,7 @@ func (c *Carbon) StartOfMonth() *Carbon {
 		return c
 	}
 	year, month, _ := c.Date()
-	return create(year, month, 1, 0, 0, 0, 0).SetLocation(c.loc)
+	return c.create(year, month, 1, 0, 0, 0, 0)
 }
 
 // EndOfMonth returns a Carbon instance for end of the month.
@@ -97,7 +97,7 @@ func (c *Carbon) EndOfMonth() *Carbon {
 		return c
 	}
 	year, month, _ := c.Date()
-	return create(year, month+1, 0, 23, 59, 59, 999999999).SetLocation(c.loc)
+	return c.create(year, month+1, 0, 23, 59, 59, 999999999)
 }
 
 // StartOfWeek returns a Carbon instance for start of the week.
@@ -133,7 +133,7 @@ func (c *Carbon) StartOfDay() *Carbon {
 		return c
 	}
 	year, month, day := c.Date()
-	return create(year, month, day, 0, 0, 0, 0).SetLocation(c.loc)
+	return c.create(year, month, day, 0, 0, 0, 0)
 }
 
 // EndOfDay returns a Carbon instance for end of the day.
@@ -143,7 +143,7 @@ func (c *Carbon) EndOfDay() *Carbon {
 		return c
 	}
 	year, month, day := c.Date()
-	return create(year, month, day, 23, 59, 59, 999999999).SetLocation(c.loc)
+	return c.create(year, month, day, 23, 59, 59, 999999999)
 }
 
 // StartOfHour returns a Carbon instance for start of the hour.
@@ -153,7 +153,7 @@ func (c *Carbon) StartOfHour() *Carbon {
 		return c
 	}
 	year, month, day := c.Date()
-	return create(year, month, day, c.Hour(), 0, 0, 0).SetLocation(c.loc)
+	return c.create(year, month, day, c.Hour(), 0, 0, 0)
 }
 
 // EndOfHour returns a Carbon instance for end of the hour.
@@ -163,7 +163,7 @@ func (c *Carbon) EndOfHour() *Carbon {
 		return c
 	}
 	year, month, day := c.Date()
-	return create(year, month, day, c.Hour(), 59, 59, 999999999).SetLocation(c.loc)
+	return c.create(year, month, day, c.Hour(), 59, 59, 999999999)
 }
 
 // StartOfMinute returns a Carbon instance for start of the minute.
@@ -173,7 +173,7 @@ func (c *Carbon) StartOfMinute() *Carbon {
 		return c
 	}
 	year, month, day, hour, minute, _ := c.DateTime()
-	return create(year, month, day, hour, minute, 0, 0).SetLocation(c.loc)
+	return c.create(year, month, day, hour, minute, 0, 0)
 }
 
 // EndOfMinute returns a Carbon instance for end of the minute.
@@ -183,7 +183,7 @@ func (c *Carbon) EndOfMinute() *Carbon {
 		return c
 	}
 	year, month, day, hour, minute, _ := c.DateTime()
-	return create(year, month, day, hour, minute, 59, 999999999).SetLocation(c.loc)
+	return c.create(year, month, day, hour, minute, 59, 999999999)
 }
 
 // StartOfSecond returns a Carbon instance for start of the second.
@@ -193,7 +193,7 @@ func (c *Carbon) StartOfSecond() *Carbon {
 		return c
 	}
 	year, month, day, hour, minute, second := c.DateTime()
-	return create(year, month, day, hour, minute, second, 0).SetLocation(c.loc)
+	return c.create(year, month, day, hour, minute, second, 0)
 }
 
 // EndOfSecond returns a Carbon instance for end of the second.
@@ -203,5 +203,5 @@ func (c *Carbon) EndOfSecond() *Carbon {
 		return c
 	}
 	year, month, day, hour, minute, second := c.DateTime()
-	return create(year, month, day, hour, minute, second, 999999999).SetLocation(c.loc)
+	return c.create(year, month, day, hour, minute, second, 999999999)
 }

creator.go

@@ -190,3 +190,18 @@ func create(year, month, day, hour, minute, second, nanosecond int, timezone ...
 	}
 	return NewCarbon(time.Date(year, time.Month(month), day, hour, minute, second, nanosecond, loc))
 }
+
+// creates a Carbon instance from a given date, time and nanosecond.
+// 从给定的年、月、日、时、分、秒、纳秒创建 Carbon 实例
+func (c *Carbon) create(year, month, day, hour, minute, second, nanosecond int) *Carbon {
+	return &Carbon{
+		time:          time.Date(year, time.Month(month), day, hour, minute, second, nanosecond, c.loc),
+		weekStartsAt:  c.weekStartsAt,
+		weekendDays:   c.weekendDays,
+		loc:           c.loc,
+		lang:          c.lang.Copy(),
+		currentLayout: c.currentLayout,
+		isEmpty:       c.isEmpty,
+		Error:         c.Error,
+	}
+}

season.go

@@ -56,9 +56,9 @@ func (c *Carbon) StartOfSeason() *Carbon {
 	}
 	year, month, _ := c.Date()
 	if month == 1 || month == 2 {
-		return create(year-1, 12, 1, 0, 0, 0, 0).SetLocation(c.loc)
+		return c.create(year-1, 12, 1, 0, 0, 0, 0)
 	}
-	return create(year, month/3*3, 1, 0, 0, 0, 0).SetLocation(c.loc)
+	return c.create(year, month/3*3, 1, 0, 0, 0, 0)
 }
 
 // EndOfSeason returns a Carbon instance for end of the season.
@@ -69,12 +69,12 @@ func (c *Carbon) EndOfSeason() *Carbon {
 	}
 	year, month, _ := c.Date()
 	if month == 1 || month == 2 {
-		return create(year, 3, 0, 23, 59, 59, 999999999).SetLocation(c.loc)
+		return c.create(year, 3, 0, 23, 59, 59, 999999999)
 	}
 	if month == 12 {
-		return create(year+1, 3, 0, 23, 59, 59, 999999999).SetLocation(c.loc)
+		return c.create(year+1, 3, 0, 23, 59, 59, 999999999)
 	}
-	return create(year, month/3*3+3, 0, 23, 59, 59, 999999999).SetLocation(c.loc)
+	return c.create(year, month/3*3+3, 0, 23, 59, 59, 999999999)
 }
 
 // IsSpring reports whether is spring.

traveler.go

@@ -185,11 +185,11 @@ func (c *Carbon) AddYearsNoOverflow(years int) *Carbon {
 	nanosecond := c.Nanosecond()
 	year, month, day, hour, minute, second := c.DateTime()
 	// 获取N年后本月的最后一天
-	lastYear, lastMonth, lastDay := create(year+years, month+1, 0, hour, minute, second, nanosecond).SetLocation(c.loc).Date()
+	lastYear, lastMonth, lastDay := c.create(year+years, month+1, 0, hour, minute, second, nanosecond).Date()
 	if day > lastDay {
 		day = lastDay
 	}
-	return create(lastYear, lastMonth, day, hour, minute, second, nanosecond).SetLocation(c.loc)
+	return c.create(lastYear, lastMonth, day, hour, minute, second, nanosecond).SetLocation(c.loc)
 }
 
 // AddYear adds one year.
@@ -298,11 +298,11 @@ func (c *Carbon) AddMonthsNoOverflow(months int) *Carbon {
 	nanosecond := c.Nanosecond()
 	year, month, day, hour, minute, second := c.DateTime()
 	// 获取N月后的最后一天
-	lastYear, lastMonth, lastDay := create(year, month+months+1, 0, hour, minute, second, nanosecond).SetLocation(c.loc).Date()
+	lastYear, lastMonth, lastDay := c.create(year, month+months+1, 0, hour, minute, second, nanosecond).Date()
 	if day > lastDay {
 		day = lastDay
 	}
-	return create(lastYear, lastMonth, day, hour, minute, second, nanosecond).SetLocation(c.loc)
+	return c.create(lastYear, lastMonth, day, hour, minute, second, nanosecond).SetLocation(c.loc)
 }
 
 // AddMonth adds one month.

traveler_unit_test.go

@@ -1378,6 +1378,15 @@ func (s *TravelerSuite) TestCarbon_AddMonthsNoOverflow() {
 		s.Equal("2020-05-29", Parse("2020-02-29").AddMonthsNoOverflow(3).ToDateString())
 		s.Equal("2020-10-31", Parse("2020-08-31").AddMonthsNoOverflow(2).ToDateString())
 	})
+
+	// https://github.com/dromara/carbon/issues/303
+	s.Run("issue303", func() {
+		c := CreateFromDate(2025, 6, 11, "Asia/Shanghai")
+		c = c.SetWeekStartsAt(time.Sunday)
+		c = c.SubMonthNoOverflow()
+		c = c.StartOfWeek()
+		s.Equal("2025-05-11", c.ToDateString())
+	})
 }
 
 func (s *TravelerSuite) TestCarbon_AddMonth() {