Merge upstream commits #36
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…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
Fixed phpstan level 1 errors
* Update CHANGELOG.md * Update Version.php
Reordering of the attendees should not be a signitifcant change (sabre-io#540)
Reordering of vevent should not be a significant change (sabre-io#542)
Prepare release 4.3.8
This will ease customization of timezone-guessing as it is now gets easier to extend that process with own implementations (as long as they implement the appropriate interface) This is espechially necessary when wanting to actually guess a timezone via the rules defined in the VTIMEZONE-entry (which is currently not done)
…esser Allow easier extension of the timezone guessing
Changelog for 4.4.0
This avoids warnings under PHP>=8.1 Real return types should be added before PHP 9 Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Fix deprecations warnings on PHP 8.1
Prepare release 4.4.1
valentinbonneaud
force-pushed
the
feat/merge-upstream-8.1
branch
2 times, most recently
from
eec2891
to
7c7ae93
Compare
Codecov Report
@@ Coverage Diff @@
## master #36 +/- ##
============================================
+ Coverage 96.83% 98.35% +1.51%
- Complexity 1915 1933 +18
============================================
Files 72 72
Lines 4682 4672 -10
============================================
+ Hits 4534 4595 +61
+ Misses 148 77 -71
Flags with carried forward coverage won't be shown. Click here to find out more.
|
…upstream-8.1-2 # Conflicts: # .gitignore # .php_cs.dist # .travis.yml # CHANGELOG.md # lib/Recur/RRuleIterator.php # lib/TimeZoneUtil.php # lib/Version.php # tests/VObject/Recur/RRuleIteratorTest.php # tests/VObject/TimeZoneUtilTest.php # tests/phpunit.xml
valentinbonneaud
force-pushed
the
feat/merge-upstream-8.1
branch
from
ce6e057
to
95b3634
Compare
valentinbonneaud
force-pushed
the
feat/merge-upstream-8.1
branch
from
97d9301
to
ae4a32d
Compare
valentinbonneaud
force-pushed
the
feat/merge-upstream-8.1
branch
from
9b76756
to
fca20ff
Compare
giuseppe-arcuti
approved these changes
Dec 15, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge upstream commits from Dec 7 to support PHP8.1