Add dependancies audit

.gitattributes

@@ -3,5 +3,6 @@
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /.php_cs.dist export-ignore
+/.travis.yml export-ignore
 /CHANGELOG.md export-ignore
 /phpstan.neon export-ignore

.github/workflows/ci.yml

@@ -61,3 +61,46 @@ jobs:
       - name: Code Coverage
         uses: codecov/codecov-action@v3
         if: matrix.coverage != 'none'
+  dependencies-audit:
+    name: Dependencies audit (PHP ${{ matrix.php-versions }})
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3']
+        coverage: ['pcov']
+        code-analysis: ['no']
+        include:
+          - php-versions: '7.4'
+            coverage: 'none'
+            code-analysis: 'yes'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: mbstring, dom, fileinfo, mysql, redis, opcache
+          coverage: ${{ matrix.coverage }}
+          tools: composer
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          # Use composer.json for key, if composer.lock is not committed.
+          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install composer dependencies
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
+
+      - name: Composer audit
+        run: composer audit

.gitignore

@@ -6,4 +6,4 @@ tests/temp
 tests/.phpunit.result.cache
 
 # Development stuff
-.php-cs-fixer.cache
+.php-cs-fixer.cache

CHANGELOG.md

@@ -1,6 +1,162 @@
 ChangeLog
 =========
 
+4.29.0 (2023-12-29)
+-------------------
+* #98 Chore/merge upstream master 20231228
+
+4.28.0 (2023-12-19)
+-------------------
+* #96 use dubai instead of muscat
+
+4.27.0 (2023-12-18)
+-------------------
+* #94 Add support for gulf standard time
+
+4.26.0 (2023-11-30)
+-------------------
+* #92 Drop malformed or illegal VALUE parameter
+
+4.25.0 (2023-06-26)
+-------------------
+* #89 Move America/Yellowknife to deprecated
+
+4.24.0 (2023-06-19)
+-------------------
+* #87 Added whitelist for illegal values in parameter
+
+4.23.0 (2023-04-13)
+-------------------
+* #82 Modify TZID value for migration timezones 
+
+4.22.0 (2023-03-01)
+-------------------
+* #80 Allow newly deprecated timezones
+
+4.21.0 (2022-12-28)
+-------------------
+* #76 Add mapping for PST timezone
+
+4.20.0 (2022-12-23)
+-------------------
+* #74 Handle null tzid
+
+4.19.0 (2022-12-21)
+-------------------
+* #72 Deprecate Enderbury timezone
+
+4.18.0 (2022-09-01)
+-------------------
+* #69 Add mapping for CDT timezone
+
+4.17.0 (2022-07-29)
+-------------------
+* #65 [Calendar] Replace Godthab timezone 
+
+4.16.0 (2022-07-06)
+-------------------
+* #63 Fix customized timezone guesser
+
+4.15.0 (2022-06-23)
+-------------------
+* #57 Handle customized timezone
+
+4.14.0 (2022-05-31)
+-------------------
+* #54 Add FindFromOffsetName 
+
+4.13.0 (2022-05-27)
+-------------------
+* #56 Merge upstream changes from sabre-io/vobject@a595790 into protonlabs/vobject
+* #58 Handle version timezone
+
+4.12.0 (2022-05-05)
+-------------------
+* #52 Add FindFromOutlookCities timezone finder 
+
+4.11.0 (2022-04-22)
+-------------------
+* #50 Add lowercase timezone finder 
+
+4.10.0 (2022-03-08)
+-------------------
+* #48 Block invalid combinations of FREQ with BY rules
+
+4.9.0 (2022-02-15)
+------------------
+* #46 Add support UTC-05:00 timezone 
+
+4.8.0 (2022-02-10)
+------------------
+* #42 Add option to fix unfolding issues in ICS
+
+4.7.2 (2022-01-21)
+------------------
+* #41 Add missing microsoft timezones and test with confluence file
+
+4.7.1 (2022-01-10)
+------------------
+* #39 Add support for lowercase timezones
+
+4.7.0 (2021-12-15)
+------------------
+* #34 Merge upstream changes from sabre-io/vobject:4.4.0 into protonlabs/vobject
+* #36 Merge upstream changes from sabre-io/vobject:4.4.1 into protonlabs/vobject
+
+4.6.1 (2021-11-04)
+------------------
+* #29 Fix timezone name prefixed with /
+* #30 Missing EDT TZID conversion
+
+4.5.1 (2021-10-11)
+------------------
+* #25 Fix duplicate value
+* #26 Add php unsupport timezone
+
+4.4.2 (2021-07-15)
+------------------
+* #23 Add microsoft timezone map
+
+4.4.1 (2021-01-18)
+------------------
+* #19 Validate count and until property
+
+4.4.0 (2020-11-23)
+------------------
+
+* #18 Merge upstream changes from sabre-io/vobject:4.3.3 into protonlabs/vobject
+* #17 Throw exception when getting invalid timezone
+
+4.3.4 (2020-07-27)
+------------------
+
+* #16 Merge upstream changes from sabre-io/vobject:4.3.1 into protonlabs/vobject
+
+4.3.3 (2020-07-22)
+------------------
+
+* #15 Expose RRULE properties
+
+4.3.2 (2020-05-20)
+------------------
+
+* #14 Add timezones data mapping.
+
+4.3.1 (2020-01-27)
+------------------
+
+* #6 Add FastForward Before
+* #7 Add FastForward to end
+* #11 FREQ is mandatory in the RRule
+* #12 Validate BYMONTHDAY
+
+4.2.1 (2019-09-10)
+------------------
+
+* #2 Fix bug in by year day
+* #3 Add daily occurrences to nextMonth and NextYear
+* #4 Enhance fast forward speed if no count value has been given
+
 4.5.2 (2023-01-20)
 ------------------
 

README.md

@@ -1,5 +1,9 @@
-sabre/vobject
+protonlabs/vobject
 =============
+![Build Status](https://github.com/ProtonMail/vobject/actions/workflows/actions.yml/badge.svg)
+[![codecov](https://codecov.io/gh/ProtonMail/vobject/branch/master/graph/badge.svg?token=ARcwkxCKZn)](https://codecov.io/gh/ProtonMail/vobject)
+
+Forked from [sabre/vobject](https://github.com/sabre-io/vobject).
 
 The VObject library allows you to easily parse and manipulate [iCalendar](https://tools.ietf.org/html/rfc5545)
 and [vCard](https://tools.ietf.org/html/rfc6350) objects using PHP.
@@ -12,12 +16,12 @@ Installation
 
 Make sure you have [Composer][1] installed, and then run:
 
-    composer require sabre/vobject "^4.0"
+    composer require protonlabs/vobject "^4.0"
 
 This package requires PHP 5.5. If you need the PHP 5.3/5.4 version of this package instead, use:
 
 
-    composer require sabre/vobject "^3.4"
+    composer require protonlabs/vobject "^3.4"
 
 
 Usage
@@ -27,21 +31,6 @@ Usage
 * [Working with iCalendar](http://sabre.io/vobject/icalendar/)
 
 
-
-Build status
-------------
-
-| branch | status |
-| ------ | ------ |
-| master | [![Build Status](https://travis-ci.org/sabre-io/vobject.svg?branch=master)](https://travis-ci.org/sabre-io/vobject) |
-| 3.5    | [![Build Status](https://travis-ci.org/sabre-io/vobject.svg?branch=3.5)](https://travis-ci.org/sabre-io/vobject) |
-| 3.4    | [![Build Status](https://travis-ci.org/sabre-io/vobject.svg?branch=3.4)](https://travis-ci.org/sabre-io/vobject) |
-| 3.1    | [![Build Status](https://travis-ci.org/sabre-io/vobject.svg?branch=3.1)](https://travis-ci.org/sabre-io/vobject) |
-| 2.1    | [![Build Status](https://travis-ci.org/sabre-io/vobject.svg?branch=2.1)](https://travis-ci.org/sabre-io/vobject) |
-| 2.0    | [![Build Status](https://travis-ci.org/sabre-io/vobject.svg?branch=2.0)](https://travis-ci.org/sabre-io/vobject) |
-
-
-
 Support
 -------
 

codecov.yml

@@ -0,0 +1,19 @@
+comment:
+  layout: "reach, diff, flags, files"
+  behavior: default
+  require_changes: false
+
+coverage:
+  range: "70..100"
+  round: down
+  precision: 2
+  status:
+    project:
+      default:
+        # basic
+        target: 95%
+        threshold: 0%
+        # advanced settings
+        if_ci_failed: error
+        informational: false
+        only_pulls: false

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "sabre/vobject",
+    "name": "protonlabs/vobject",
     "description" : "The VObject library for PHP allows you to easily parse and manipulate iCalendar and vCard objects",
     "keywords" : [
         "iCalendar",

lib/Component.php

@@ -412,7 +412,7 @@ protected function getDefaults(): array
      *
      * $event = $calendar->VEVENT;
      *
-     * @return Property|Component
+     * @return Property|Component|null
      */
     public function __get(string $name): ?Node
     {

lib/Document.php

@@ -191,9 +191,12 @@ public function createProperty(string $name, $value = null, array $parameters =
         if (is_null($class)) {
             // If a VALUE parameter is supplied, we should use that.
             if (isset($parameters['VALUE'])) {
-                $class = $this->getClassNameForPropertyValue($parameters['VALUE']);
-                if (is_null($class)) {
-                    throw new InvalidDataException('Unsupported VALUE parameter for '.$name.' property. You supplied "'.$parameters['VALUE'].'"');
+                if (is_string($parameters['VALUE'])) {
+                    $class = $this->getClassNameForPropertyValue($parameters['VALUE']);
+                }
+                if (is_null($class)) { // VALUE is malformed or illegal, drop it
+                    unset($parameters['VALUE']);
+                    $class = $this->getClassNameForPropertyName($name);
                 }
             } else {
                 $class = $this->getClassNameForPropertyName($name);

lib/Parameter.php

@@ -46,6 +46,7 @@ class Parameter extends Node
      */
     public function __construct(Document $root, ?string $name, $value = null)
     {
+        $this->name = is_null($name) ? '' : strtoupper($name);
         $this->root = $root;
         if (is_null($name)) {
             $this->noName = true;

lib/Parser/MimeDir.php

@@ -10,6 +10,7 @@
 use Sabre\VObject\Node;
 use Sabre\VObject\ParseException;
 use Sabre\VObject\Property;
+use Sabre\VObject\Reader;
 
 /**
  * MimeDir parser.
@@ -206,15 +207,32 @@ protected function parseLine(string $line)
             }
             $component = $this->root->createComponent(\substr($line, 6), [], false);
 
+            $prevNode = null;
             while (true) {
                 // Reading until we hit END:
                 $line = $this->readLine();
                 if ('END:' === strtoupper(\substr($line, 0, 4))) {
                     break;
                 }
-                $result = $this->parseLine($line);
+                try {
+                    $result = $this->parseLine($line);
+                } catch (\Exception $e) {
+                    if (isset($prevNode)
+                        && $e instanceof ParseException && str_contains($e->getMessage(), 'Invalid Mimedir file. Line starting at')
+                        && ($this->options & Reader::OPTION_FIX_UNFOLDING)
+                    ) {
+                        // Fix unfolding
+                        $component->remove($prevNode);
+                        $value = $prevNode->getValue().' '.$line.PHP_EOL;
+                        $prevNode->offsetSet('VALUE', $value);
+                        $prevNode->setValue($value);
+                        $component->add($prevNode);
+                        continue;
+                    }
+                    throw $e;
+                }
                 if ($result) {
-                    $component->add($result);
+                    $prevNode = $component->add($result);
                 }
             }