Merge remote-tracking branch 'upstream/dev' into plugin-repo

1 files changed, 14 insertions, 4 deletions

diff --git a/vendor/sabre/vobject/tests/bootstrap.php b/vendor/sabre/vobject/tests/bootstrap.php
index 3608abec1..14281e218 100644
--- a/vendor/sabre/vobject/tests/bootstrap.php
+++ b/vendor/sabre/vobject/tests/bootstrap.php
@@ -2,14 +2,24 @@
 
 date_default_timezone_set('UTC');
 
-$try = array(
+$try = [
     __DIR__ . '/../vendor/autoload.php',
     __DIR__ . '/../../../autoload.php',
-);
+];
 
-foreach($try as $path) {
+foreach ($try as $path) {
     if (file_exists($path)) {
-        include $path;
+        $autoLoader = include $path;
         break;
     }
 }
+
+$autoLoader->addPsr4('Sabre\\VObject\\', __DIR__ . '/VObject');
+
+if (!defined('SABRE_TEMPDIR')) {
+  define('SABRE_TEMPDIR', __DIR__ . '/temp/');
+}
+
+if (!file_exists(SABRE_TEMPDIR)) {
+  mkdir(SABRE_TEMPDIR);
+}