initial sabre upgrade (needs lots of work - to wit: authentication, redo the browser interface, and rework event export/import)

1 files changed, 25 insertions, 12 deletions

diff --git a/vendor/sabre/dav/tests/bootstrap.php b/vendor/sabre/dav/tests/bootstrap.php
index a6493ce6b..325ccd3c7 100644
--- a/vendor/sabre/dav/tests/bootstrap.php
+++ b/vendor/sabre/dav/tests/bootstrap.php
@@ -1,23 +1,36 @@
 <?php
 
-define('SABRE_MYSQLDSN','mysql:host=127.0.0.1;dbname=sabredav');
-define('SABRE_MYSQLUSER','root');
-define('SABRE_MYSQLPASS','');
-
 set_include_path(__DIR__ . '/../lib/' . PATH_SEPARATOR . __DIR__ . PATH_SEPARATOR . get_include_path());
 
-include __DIR__ . '/../vendor/autoload.php';
-include 'Sabre/TestUtil.php';
-include 'Sabre/DAVServerTest.php';
+$autoLoader = include __DIR__ . '/../vendor/autoload.php';
+
+// SabreDAV tests auto loading
+$autoLoader->add('Sabre\\', __DIR__);
+// VObject tests auto loading
+$autoLoader->addPsr4('Sabre\\VObject\\',__DIR__ . '/../vendor/sabre/vobject/tests/VObject');
+$autoLoader->addPsr4('Sabre\\Xml\\',__DIR__ . '/../vendor/sabre/xml/tests/Sabre/Xml');
 
 date_default_timezone_set('UTC');
 
-define("SABRE_TEMPDIR",dirname(__FILE__) . '/temp/');
+$config = [
+    'SABRE_TEMPDIR'   => dirname(__FILE__) . '/temp/',
+    'SABRE_HASSQLITE' => in_array('sqlite',PDO::getAvailableDrivers()),
+    'SABRE_HASMYSQL'  => in_array('mysql',PDO::getAvailableDrivers()),
+    'SABRE_MYSQLDSN'  => 'mysql:host=127.0.0.1;dbname=sabredav',
+    'SABRE_MYSQLUSER' => 'root',
+    'SABRE_MYSQLPASS' => '',
+];
+
+if (file_exists(__DIR__ . '/config.user.php')) {
+    include __DIR__ . '/config.user.php';
+    foreach($userConfig as $key=>$value) {
+        $config[$key] = $value;
+    }
+}
 
-// If sqlite is not available, this constant is used to skip the relevant
-// tests
-define('SABRE_HASSQLITE',in_array('sqlite',PDO::getAvailableDrivers()));
-define('SABRE_HASMYSQL', in_array('mysql',PDO::getAvailableDrivers()) && defined('SABRE_MYSQLDSN') && defined('SABRE_MYSQLUSER') && defined('SABRE_MYSQLPASS'));
+foreach($config as $key=>$value) {
+    if (!defined($key)) define($key, $value);
+}
 
 if (!file_exists(SABRE_TEMPDIR)) mkdir(SABRE_TEMPDIR);
 if (file_exists('.sabredav')) unlink('.sabredav');