ProtonMail · willaix · Sep 30, 2026 · May 20, 2023 · Feb 1, 2024 · Feb 2, 2024
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,16 +12,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3']
+        php-versions: ['8.0', '8.1', '8.2', '8.3', '8.4']
         coverage: ['pcov']
+        code-style: ['no']
         code-analysis: ['no']
         include:
           - php-versions: '7.4'
-            coverage: 'none'
+            coverage: 'pcov'
+            code-style: 'yes'
+            code-analysis: 'yes'
+          - php-versions: '8.5'
+            coverage: 'pcov'
+            code-style: 'no'
             code-analysis: 'yes'
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
@@ -36,7 +42,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache composer dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
@@ -48,8 +54,8 @@ jobs:
         run: composer install --no-progress --prefer-dist --optimize-autoloader
 
       - name: Code Analysis (PHP CS-Fixer)
-        if: matrix.code-analysis == 'yes'
-        run: php vendor/bin/php-cs-fixer fix --dry-run --diff
+        if: matrix.code-style == 'yes'
+        run: PHP_CS_FIXER_IGNORE_ENV=true php vendor/bin/php-cs-fixer fix --dry-run --diff
 
       - name: Code Analysis (PHPStan)
         if: matrix.code-analysis == 'yes'
@@ -59,5 +65,5 @@ jobs:
         run: vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-clover clover.xml
 
       - name: Code Coverage
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v6
         if: matrix.coverage != 'none'
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -10,6 +10,10 @@
 $config->setRules([
     '@PSR1' => true,
     '@Symfony' => true,
+    'nullable_type_declaration' => [
+        'syntax' => 'question_mark',
+    ],
+    'nullable_type_declaration_for_default_null_value' => true,
 ]);
 
 return $config;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -178,6 +178,65 @@ ChangeLog
 * #3 Add daily occurrences to nextMonth and NextYear
 * #4 Enhance fast forward speed if no count value has been given
 
+4.6.0 (2026-05-31)
+------------------
+* #718 feat(VCard): add getByTypes method (@JimKnoxx)
+* #756 fix: Update deprecated timezone names (@ralflang)
+
+4.5.9 (2026-05-31)
+------------------
+* #759 fix(itip): handle null old calendar/event (@ChristophWurst)
+
+4.5.8 (2026-01-12)
+------------------
+
+* #721: Fix variable scope (@KristofferFM)
+* #723: Broker shouldn't add EXDATE property with floating timezone (@KristofferFM)
+* #726: Improved check on property name (@KristofferFM)
+* #727: Improve error checks in Mimedir parser (@KristofferFM)
+* #728: Removing attendee from scheduled recurring event should generate an EXDATE property (@KristofferFM)
+* #735: use RDATE in time range check and use all instances (@SebastianKrupinski)
+* #743: send participation reply on fresh event (@SebastianKrupinski)
+
+4.5.7 (2025-04-17)
+------------------
+
+* #618: Add new exchangetimezone 'Amsterdam, Berlin, Bern, Rom, Stockholm, Wien' (@chr-is)
+* #674: Allow unknown value data types for VALUE (@heiglandreas)
+* #707: add phpdoc return types for arrayaccess methods (@smhg)
+
+4.5.6 (2024-10-14)
+------------------
+
+* #662: add PHP 8.4 to CI (@phil-davis)
+* #669: fix: check if event status was changed to cancelled and generate appropriate message (@SebastianKrupinski)
+* #673: Fix Implicitly marking parameter $param as nullable is deprecated (@cedric-anne)
+* #675: refactor: Replace dirname(__FILE__) with __DIR__ (@ChristophWurst)
+* #692: Throw InvalidDataException when RRule is invalid (@mathroc)
+
+4.5.5 (2024-07-02)
+------------------
+
+* #632: Add PHP 8.3 to CI (@phil-davis)
+* #649: add lineIndex and lineString properties to a Property Node (@JohnRDOrazio)
+* #652: ITip\Broker: handle timezones in replies to exception events (@gharlan)
+* #654: chore: stop exporting php-cs-fixer config (@phil-davis)
+* #656: Yearly rrule compliance by the iterator (@kroky)
+* #658: throw ParseException when null input is provided (@phil-davis)
+* #653: Handle summer time jumps in event recurrences (@phil-davis)
+
+4.5.4 (2023-11-09)
+------------------
+
+* #619: fixed issue: Undefined index: plusminus (@sash04ek)
+* #622: Create Issue467Test.php for 619 (@sash04ek)
+* #623: docs: fix type definition for oldCalendar (@kesselb)
+
+4.5.3 (2023-01-22)
+------------------
+
+* #607: Apply 'Support sabre/xml v4' and needed code changes to 4.5 branch (@phil-davis)
+
 4.5.2 (2023-01-20)
 ------------------
 

diff --git a/bin/bench.php b/bin/bench.php
@@ -7,6 +7,6 @@
 
 $start = microtime(true);
 
-$lol = Sabre\VObject\Reader::read($data);
+$lol = VObject\Reader::read($data);
 
 echo 'time: '.(microtime(true) - $start)."\n";
diff --git a/bin/bench_freebusygenerator.php b/bin/bench_freebusygenerator.php
@@ -3,7 +3,7 @@
 include __DIR__.'/../vendor/autoload.php';
 
 if ($argc < 2) {
-    echo 'sabre/vobject ', Sabre\VObject\Version::VERSION, " freebusy benchmark\n";
+    echo 'sabre/vobject ', VObject\Version::VERSION, " freebusy benchmark\n";
     echo "\n";
     echo "This script can be used to measure the speed of generating a\n";
     echo "free-busy report based on a calendar.\n";
@@ -19,7 +19,7 @@
 $bench = new Hoa\Bench\Bench();
 $bench->parse->start();
 
-$vcal = Sabre\VObject\Reader::read(fopen($inputFile, 'r'));
+$vcal = VObject\Reader::read(fopen($inputFile, 'r'));
 
 $bench->parse->stop();
 
@@ -31,7 +31,7 @@
 $bench->fb->start();
 
 for ($i = 0; $i < $repeat; ++$i) {
-    $fb = new Sabre\VObject\FreeBusyGenerator($start, $end, $vcal, $timeZone);
+    $fb = new VObject\FreeBusyGenerator($start, $end, $vcal, $timeZone);
     $results = $fb->getResult();
 }
 $bench->fb->stop();

diff --git a/bin/bench_manipulatevcard.php b/bin/bench_manipulatevcard.php
@@ -3,7 +3,7 @@
 include __DIR__.'/../vendor/autoload.php';
 
 if ($argc < 2) {
-    echo 'sabre/vobject ', Sabre\VObject\Version::VERSION, " manipulation benchmark\n";
+    echo 'sabre/vobject ', VObject\Version::VERSION, " manipulation benchmark\n";
     echo "\n";
     echo "This script can be used to measure the speed of opening a large amount of\n";
     echo "vcards, making a few alterations and serializing them again.\n";
@@ -17,7 +17,7 @@
 
 $input = file_get_contents($inputFile);
 
-$splitter = new Sabre\VObject\Splitter\VCard($input);
+$splitter = new VObject\Splitter\VCard($input);
 
 $bench = new Hoa\Bench\Bench();
 

diff --git a/bin/mergeduplicates.php b/bin/mergeduplicates.php
@@ -96,53 +96,52 @@ function write($vcard)
         $collectedNames[$fn] = $vcard;
         ++$stats['Unique cards'];
         continue;
-    } else {
-        // Starting comparison for all properties. We only check if properties
-        // in the current vcard exactly appear in the earlier vcard as well.
-        foreach ($vcard->children() as $newProp) {
-            if (in_array($newProp->name, $ignoredProperties)) {
-                // We don't care about properties such as UID and REV.
-                continue;
-            }
-            $ok = false;
-            foreach ($collectedNames[$fn]->select($newProp->name) as $compareProp) {
-                if ($compareProp->serialize() === $newProp->serialize()) {
-                    $ok = true;
-                    break;
-                }
+    }
+    // Starting comparison for all properties. We only check if properties
+    // in the current vcard exactly appear in the earlier vcard as well.
+    foreach ($vcard->children() as $newProp) {
+        if (in_array($newProp->name, $ignoredProperties)) {
+            // We don't care about properties such as UID and REV.
+            continue;
+        }
+        $ok = false;
+        foreach ($collectedNames[$fn]->select($newProp->name) as $compareProp) {
+            if ($compareProp->serialize() === $newProp->serialize()) {
+                $ok = true;
+                break;
             }
+        }
 
-            if (!$ok) {
-                if ('EMAIL' === $newProp->name || 'TEL' === $newProp->name) {
-                    // We're going to make another attempt to find this
-                    // property, this time just by value. If we find it, we
-                    // consider it a success.
-                    foreach ($collectedNames[$fn]->select($newProp->name) as $compareProp) {
-                        if ($compareProp->getValue() === $newProp->getValue()) {
-                            $ok = true;
-                            break;
-                        }
-                    }
-
-                    if (!$ok) {
-                        // Merging the new value in the old vcard.
-                        $collectedNames[$fn]->add(clone $newProp);
+        if (!$ok) {
+            if ('EMAIL' === $newProp->name || 'TEL' === $newProp->name) {
+                // We're going to make another attempt to find this
+                // property, this time just by value. If we find it, we
+                // consider it a success.
+                foreach ($collectedNames[$fn]->select($newProp->name) as $compareProp) {
+                    if ($compareProp->getValue() === $newProp->getValue()) {
                         $ok = true;
-                        ++$stats['Merged values'];
+                        break;
                     }
                 }
-            }
 
-            if (!$ok) {
-                // echo $newProp->serialize() . " does not appear in earlier vcard!\n";
-                ++$stats['Error'];
-                if ($debug) {
-                    fwrite($debug, "Missing '".$newProp->name."' property in duplicate. Earlier vcard:\n".$collectedNames[$fn]->serialize()."\n\nLater:\n".$vcard->serialize()."\n\n");
+                if (!$ok) {
+                    // Merging the new value in the old vcard.
+                    $collectedNames[$fn]->add(clone $newProp);
+                    $ok = true;
+                    ++$stats['Merged values'];
                 }
+            }
+        }
 
-                $vcard->destroy();
-                continue 2;
+        if (!$ok) {
+            // echo $newProp->serialize() . " does not appear in earlier vcard!\n";
+            ++$stats['Error'];
+            if ($debug) {
+                fwrite($debug, "Missing '".$newProp->name."' property in duplicate. Earlier vcard:\n".$collectedNames[$fn]->serialize()."\n\nLater:\n".$vcard->serialize()."\n\n");
             }
+
+            $vcard->destroy();
+            continue 2;
         }
     }
 

diff --git a/bin/rrulebench.php b/bin/rrulebench.php
@@ -3,7 +3,7 @@
 include __DIR__.'/../vendor/autoload.php';
 
 if ($argc < 4) {
-    echo 'sabre/vobject ', Sabre\VObject\Version::VERSION, " RRULE benchmark\n";
+    echo 'sabre/vobject ', VObject\Version::VERSION, " RRULE benchmark\n";
     echo "\n";
     echo "This script can be used to measure the speed of the 'recurrence expansion'\n";
     echo 'system.';
@@ -18,7 +18,7 @@
 $bench->parse->start();
 
 echo "Parsing.\n";
-$vobj = Sabre\VObject\Reader::read(fopen($inputFile, 'r'));
+$vobj = VObject\Reader::read(fopen($inputFile, 'r'));
 
 $bench->parse->stop();
 

diff --git a/composer.json b/composer.json
@@ -38,10 +38,10 @@
         "sabre/xml"    : "^3.0 || ^4.0"
     },
     "require-dev" : {
-        "friendsofphp/php-cs-fixer": "^3.54",
+        "friendsofphp/php-cs-fixer": "^3.94",
         "phpunit/phpunit" : "^9.6",
         "phpunit/php-invoker" : "^2.0 || ^3.1",
-        "phpstan/phpstan": "^1.11"
+        "phpstan/phpstan": "^2.1"
     },
     "suggest" : {
         "hoa/bench"       : "If you would like to run the benchmark scripts"
@@ -94,7 +94,7 @@
             "phpstan analyse lib tests --memory-limit 1G"
         ],
         "cs-fixer": [
-            "php-cs-fixer fix"
+            "PHP_CS_FIXER_IGNORE_ENV=true php-cs-fixer fix"
         ],
         "phpunit": [
             "phpunit --configuration tests/phpunit.xml"

diff --git a/lib/Component.php b/lib/Component.php
@@ -222,16 +222,16 @@ public function select(string $name): array
 
             if (is_null($group)) {
                 return $result;
-            } else {
-                // If we have a group filter as well, we need to narrow it down
-                // more.
-                return array_filter(
-                    $result,
-                    function ($child) use ($group) {
-                        return $child instanceof Property && (null !== $child->group ? strtoupper($child->group) : '') === $group;
-                    }
-                );
             }
+
+            // If we have a group filter as well, we need to narrow it down
+            // more.
+            return array_filter(
+                $result,
+                function ($child) use ($group) {
+                    return $child instanceof Property && (null !== $child->group ? strtoupper($child->group) : '') === $group;
+                }
+            );
         }
 
         // If we got to this point, it means there was no 'name' specified for
@@ -422,13 +422,12 @@ public function __get(string $name): ?Node
         $matches = $this->select($name);
         if (0 === count($matches)) {
             return null;
-        } else {
-            $firstMatch = current($matches);
-            /* @var $firstMatch Property */
-            $firstMatch->setIterator(new ElementList(array_values($matches)));
-
-            return $firstMatch;
         }
+        $firstMatch = current($matches);
+        /* @var $firstMatch Property */
+        $firstMatch->setIterator(new ElementList(array_values($matches)));
+
+        return $firstMatch;
     }
 
     /**

diff --git a/lib/Component/VAlarm.php b/lib/Component/VAlarm.php
@@ -39,13 +39,7 @@ public function getEffectiveTriggerTime(): \DateTimeImmutable
             /** @var VEvent|VTodo $parentComponent */
             $parentComponent = $this->parent;
             if ('START' === $related) {
-                if ('VTODO' === $parentComponent->name) {
-                    $propName = 'DUE';
-                } else {
-                    $propName = 'DTSTART';
-                }
-
-                $effectiveTrigger = $parentComponent->$propName->getDateTime();
+                $effectiveTrigger = $parentComponent->DTSTART->getDateTime();
             } else {
                 if ('VTODO' === $parentComponent->name) {
                     $endProp = 'DUE';
@@ -102,9 +96,9 @@ public function isInTimeRange(\DateTimeInterface $start, \DateTimeInterface $end
             }
 
             return false;
-        } else {
-            return $start <= $effectiveTrigger && $end > $effectiveTrigger;
         }
+
+        return $start <= $effectiveTrigger && $end > $effectiveTrigger;
     }
 
     /**