[Pkg-owncloud-commits] [php-sabredav] 39/220: Merge branch 'master' into sharing-take-2

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabredav.

commit 855c6f6556ca27356422955b5f46a3e81f036c53
Merge: 3d12510 d4353c7
Author: Evert Pot <me at evertpot.com>
Date:   Mon Nov 30 22:37:37 2015 -0500

    Merge branch 'master' into sharing-take-2

 CHANGELOG.md                                 | 14 +++++++++++
 composer.json                                |  4 ++--
 examples/minimal.php                         | 20 ++++++++++++++++
 examples/sql/mysql.addressbook.sql           |  6 ++---
 examples/sql/mysql.calendars.sql             | 12 +++++-----
 examples/sql/mysql.locks.sql                 |  3 +--
 examples/sql/mysql.principals.sql            |  5 ++--
 examples/sql/mysql.propertystorage.sql       |  3 ++-
 examples/sql/mysql.users.sql                 |  2 +-
 lib/CalDAV/Plugin.php                        |  8 +++++--
 lib/DAV/Tree.php                             |  4 +++-
 lib/DAV/Xml/Element/Response.php             | 21 +++++++++++++++-
 tests/Sabre/DAV/Xml/Element/ResponseTest.php | 36 ++++++++++++++++++++++++++--
 13 files changed, 114 insertions(+), 24 deletions(-)

diff --cc examples/sql/mysql.calendars.sql
index 04775c5,e3f5a01..45cc09e
--- a/examples/sql/mysql.calendars.sql
+++ b/examples/sql/mysql.calendars.sql
@@@ -15,24 -15,18 +15,24 @@@ CREATE TABLE calendarobjects 
  
  CREATE TABLE calendars (
      id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
 +    synctoken INTEGER UNSIGNED NOT NULL DEFAULT '1',
 +    components VARBINARY(20)
- ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
++) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 +
 +CREATE TABLE calendar_instances (
 +    id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
 +    calendarid INTEGER UNSIGNED NOT NULL,
      principaluri VARBINARY(100),
 +    access TINYINT(1) NOT NULL DEFAULT '1' COMMENT '1 = owner, 2 = readwrite, 3 = read',
      displayname VARCHAR(100),
      uri VARBINARY(200),
 -    synctoken INTEGER UNSIGNED NOT NULL DEFAULT '1',
      description TEXT,
      calendarorder INT(11) UNSIGNED NOT NULL DEFAULT '0',
      calendarcolor VARBINARY(10),
      timezone TEXT,
 -    components VARBINARY(20),
      transparent TINYINT(1) NOT NULL DEFAULT '0',
      UNIQUE(principaluri, uri)
- );
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
  
  CREATE TABLE calendarchanges (
      id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-php/php-sabredav.git