[Pkg-owncloud-commits] [php-sabredav] 85/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 5c251f3da9d630ee102a7993ffb1bdbc988c57cf
Merge: 6e55707 b36bb35
Author: Evert Pot <me at evertpot.com>
Date:   Tue Mar 22 17:56:03 2016 -0400

    Merge branch 'master' into sharing-take-2

 .travis.yml                                        |  4 +-
 CHANGELOG.md                                       | 45 +++++++++++++++++
 composer.json                                      |  2 +-
 examples/sql/sqlite.addressbooks.sql               | 22 ++++-----
 examples/sql/sqlite.calendars.sql                  | 56 +++++++++++-----------
 examples/sql/sqlite.locks.sql                      |  2 +-
 examples/sql/sqlite.principals.sql                 | 10 ++--
 examples/sql/sqlite.propertystorage.sql            |  8 ++--
 examples/sql/sqlite.users.sql                      |  6 +--
 lib/CardDAV/Backend/PDO.php                        |  2 +-
 lib/DAV/CorePlugin.php                             | 10 ++--
 .../DAV/PropertyStorage/Backend/PDOMysqlTest.php   |  2 +-
 .../DAV/PropertyStorage/Backend/PDOSqliteTest.php  |  2 +-
 13 files changed, 107 insertions(+), 64 deletions(-)

diff --cc .travis.yml
index 54b2ade,571c939..f8556c1
--- a/.travis.yml
+++ b/.travis.yml
@@@ -23,10 -24,10 +23,10 @@@ cache: vendo
  
  before_script:
    - mysql -e 'create database sabredav'
+   - phpenv config-rm xdebug.ini
    #  - composer self-update
-   - composer update --prefer-source $LOWEST_DEPS
+   - composer update --prefer-dist $LOWEST_DEPS
  
  script:
 -  - ./bin/phpunit --configuration tests/phpunit.xml $TEST_DEPS
 +  - ./bin/phpunit --configuration tests/phpunit.xml.dist $TEST_DEPS
    - ./bin/sabre-cs-fixer fix lib/ --dry-run --diff
- 
diff --cc examples/sql/sqlite.calendars.sql
index 32b0627,a865403..71f3eb7
--- a/examples/sql/sqlite.calendars.sql
+++ b/examples/sql/sqlite.calendars.sql
@@@ -13,18 -13,11 +13,18 @@@ CREATE TABLE calendarobjects 
  );
  
  CREATE TABLE calendars (
-     id integer primary key asc,
-     synctoken integer,
-     components text
+     id integer primary key asc NOT NULL,
++    synctoken integer DEFAULT 1 NOT NULL,
++    components text NOT NULL
 +);
 +
 +CREATE TABLE calendarinstances (
-     id integer primary key asc,
-     calendarid integer,
-     principaluri text,
-     access integer COMMENT '1 = owner, 2 = readwrite, 3 = read',
++    id integer primary key asc NOT NULL,
++    calendarid integer NOT NULL,
+     principaluri text NOT NULL,
++    access integer COMMENT '1 = owner, 2 = readwrite, 3 = read' NOT NULL,
      displayname text,
-     uri text,
+     uri text NOT NULL,
 -    synctoken integer DEFAULT 1 NOT NULL,
      description text,
      calendarorder integer,
      calendarcolor text,

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