Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #1967 base week on locale #2165

Merged
merged 19 commits into from
Aug 20, 2020
Merged

Fix #1967 base week on locale #2165

merged 19 commits into from
Aug 20, 2020

Conversation

kylekatarnls
Copy link
Collaborator

Fix #1967

@kylekatarnls
Make en_001 the new default locale
72488c2
@kylekatarnls
Fix briannesbitt#1967 handle global translator to pick the start of week
c4474e8
@kylekatarnls
Merge branch '3.x' of https://github.com/briannesbitt/Carbon into fea…
cb88b46 
…ture/issue-1967-week-based-on-locale

� Conflicts:
�	src/Carbon/CarbonInterface.php
�	src/Carbon/Traits/Boundaries.php
�	src/Carbon/Traits/Date.php
�	src/Carbon/Traits/Options.php
@kylekatarnls
Regenerate PHPDoc
5da361c
@kylekatarnls
Merge branch '3.x' of https://github.com/briannesbitt/Carbon into fea…
9c8b70b 
…ture/issue-1967-week-based-on-locale

� Conflicts:
�	src/Carbon/CarbonInterface.php
�	src/Carbon/CarbonInterval.php
�	src/Carbon/Factory.php
�	src/Carbon/FactoryImmutable.php
�	src/Carbon/Traits/Localization.php
@kylekatarnls
Remove Symfony < 5 interface import
8726308
@kylekatarnls
Fix code style
60a7afa
@kylekatarnls
Merge branch '3.x' of https://github.com/kylekatarnls/Carbon into fea…
aea44d4 
…ture/issue-1967-week-based-on-locale

� Conflicts:
�	phpdoc.php
�	src/Carbon/Factory.php
�	src/Carbon/FactoryImmutable.php
�	src/Carbon/Lang/so_ET.php
�	src/Carbon/Lang/so_KE.php
@kylekatarnls
Merge branch 'feature/issue-2119-absolute-diff-flag' of https://githu…
143ba9a 
…b.com/kylekatarnls/Carbon into feature/issue-1967-week-based-on-locale

� Conflicts:
�	src/Carbon/CarbonInterface.php
�	src/Carbon/Factory.php
�	src/Carbon/FactoryImmutable.php
�	src/Carbon/Traits/Date.php
�	src/Carbon/Traits/Localization.php
�	src/Carbon/Translator.php
@kylekatarnls
Update PHPDoc
0ed7459
@kylekatarnls
Remove set(Start|End)Week calls
ffe5a45
@kylekatarnls
Update unit tests
ed6c51a
@kylekatarnls
Update language tests
1b34a13
@kylekatarnls
Update week tests
d064c20
@kylekatarnls
Update Kurdish ordinal
bcd502f
@kylekatarnls
Enforce (int) cast in weekday()
132d250
@kylekatarnls
Enforce (int) cast for getWeekStartsAt() return
ed5aa18
@kylekatarnls kylekatarnls added this to the 3.0.0 milestone Aug 20, 2020
@kylekatarnls kylekatarnls self-assigned this Aug 20, 2020
@kylekatarnls kylekatarnls mentioned this pull request Aug 20, 2020
Closed
@codecov-commenter
Copy link

codecov-commenter commented Aug 20, 2020 •
edited
Loading

Codecov Report

Merging #2165 into 3.x will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff             @@
##                 3.x     #2165   +/-   ##
===========================================
  Coverage     100.00%   100.00%           
+ Complexity      2010      2006    -4     
===========================================
  Files            885       885           
  Lines           8893      8850   -43     
===========================================
- Hits            8893      8850   -43
Impacted Files Coverage Δ Complexity Δ
src/Carbon/Factory.php 100.00% <ø> (ø) 13.00 <0.00> (ø)
src/Carbon/Lang/aa_ET.php 100.00% <ø> (ø) 0.00 <0.00> (ø)
src/Carbon/Lang/am_ET.php 100.00% <ø> (ø) 0.00 <0.00> (ø)
src/Carbon/Lang/anp_IN.php 100.00% <ø> (ø) 0.00 <0.00> (ø)
src/Carbon/Lang/as_IN.php 100.00% <ø> (ø) 0.00 <0.00> (ø)
src/Carbon/Lang/ayc_PE.php 100.00% <ø> (ø) 0.00 <0.00> (ø)
src/Carbon/Lang/bhb_IN.php 100.00% <ø> (ø) 0.00 <0.00> (ø)
src/Carbon/Lang/bho_IN.php 100.00% <ø> (ø) 0.00 <0.00> (ø)
src/Carbon/Lang/brx_IN.php 100.00% <ø> (ø) 0.00 <0.00> (ø)
src/Carbon/Lang/ccp.php 100.00% <ø> (ø) 0.00 <0.00> (ø)
... and 191 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1320852...c91fe13. Read the comment docs.

@kylekatarnls kylekatarnls merged commit 11ad7a7 into briannesbitt:3.x Aug 20, 2020
@kylekatarnls kylekatarnls added the available on 3.x-dev Can yet be test requiring "nesbot/carbon": "3.x-dev" label Aug 20, 2020
@kylekatarnls kylekatarnls deleted the feature/issue-1967-week-based-on-locale branch August 20, 2020 14:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@kylekatarnls kylekatarnls

Labels
available on 3.x-dev Can yet be test requiring "nesbot/carbon": "3.x-dev" enhancement
Projects
None yet
Milestone
3.0.0
Development

Successfully merging this pull request may close these issues.
2 participants
@kylekatarnls @codecov-commenter