Skip to content

Commit 6959709

Browse files
kuafuRacekuafuRace
authored
V2.6.x (#285)
2 parents 836a02d + a2580b3 commit 6959709

File tree

89 files changed

+16771
-21256
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+16771
-21256
lines changed

‎README.cn.md

Lines changed: 177 additions & 142 deletions
Large diffs are not rendered by default.

‎README.jp.md

Lines changed: 175 additions & 143 deletions
Large diffs are not rendered by default.

‎README.md

Lines changed: 174 additions & 139 deletions
Large diffs are not rendered by default.

‎boundary.go

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -2,72 +2,72 @@ package carbon
22

33
// StartOfCentury returns a Carbon instance for start of the century.
44
// 本世纪开始时间
5-
func (c Carbon) StartOfCentury() Carbon {
6-
if c.Error != nil {
5+
func (c *Carbon) StartOfCentury() *Carbon {
6+
if c.IsInvalid() {
77
return c
88
}
9-
return c.create(c.Year()/YearsPerCentury*YearsPerCentury, 1, 1, 0, 0, 0, 0)
9+
return create(c.Year()/YearsPerCentury*YearsPerCentury, 1, 1, 0, 0, 0, 0, c.Timezone())
1010
}
1111

1212
// EndOfCentury returns a Carbon instance for end of the century.
1313
// 本世纪结束时间
14-
func (c Carbon) EndOfCentury() Carbon {
15-
if c.Error != nil {
14+
func (c *Carbon) EndOfCentury() *Carbon {
15+
if c.IsInvalid() {
1616
return c
1717
}
18-
return c.create(c.Year()/YearsPerCentury*YearsPerCentury+99, 12, 31, 23, 59, 59, 999999999)
18+
return create(c.Year()/YearsPerCentury*YearsPerCentury+99, 12, 31, 23, 59, 59, 999999999, c.Timezone())
1919
}
2020

2121
// StartOfDecade returns a Carbon instance for start of the decade.
2222
// 本年代开始时间
23-
func (c Carbon) StartOfDecade() Carbon {
24-
if c.Error != nil {
23+
func (c *Carbon) StartOfDecade() *Carbon {
24+
if c.IsInvalid() {
2525
return c
2626
}
27-
return c.create(c.Year()/YearsPerDecade*YearsPerDecade, 1, 1, 0, 0, 0, 0)
27+
return create(c.Year()/YearsPerDecade*YearsPerDecade, 1, 1, 0, 0, 0, 0, c.Timezone())
2828
}
2929

3030
// EndOfDecade returns a Carbon instance for end of the decade.
3131
// 本年代结束时间
32-
func (c Carbon) EndOfDecade() Carbon {
33-
if c.Error != nil {
32+
func (c *Carbon) EndOfDecade() *Carbon {
33+
if c.IsInvalid() {
3434
return c
3535
}
36-
return c.create(c.Year()/YearsPerDecade*YearsPerDecade+9, 12, 31, 23, 59, 59, 999999999)
36+
return create(c.Year()/YearsPerDecade*YearsPerDecade+9, 12, 31, 23, 59, 59, 999999999, c.Timezone())
3737
}
3838

3939
// StartOfYear returns a Carbon instance for start of the year.
4040
// 本年开始时间
41-
func (c Carbon) StartOfYear() Carbon {
42-
if c.Error != nil {
41+
func (c *Carbon) StartOfYear() *Carbon {
42+
if c.IsInvalid() {
4343
return c
4444
}
45-
return c.create(c.Year(), 1, 1, 0, 0, 0, 0)
45+
return create(c.Year(), 1, 1, 0, 0, 0, 0, c.Timezone())
4646
}
4747

4848
// EndOfYear returns a Carbon instance for end of the year.
4949
// 本年结束时间
50-
func (c Carbon) EndOfYear() Carbon {
51-
if c.Error != nil {
50+
func (c *Carbon) EndOfYear() *Carbon {
51+
if c.IsInvalid() {
5252
return c
5353
}
54-
return c.create(c.Year(), 12, 31, 23, 59, 59, 999999999)
54+
return create(c.Year(), 12, 31, 23, 59, 59, 999999999, c.Timezone())
5555
}
5656

5757
// StartOfQuarter returns a Carbon instance for start of the quarter.
5858
// 本季度开始时间
59-
func (c Carbon) StartOfQuarter() Carbon {
60-
if c.Error != nil {
59+
func (c *Carbon) StartOfQuarter() *Carbon {
60+
if c.IsInvalid() {
6161
return c
6262
}
6363
year, quarter, day := c.Year(), c.Quarter(), 1
64-
return c.create(year, 3*quarter-2, day, 0, 0, 0, 0)
64+
return create(year, 3*quarter-2, day, 0, 0, 0, 0, c.Timezone())
6565
}
6666

6767
// EndOfQuarter returns a Carbon instance for end of the quarter.
6868
// 本季度结束时间
69-
func (c Carbon) EndOfQuarter() Carbon {
70-
if c.Error != nil {
69+
func (c *Carbon) EndOfQuarter() *Carbon {
70+
if c.IsInvalid() {
7171
return c
7272
}
7373
year, quarter, day := c.Year(), c.Quarter(), 30
@@ -77,33 +77,33 @@ func (c Carbon) EndOfQuarter() Carbon {
7777
case 2, 3:
7878
day = 30
7979
}
80-
return c.create(year, 3*quarter, day, 23, 59, 59, 999999999)
80+
return create(year, 3*quarter, day, 23, 59, 59, 999999999, c.Timezone())
8181
}
8282

8383
// StartOfMonth returns a Carbon instance for start of the month.
8484
// 本月开始时间
85-
func (c Carbon) StartOfMonth() Carbon {
86-
if c.Error != nil {
85+
func (c *Carbon) StartOfMonth() *Carbon {
86+
if c.IsInvalid() {
8787
return c
8888
}
8989
year, month, _ := c.Date()
90-
return c.create(year, month, 1, 0, 0, 0, 0)
90+
return create(year, month, 1, 0, 0, 0, 0, c.Timezone())
9191
}
9292

9393
// EndOfMonth returns a Carbon instance for end of the month.
9494
// 本月结束时间
95-
func (c Carbon) EndOfMonth() Carbon {
96-
if c.Error != nil {
95+
func (c *Carbon) EndOfMonth() *Carbon {
96+
if c.IsInvalid() {
9797
return c
9898
}
9999
year, month, _ := c.Date()
100-
return c.create(year, month+1, 0, 23, 59, 59, 999999999)
100+
return create(year, month+1, 0, 23, 59, 59, 999999999, c.Timezone())
101101
}
102102

103103
// StartOfWeek returns a Carbon instance for start of the week.
104104
// 本周开始时间
105-
func (c Carbon) StartOfWeek() Carbon {
106-
if c.Error != nil {
105+
func (c *Carbon) StartOfWeek() *Carbon {
106+
if c.IsInvalid() {
107107
return c
108108
}
109109
dayOfWeek, weekStartsAt := c.DayOfWeek(), int(c.weekStartsAt)
@@ -112,8 +112,8 @@ func (c Carbon) StartOfWeek() Carbon {
112112

113113
// EndOfWeek returns a Carbon instance for end of the week.
114114
// 本周结束时间
115-
func (c Carbon) EndOfWeek() Carbon {
116-
if c.Error != nil {
115+
func (c *Carbon) EndOfWeek() *Carbon {
116+
if c.IsInvalid() {
117117
return c
118118
}
119119
dayOfWeek, weekEndsAt := c.DayOfWeek(), int(c.weekStartsAt)+DaysPerWeek-1
@@ -122,80 +122,80 @@ func (c Carbon) EndOfWeek() Carbon {
122122

123123
// StartOfDay returns a Carbon instance for start of the day.
124124
// 本日开始时间
125-
func (c Carbon) StartOfDay() Carbon {
126-
if c.Error != nil {
125+
func (c *Carbon) StartOfDay() *Carbon {
126+
if c.IsInvalid() {
127127
return c
128128
}
129129
year, month, day := c.Date()
130-
return c.create(year, month, day, 0, 0, 0, 0)
130+
return create(year, month, day, 0, 0, 0, 0)
131131
}
132132

133133
// EndOfDay returns a Carbon instance for end of the day.
134134
// 本日结束时间
135-
func (c Carbon) EndOfDay() Carbon {
136-
if c.Error != nil {
135+
func (c *Carbon) EndOfDay() *Carbon {
136+
if c.IsInvalid() {
137137
return c
138138
}
139139
year, month, day := c.Date()
140-
return c.create(year, month, day, 23, 59, 59, 999999999)
140+
return create(year, month, day, 23, 59, 59, 999999999)
141141
}
142142

143143
// StartOfHour returns a Carbon instance for start of the hour.
144144
// 小时开始时间
145-
func (c Carbon) StartOfHour() Carbon {
146-
if c.Error != nil {
145+
func (c *Carbon) StartOfHour() *Carbon {
146+
if c.IsInvalid() {
147147
return c
148148
}
149149
year, month, day := c.Date()
150-
return c.create(year, month, day, c.Hour(), 0, 0, 0)
150+
return create(year, month, day, c.Hour(), 0, 0, 0)
151151
}
152152

153153
// EndOfHour returns a Carbon instance for end of the hour.
154154
// 小时结束时间
155-
func (c Carbon) EndOfHour() Carbon {
156-
if c.Error != nil {
155+
func (c *Carbon) EndOfHour() *Carbon {
156+
if c.IsInvalid() {
157157
return c
158158
}
159159
year, month, day := c.Date()
160-
return c.create(year, month, day, c.Hour(), 59, 59, 999999999)
160+
return create(year, month, day, c.Hour(), 59, 59, 999999999)
161161
}
162162

163163
// StartOfMinute returns a Carbon instance for start of the minute.
164164
// 分钟开始时间
165-
func (c Carbon) StartOfMinute() Carbon {
166-
if c.Error != nil {
165+
func (c *Carbon) StartOfMinute() *Carbon {
166+
if c.IsInvalid() {
167167
return c
168168
}
169169
year, month, day, hour, minute, _ := c.DateTime()
170-
return c.create(year, month, day, hour, minute, 0, 0)
170+
return create(year, month, day, hour, minute, 0, 0)
171171
}
172172

173173
// EndOfMinute returns a Carbon instance for end of the minute.
174174
// 分钟结束时间
175-
func (c Carbon) EndOfMinute() Carbon {
176-
if c.Error != nil {
175+
func (c *Carbon) EndOfMinute() *Carbon {
176+
if c.IsInvalid() {
177177
return c
178178
}
179179
year, month, day, hour, minute, _ := c.DateTime()
180-
return c.create(year, month, day, hour, minute, 59, 999999999)
180+
return create(year, month, day, hour, minute, 59, 999999999)
181181
}
182182

183183
// StartOfSecond returns a Carbon instance for start of the second.
184184
// 秒开始时间
185-
func (c Carbon) StartOfSecond() Carbon {
186-
if c.Error != nil {
185+
func (c *Carbon) StartOfSecond() *Carbon {
186+
if c.IsInvalid() {
187187
return c
188188
}
189189
year, month, day, hour, minute, second := c.DateTime()
190-
return c.create(year, month, day, hour, minute, second, 0)
190+
return create(year, month, day, hour, minute, second, 0)
191191
}
192192

193193
// EndOfSecond returns a Carbon instance for end of the second.
194194
// 秒结束时间
195-
func (c Carbon) EndOfSecond() Carbon {
196-
if c.Error != nil {
195+
func (c *Carbon) EndOfSecond() *Carbon {
196+
if c.IsInvalid() {
197197
return c
198198
}
199199
year, month, day, hour, minute, second := c.DateTime()
200-
return c.create(year, month, day, hour, minute, second, 999999999)
200+
return create(year, month, day, hour, minute, second, 999999999)
201201
}

0 commit comments

Comments
 (0)