[Pkg-owncloud-commits] [php-sabredav] 15/30: Merge pull request #757 from jakobsack/master

[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 e0aae3208b3c68fe1f33c104c95c44a62bd30e31
Merge: 3a02e18 4d48356
Author: Evert Pot <me at evertpot.com>
Date:   Mon Jan 11 18:39:51 2016 -0500

    Merge pull request #757 from jakobsack/master
    
    Fixing coding style, add tests/config.user.php for custom test databases

 .gitignore                                      |  3 ++
 lib/CardDAV/Backend/PDO.php                     |  2 +-
 lib/CardDAV/Plugin.php                          |  3 +-
 tests/Sabre/CardDAV/AddressBookTest.php         |  5 ++-
 tests/Sabre/CardDAV/Backend/AbstractPDOTest.php |  2 +-
 tests/Sabre/CardDAV/Backend/PDOSqliteTest.php   |  9 ++++
 tests/Sabre/CardDAV/PluginTest.php              |  2 +-
 tests/Sabre/CardDAV/TestUtil.php                | 18 +++-----
 tests/Sabre/DAV/ClientTest.php                  | 60 ++++++++++++-------------
 tests/bootstrap.php                             |  7 +++
 10 files changed, 65 insertions(+), 46 deletions(-)

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