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.

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

Merge upstream changes #18

Merged
merged 60 commits into from Nov 18, 2020
Merged

Merge upstream changes #18

merged 60 commits into from Nov 18, 2020

Conversation

valentinbonneaud
Copy link
Collaborator

@valentinbonneaud valentinbonneaud commented Nov 18, 2020

Pull upstream changes up to 4.3.3 (included)

remicollet and others added 30 commits October 9, 2019 11:14
…e-io#472)

* reduce phpstan level back to 0, as level 1 is failing right now

* travis: no longer allow failures for phpstan
* Release 4.2.1

* Update CHANGELOG.md
Signed-off-by: Christian Kraus <hanzi@hanzi.cc>
…ess-tz-tests

Add TZ in iTip REPLY iTip messages
* Release 4.2.2

* Update CHANGELOG.md
…-20200126

Update dependencies and code style tools
* Update CHANGELOG.md

* Update Version.php
JeroenVanOort and others added 26 commits February 1, 2020 19:28
Replace assertRegExp with assertMatchesRegularExpression in unit test
…mezone

Remove US/Pacific-New obsolete timezone
# Conflicts:
#	.gitignore
#	.php_cs.dist
#	.travis.yml
#	CHANGELOG.md
#	composer.json
#	lib/Version.php
#	tests/VObject/Recur/RRuleIteratorTest.php
@codecov-io
Copy link

codecov-io commented Nov 18, 2020

Codecov Report

Merging #18 (1574854) into master (10a03a8) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master      #18      +/-   ##
============================================
- Coverage     98.68%   98.67%   -0.02%     
- Complexity     1818     1837      +19     
============================================
  Files            67       67              
  Lines          4427     4453      +26     
============================================
+ Hits           4369     4394      +25     
- Misses           58       59       +1     
Impacted Files Coverage Δ Complexity Δ
lib/timezonedata/php-bc.php 100.00% <ø> (ø) 0.00 <0.00> (ø)
lib/ITip/Broker.php 99.50% <100.00%> (ø) 155.00 <21.00> (+1.00)
lib/Property/Boolean.php 50.00% <0.00%> (-3.85%) 6.00% <0.00%> (ø%)
lib/Property/UtcOffset.php 100.00% <0.00%> (ø) 3.00% <0.00%> (ø%)
lib/Property/ICalendar/Period.php 100.00% <0.00%> (ø) 9.00% <0.00%> (ø%)
lib/Property/ICalendar/DateTime.php 100.00% <0.00%> (ø) 44.00% <0.00%> (ø%)
lib/Property/VCard/DateAndOrTime.php 100.00% <0.00%> (ø) 75.00% <0.00%> (ø%)
lib/Recur/RRuleIterator.php 99.18% <0.00%> (+<0.01%) 215.00% <0.00%> (+1.00%)
lib/Parser/MimeDir.php 99.55% <0.00%> (+<0.01%) 85.00% <0.00%> (+3.00%)
lib/Parameter.php 99.20% <0.00%> (+<0.01%) 82.00% <0.00%> (+1.00%)
... and 8 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 10a03a8...1574854. Read the comment docs.

@valentinbonneaud valentinbonneaud changed the title WIP: Merge upstream changes Merge upstream changes Nov 18, 2020
@valentinbonneaud valentinbonneaud merged commit f290360 into master Nov 18, 2020
@giuseppe-arcuti giuseppe-arcuti deleted the feat/merge-upstream branch April 19, 2023 14:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet