diff options
Diffstat (limited to 'vendor/sabre/vobject')
-rw-r--r-- | vendor/sabre/vobject/.travis.yml | 15 | ||||
-rw-r--r-- | vendor/sabre/vobject/CHANGELOG.md | 10 | ||||
-rwxr-xr-x[-rw-r--r--] | vendor/sabre/vobject/bin/bench.php | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | vendor/sabre/vobject/bin/fetch_windows_zones.php | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | vendor/sabre/vobject/bin/generateicalendardata.php | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | vendor/sabre/vobject/bin/mergeduplicates.php | 0 | ||||
-rw-r--r-- | vendor/sabre/vobject/composer.json | 4 | ||||
-rw-r--r-- | vendor/sabre/vobject/lib/ITip/Broker.php | 2 | ||||
-rw-r--r-- | vendor/sabre/vobject/lib/Version.php | 2 | ||||
-rw-r--r-- | vendor/sabre/vobject/lib/timezonedata/php-bc.php | 1 |
10 files changed, 27 insertions, 7 deletions
diff --git a/vendor/sabre/vobject/.travis.yml b/vendor/sabre/vobject/.travis.yml index d1feb60de..4f50e97fd 100644 --- a/vendor/sabre/vobject/.travis.yml +++ b/vendor/sabre/vobject/.travis.yml @@ -8,6 +8,8 @@ php: env: global: - MEMCACHED_SERVER=127.0.0.1 + - RUN_PHPCSFIXER="TRUE" + - RUN_PHPUNIT="TRUE" - RUN_PHPSTAN="FALSE" matrix: - PREFER_LOWEST="" REPORT_COVERAGE="TRUE" WITH_COVERAGE="--coverage-clover=coverage.xml" @@ -15,19 +17,28 @@ env: matrix: include: + - name: 'PHP8' + dist: focal + php: nightly + env: + - RUN_PHPCSFIXER="FALSE" + - REPORT_COVERAGE="FALSE" - name: 'PHPStan' php: 7.4 env: + - RUN_PHPCSFIXER="FALSE" + - RUN_PHPUNIT="FALSE" - RUN_PHPSTAN="TRUE" - REPORT_COVERAGE="FALSE" fast_finish: true before_script: + - if [ $RUN_PHPCSFIXER == "FALSE" ]; then composer remove --no-update --dev friendsofphp/php-cs-fixer; fi - composer update $PREFER_LOWEST script: - - if [ $RUN_PHPSTAN == "FALSE" ]; then php vendor/bin/php-cs-fixer fix --dry-run --diff; fi - - if [ $RUN_PHPSTAN == "FALSE" ]; then php vendor/bin/phpunit --configuration tests/phpunit.xml $WITH_COVERAGE; fi + - if [ $RUN_PHPCSFIXER == "TRUE" ]; then php vendor/bin/php-cs-fixer fix --dry-run --diff; fi + - if [ $RUN_PHPUNIT == "TRUE" ]; then php vendor/bin/phpunit --configuration tests/phpunit.xml $WITH_COVERAGE; fi - if [ $RUN_PHPSTAN == "TRUE" ]; then composer phpstan; fi after_success: diff --git a/vendor/sabre/vobject/CHANGELOG.md b/vendor/sabre/vobject/CHANGELOG.md index 69e14154b..7d6b096fd 100644 --- a/vendor/sabre/vobject/CHANGELOG.md +++ b/vendor/sabre/vobject/CHANGELOG.md @@ -1,6 +1,16 @@ ChangeLog ========= +4.3.3 (2020-11-09) +------------------ + +* #519: Remove US/Pacific-New obsolete timezone (@phil-davis) + +4.3.2 (2020-10-03) +------------------ + +* #513: Added Support for PHP 8.0 (@phil-davis) + 4.3.1 (2020-07-13) ------------------ diff --git a/vendor/sabre/vobject/bin/bench.php b/vendor/sabre/vobject/bin/bench.php index 0a2736fa6..0a2736fa6 100644..100755 --- a/vendor/sabre/vobject/bin/bench.php +++ b/vendor/sabre/vobject/bin/bench.php diff --git a/vendor/sabre/vobject/bin/fetch_windows_zones.php b/vendor/sabre/vobject/bin/fetch_windows_zones.php index 9c4e51abd..9c4e51abd 100644..100755 --- a/vendor/sabre/vobject/bin/fetch_windows_zones.php +++ b/vendor/sabre/vobject/bin/fetch_windows_zones.php diff --git a/vendor/sabre/vobject/bin/generateicalendardata.php b/vendor/sabre/vobject/bin/generateicalendardata.php index 62b6107c5..62b6107c5 100644..100755 --- a/vendor/sabre/vobject/bin/generateicalendardata.php +++ b/vendor/sabre/vobject/bin/generateicalendardata.php diff --git a/vendor/sabre/vobject/bin/mergeduplicates.php b/vendor/sabre/vobject/bin/mergeduplicates.php index e6cde73dd..e6cde73dd 100644..100755 --- a/vendor/sabre/vobject/bin/mergeduplicates.php +++ b/vendor/sabre/vobject/bin/mergeduplicates.php diff --git a/vendor/sabre/vobject/composer.json b/vendor/sabre/vobject/composer.json index d4fa56a31..f26c0b5ec 100644 --- a/vendor/sabre/vobject/composer.json +++ b/vendor/sabre/vobject/composer.json @@ -32,12 +32,12 @@ "homepage" : "http://sabre.io/vobject/", "license" : "BSD-3-Clause", "require" : { - "php" : "^7.1", + "php" : "^7.1 || ^8.0", "ext-mbstring" : "*", "sabre/xml" : "^2.1" }, "require-dev" : { - "friendsofphp/php-cs-fixer": "~2.16.1", + "friendsofphp/php-cs-fixer": "~2.16.7", "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0", "phpstan/phpstan": "^0.12" }, diff --git a/vendor/sabre/vobject/lib/ITip/Broker.php b/vendor/sabre/vobject/lib/ITip/Broker.php index c09cdf3be..4e0368e13 100644 --- a/vendor/sabre/vobject/lib/ITip/Broker.php +++ b/vendor/sabre/vobject/lib/ITip/Broker.php @@ -162,7 +162,7 @@ class Broker * * @return array */ - public function parseEvent($calendar = null, $userHref, $oldCalendar = null) + public function parseEvent($calendar, $userHref, $oldCalendar = null) { if ($oldCalendar) { if (is_string($oldCalendar)) { diff --git a/vendor/sabre/vobject/lib/Version.php b/vendor/sabre/vobject/lib/Version.php index e5ab9af38..29ba84f88 100644 --- a/vendor/sabre/vobject/lib/Version.php +++ b/vendor/sabre/vobject/lib/Version.php @@ -14,5 +14,5 @@ class Version /** * Full version number. */ - const VERSION = '4.3.1'; + const VERSION = '4.3.3'; } diff --git a/vendor/sabre/vobject/lib/timezonedata/php-bc.php b/vendor/sabre/vobject/lib/timezonedata/php-bc.php index 83f38f507..3116c6868 100644 --- a/vendor/sabre/vobject/lib/timezonedata/php-bc.php +++ b/vendor/sabre/vobject/lib/timezonedata/php-bc.php @@ -147,7 +147,6 @@ return [ 'US/Michigan', 'US/Mountain', 'US/Pacific', - 'US/Pacific-New', 'US/Samoa', 'WET', ]; |