ProtonMail · valentinbonneaud · Nov 28, 2018 · Sep 10, 2019 · Sep 10, 2019 · Sep 10, 2019
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,7 @@
+/tests export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.php_cs.dist export-ignore
+/.travis.yml export-ignore
+/CHANGELOG.md export-ignore
+/phpstan.neon export-ignore
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -0,0 +1,59 @@
+name: Tests
+
+on: [push]
+
+jobs:
+  phpunit:
+    strategy:
+      matrix:
+        operating-system: [ubuntu-latest]
+        php-versions: ['7.4', '8.0', '8.1']
+
+    runs-on: ${{ matrix.operating-system }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: mbstring
+          coverage: pcov
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v2
+        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.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install composer dependencies
+        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
+
+      - name: Code Analysis (PHPStan)
+        if: matrix.code-analysis == 'yes'
+        run: composer phpstan
+
+      - name: Test with phpunit
+        run: vendor/bin/phpunit --configuration ./tests/phpunit.xml --coverage-text --coverage-clover=coverage.xml
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v2
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          file: ./coverage.xml
+          flags: tests
+          name: codecov-umbrella
+          fail_ci_if_error: true
diff --git a/.gitignore b/.gitignore
@@ -3,20 +3,7 @@ vendor/
 composer.lock
 tests/cov/
 tests/temp
-
-#vim
-.*.swp
-
-#binaries
-bin/phpunit
-bin/phpcs
-bin/php-cs-fixer
-bin/sabre-cs-fixer
-bin/hoa
+tests/.phpunit.result.cache
 
 # Development stuff
-testdata/
 .php_cs.cache
-
-# OS X
-.DS_Store
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -6,7 +6,7 @@ $config->getFinder()
     ->in(__DIR__);
 $config->setRules([
     '@PSR1' => true,
-    '@Symfony' =>true
+    '@Symfony' => true
 ]);
 
-return $config;
+return $config;
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,134 @@
 ChangeLog
 =========
 
+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.2.0 (2019-02-19)
 ------------------
 
@@ -84,7 +212,7 @@ ChangeLog
 * #306: iTip REPLYs to the first instance of a recurring event was not handled
   correctly.
 * Slightly better error message during validation of `N` and `ADR` properties.
-* #312: Correctly extracing timezone in the iTip broker, even when we don't
+* #312: Correctly extracting timezone in the iTip broker, even when we don't
   have a master event. (@vkomrakov-sugar).
 * When validating a component's property that must appear once and which could
   automatically be repaired, make sure we report the change as 'repaired'.
@@ -406,7 +534,7 @@ ChangeLog
 * #114: VTIMEZONE is retained when generating new REQUEST objects.
 * #114: Support for 'MAILTO:' style email addresses (in uppercase) in the iTip
   broker. This improves evolution support.
-* #115: Using REQUEST-STATUS from REPLY messages and now propegating that into
+* #115: Using REQUEST-STATUS from REPLY messages and now propagating that into
   SCHEDULE-STATUS.
 
 
@@ -643,7 +771,7 @@ ChangeLog
 3.0.0-alpha2 (2013-05-22)
 -------------------------
 
-* Fixed: vCard URL properties were referencing a non-existant class.
+* Fixed: vCard URL properties were referencing a non-existent class.
 
 
 3.0.0-alpha1 (2013-05-21)
@@ -801,7 +929,7 @@ ChangeLog
   properties such as N, ADR, ORG and CATEGORIES.
 * Added: Splitter classes, that can split up large objects (such as exports)
   into individual objects (thanks @DominikTo and @armin-hackmann).
-* Added: VFREEBUSY component, which allows easily checking wether timeslots are
+* Added: VFREEBUSY component, which allows easily checking whether timeslots are
   available.
 * Added: The Reader class now has a 'FORGIVING' option, which allows it to parse
   properties with incorrect characters in the name (at this time, it just allows

diff --git a/README.md b/README.md
@@ -1,23 +1,27 @@
-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.
 
-The goal of the VObject library is to create a very complete library, with an easy to use API.
+The goal of the VObject library is to create a very complete library, with an easy-to-use API.
 
 
 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
 -------
 

diff --git a/bin/bench_freebusygenerator.php b/bin/bench_freebusygenerator.php
@@ -11,7 +11,7 @@
     echo "The process will be repeated 100 times to get accurate stats\n";
     echo "\n";
     echo 'Usage: '.$argv[0]." inputfile.ics\n";
-    die();
+    exit();
 }
 
 list(, $inputFile) = $argv;

diff --git a/bin/bench_manipulatevcard.php b/bin/bench_manipulatevcard.php
@@ -10,7 +10,7 @@
     echo 'system.';
     echo "\n";
     echo 'Usage: '.$argv[0]." inputfile.vcf\n";
-    die();
+    exit();
 }
 
 list(, $inputFile) = $argv;