From 7860c5f92df69608a245c39af838e8f9c9c03d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Sch=C3=BCle?= Date: Mon, 29 Oct 2018 16:24:45 +0100 Subject: [PATCH] tweak(sabre): update vobject to 3.5.3pl1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix some minor issues in MimeDir parser Change-Id: I8bebaf1f1c3a5bde32c7aef84a24958abf082431 Reviewed-on: http://gerrit.tine20.com/customers/10759 Tested-by: Jenkins CI (http://ci.tine20.com/) Reviewed-by: Philipp Schüle --- tine20/composer.json | 5 +- tine20/composer.lock | 171 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 160 insertions(+), 16 deletions(-) diff --git a/tine20/composer.json b/tine20/composer.json index 63ad2f8f6d0..ae941679301 100644 --- a/tine20/composer.json +++ b/tine20/composer.json @@ -23,6 +23,9 @@ }, { "type": "git", "url": "https://github.com/tine20/syncroton.git" + }, { + "type": "git", + "url": "https://github.com/tine20/vobject.git" }, { "type": "git", "url": "https://github.com/paulmhh/PHPWord" @@ -48,7 +51,7 @@ "ezyang/htmlpurifier": "v4.6.0", "phpoffice/phpexcel": "1.8.*", "sabre/dav": "1.8.*", - "sabre/vobject": "3.5.3 as 2.1.0", + "sabre/vobject": "3.5.3pl1 as 2.1.0", "metaways/opendocument": "1.1", "phpoffice/phpword": "v0.14.0 as v0.13.0", "metaways/timezoneconvert": "1.*", diff --git a/tine20/composer.lock b/tine20/composer.lock index 8845e0ca47b..029577e682c 100644 --- a/tine20/composer.lock +++ b/tine20/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "48902dff7bc6ed523c703eb4926aa3a3", + "content-hash": "f3e46c96ace314a40651df17c193949e", "packages": [ { "name": "container-interop/container-interop", @@ -1483,26 +1483,74 @@ "time": "2015-01-21T21:01:09+00:00" }, { - "name": "sabre/vobject", - "version": "3.5.3", + "name": "sabre/uri", + "version": "1.2.1", "source": { "type": "git", - "url": "https://github.com/sabre-io/vobject.git", - "reference": "129d80533a9ec0d9cacfb50b51180c34edb6874c" + "url": "https://github.com/sabre-io/uri.git", + "reference": "ada354d83579565949d80b2e15593c2371225e61" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabre-io/vobject/zipball/129d80533a9ec0d9cacfb50b51180c34edb6874c", - "reference": "129d80533a9ec0d9cacfb50b51180c34edb6874c", + "url": "https://api.github.com/repos/sabre-io/uri/zipball/ada354d83579565949d80b2e15593c2371225e61", + "reference": "ada354d83579565949d80b2e15593c2371225e61", "shasum": "" }, + "require": { + "php": ">=5.4.7" + }, + "require-dev": { + "phpunit/phpunit": ">=4.0,<6.0", + "sabre/cs": "~1.0.0" + }, + "type": "library", + "autoload": { + "files": [ + "lib/functions.php" + ], + "psr-4": { + "Sabre\\Uri\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Evert Pot", + "email": "me@evertpot.com", + "homepage": "http://evertpot.com/", + "role": "Developer" + } + ], + "description": "Functions for making sense out of URIs.", + "homepage": "http://sabre.io/uri/", + "keywords": [ + "rfc3986", + "uri", + "url" + ], + "time": "2017-02-20T19:59:28+00:00" + }, + { + "name": "sabre/vobject", + "version": "3.5.3pl1", + "source": { + "type": "git", + "url": "https://github.com/tine20/vobject.git", + "reference": "759026d5dde9a088933f55b34d6428bd225d1d7b" + }, "require": { "ext-mbstring": "*", - "php": ">=5.3.1" + "php": ">=5.5", + "sabre/xml": ">=1.5 <3.0" }, "require-dev": { - "phpunit/phpunit": "*", - "squizlabs/php_codesniffer": "*" + "phpunit/phpunit": "> 4.8.35, <6.0.0" + }, + "suggest": { + "hoa/bench": "If you would like to run the benchmark scripts" }, "bin": [ "bin/vobject", @@ -1519,7 +1567,6 @@ "Sabre\\VObject\\": "lib/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], @@ -1535,18 +1582,112 @@ "email": "dominik@fruux.com", "homepage": "http://tobschall.de/", "role": "Developer" + }, + { + "name": "Ivan Enderlin", + "email": "ivan.enderlin@hoa-project.net", + "homepage": "http://mnt.io/", + "role": "Developer" } ], "description": "The VObject library for PHP allows you to easily parse and manipulate iCalendar and vCard objects", "homepage": "http://sabre.io/vobject/", "keywords": [ - "VObject", + "availability", + "freebusy", + "iCal", "iCalendar", + "ics", "jCal", "jCard", - "vCard" + "recurrence", + "rfc2425", + "rfc2426", + "rfc2739", + "rfc4770", + "rfc5545", + "rfc5546", + "rfc6321", + "rfc6350", + "rfc6351", + "rfc6474", + "rfc6638", + "rfc6715", + "rfc6868", + "vCalendar", + "vCard", + "vcf", + "xCal", + "xCard" + ], + "support": { + "forum": "https://groups.google.com/group/sabredav-discuss", + "source": "https://github.com/fruux/sabre-vobject" + }, + "time": "2018-10-29T15:43:00+00:00" + }, + { + "name": "sabre/xml", + "version": "1.5.0", + "source": { + "type": "git", + "url": "https://github.com/sabre-io/xml.git", + "reference": "59b20e5bbace9912607481634f97d05a776ffca7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sabre-io/xml/zipball/59b20e5bbace9912607481634f97d05a776ffca7", + "reference": "59b20e5bbace9912607481634f97d05a776ffca7", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-xmlreader": "*", + "ext-xmlwriter": "*", + "lib-libxml": ">=2.6.20", + "php": ">=5.5.5", + "sabre/uri": ">=1.0,<3.0.0" + }, + "require-dev": { + "phpunit/phpunit": "*", + "sabre/cs": "~1.0.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Sabre\\Xml\\": "lib/" + }, + "files": [ + "lib/Deserializer/functions.php", + "lib/Serializer/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Evert Pot", + "email": "me@evertpot.com", + "homepage": "http://evertpot.com/", + "role": "Developer" + }, + { + "name": "Markus Staab", + "email": "markus.staab@redaxo.de", + "role": "Developer" + } + ], + "description": "sabre/xml is an XML library that you may not hate.", + "homepage": "https://sabre.io/xml/", + "keywords": [ + "XMLReader", + "XMLWriter", + "dom", + "xml" ], - "time": "2016-10-07T03:20:40+00:00" + "time": "2016-10-09T22:57:52+00:00" }, { "name": "sentry/sentry", @@ -3921,7 +4062,7 @@ { "alias": "2.1.0", "alias_normalized": "2.1.0.0", - "version": "3.5.3.0", + "version": "3.5.3.0-patch1", "package": "sabre/vobject" }, {