Merge upstream sabre-io/vobject master 2026-05-31 (4.6.0) - #116
Merged
Merged
Conversation
'Amsterdam, Berlin, Bern, Rom, Stockholm, Wien' => 'Europe/Berlin',
Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](actions/cache@v3...v4) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…ns/actions/cache-4 Bump actions/cache from 3 to 4
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3 to 4. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](codecov/codecov-action@v3...v4) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…ns/codecov/codecov-action-4 Bump codecov/codecov-action from 3 to 4
chore: use php-cs-fixer 3.49
chore: use php-cs-fixer 3.51
chore: apply cs-fixer 3.54.0 changes
chore: bump php-cs-fixer requirement to 3.54
Co-authored-by: Luc DUZAN <lduzan@linagora.com>
ITip\Broker: handle timezones in replies to exception events
…fixer chore: stop exporting php-cs-fixer config
chore: bump dev dependencies
Yearly rrule compliance by the iterator
chore: forward port 4.5.7
…ate-improvements fix: use RDATE in time range check and use all instances
Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>
…y-on-event-creation fix: send participation reply on fresh event
…oej-schedule-attendee-removal Removing attendee from scheduled recurring event should generate an EXDATE property
…oej-mimedir-improve-error-check Improve error checks in Mimedir parser
…-4.5.8 [master] Prepare 4.5.8
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 5 to 6. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](codecov/codecov-action@v5...v6) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
php-cs-fixer wants to make quite a few changes.
…ns/codecov/codecov-action-6 chore(deps): bump codecov/codecov-action from 5 to 6
Signed-off-by: Christoph Wurst <1374172+ChristophWurst@users.noreply.github.com>
…endar-null fix(itip): handle null old calendar/event
feat(VCard): add getByTypes method (sabre-io#717)
Systems without the tzdata-legacy package, i.e. (Ubuntu 24.04+) reject deprecated names. Examples: Europe/Kiev, Asia/Calcutta, America/Godthab This causes FindFromTimezoneMap::find() to throw. Update all 13 occurrences across windowszones, lotuszones and exchangezones maps to their canonical replacements and wrap DateTimeZone instantiation in try/catch for resilience against future renames. Comes with unit test
…-names fix: Update deprecated timezone names
…g-4.6.0 chore: changelogs for 4.5.9 and 4.6.0
Brings in upstream master up to the last commit before PHP 7 support was dropped (sabre-io#767), content equivalent to upstream 4.6.0. Conflict resolution keeps Proton behaviour where it deliberately differs: - Document::createProperty still drops a malformed or illegal VALUE parameter instead of keeping it as upstream sabre-io#674 does. - Greenland keeps mapping to Atlantic/Stanley (#65); FLE Standard Time keeps mapping to Europe/Kiev, matching the Europe/Kyiv redirect in FindFromTimezoneIdentifier. Upstream's other IANA renames (sabre-io#756) are taken. - Upstream tests PropertyTest::testUnknownValuesWillBeIgnored and FindFromTimezoneMapTest are adapted to those Proton mappings. - testUnrepairableRRule: upstream sabre-io#692 is the same change as our #109, upstream's version of the test is taken. - Version stays 4.34.0; the bump is left to the release PR.
giuseppe-arcuti
approved these changes
Sep 30, 2026
This was referenced Sep 30, 2026
Merged
This file contains hidden or 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
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.
What
Syncs our fork with upstream
sabre-io/vobjectmaster up toa95f4e1d(2026-05-31). This is the last upstream commit before PHP 7 support was dropped (sabre-io#767 upstream), and its content matches upstream 4.6.0. Upstream 5.0.0 comes in a separate PR.The branch has two commits:
2685914eRecord upstream master 2024-06-06 as merged. This commit changes no files. Our previous sync (Merge upstream 2024 06 27 #106) was squash-merged, so upstream's history never became part of ours, and every new sync had to redo old conflicts.This commit records that sync as a real merge.
82dd5a7fMerge upstream master 2026-05-31. This is the actual sync.Notable upstream changes
STATUS:CANCELLED(fix: check if event status was changed to cancelled and generate appr… sabre-io/vobject#669), send a participation reply on a new event (fix: send participation reply on fresh event sabre-io/vobject#743), handle a null old calendar or event (fix(itip): handle null old calendar/event sabre-io/vobject#753), add an EXDATE when an attendee is removed from a recurring event (Removing attendee from scheduled recurring event should generate an EXDATE property sabre-io/vobject#728), don't add an EXDATE with a floating timezone (Broker shouldn't add EXDATE property with floating timezone sabre-io/vobject#723)InvalidDataExceptionfor an invalid RRULE (Throw InvalidDataException when RRule is invalid sabre-io/vobject#692)getByTypes()method (feat(VCard): add getByTypes method (#717) sabre-io/vobject#718)Conflict resolution
Where our fork deliberately behaves differently, the Proton behaviour is kept:
Document::createProperty: a malformed or illegalVALUEparameter is still dropped, as in [INBE-269][Fix] drop malformed or illegal VALUE parameter #92. Upstream Allow unknown value data types for VALUE sabre-io/vobject#674 keeps it. Upstream'sPropertyTest::testUnknownValuesWillBeIgnoredis adapted to match.Atlantic/Stanley([Calendar] Replace Godthab timezone #65).FLE Standard TimestaysEurope/Kiev, matching ourEurope/Kyiv→Europe/Kievredirect inFindFromTimezoneIdentifier.US Eastern Standard Timestill resolves toAmerica/New_Yorkthroughextrazones.php. All of upstream's other renames (Kolkata, Yangon, Kathmandu, Buenos_Aires, …) are taken, and upstream's newFindFromTimezoneMapTestis adapted to our values.testUnrepairableRRule: upstream Throw InvalidDataException when RRule is invalid sabre-io/vobject#692 is the same change as our throw InvalidDataException when finding invalid RRULE part #109, so upstream's version of the test is taken.Version.phpstays at 4.34.0. The bump to 4.35.0 comes in the release PR.Testing
vendor/bin/phpunit --configuration tests/phpunit.xml: 3279 tests pass, 1 skipped (same skip as on master)composer phpstan: no errorsMerging and release
php: ^7.4 || ^8.0.release/4.35.0will bump the version and add the changelog entry.