upgrade to sabre32

4 files changed, 75 insertions, 124 deletions

diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
index b7fc0125d..10c9b8207 100644
--- a/vendor/composer/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -6,4 +6,5 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
+    'Psr\\Log\\' => array($vendorDir . '/psr/log'),
 );
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index f2df43375..aaf70ce6f 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit85a1cefa95be2f464cf7f947cbc4c785
+class ComposerAutoloaderInite7c34560857712ac82f3f77ff9c61261
 {
     private static $loader;
 
@@ -19,48 +19,37 @@ class ComposerAutoloaderInit85a1cefa95be2f464cf7f947cbc4c785
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit85a1cefa95be2f464cf7f947cbc4c785', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInite7c34560857712ac82f3f77ff9c61261', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit85a1cefa95be2f464cf7f947cbc4c785', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInite7c34560857712ac82f3f77ff9c61261', 'loadClassLoader'));
 
-        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION');
-        if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
-
-            call_user_func(\Composer\Autoload\ComposerStaticInit85a1cefa95be2f464cf7f947cbc4c785::getInitializer($loader));
-        } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
+        $map = require __DIR__ . '/autoload_namespaces.php';
+        foreach ($map as $namespace => $path) {
+            $loader->set($namespace, $path);
+        }
 
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
+        $map = require __DIR__ . '/autoload_psr4.php';
+        foreach ($map as $namespace => $path) {
+            $loader->setPsr4($namespace, $path);
+        }
 
-            $classMap = require __DIR__ . '/autoload_classmap.php';
-            if ($classMap) {
-                $loader->addClassMap($classMap);
-            }
+        $classMap = require __DIR__ . '/autoload_classmap.php';
+        if ($classMap) {
+            $loader->addClassMap($classMap);
         }
 
         $loader->register(true);
 
-        if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit85a1cefa95be2f464cf7f947cbc4c785::$files;
-        } else {
-            $includeFiles = require __DIR__ . '/autoload_files.php';
-        }
+        $includeFiles = require __DIR__ . '/autoload_files.php';
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire85a1cefa95be2f464cf7f947cbc4c785($fileIdentifier, $file);
+            composerRequiree7c34560857712ac82f3f77ff9c61261($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire85a1cefa95be2f464cf7f947cbc4c785($fileIdentifier, $file)
+function composerRequiree7c34560857712ac82f3f77ff9c61261($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
deleted file mode 100644
index 04dd83351..000000000
--- a/vendor/composer/autoload_static.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-// autoload_static.php @generated by Composer
-
-namespace Composer\Autoload;
-
-class ComposerStaticInit85a1cefa95be2f464cf7f947cbc4c785
-{
-    public static $files = array (
-        '383eaff206634a77a1be54e64e6459c7' => __DIR__ . '/..' . '/sabre/uri/lib/functions.php',
-        '2b9d0f43f9552984cfa82fee95491826' => __DIR__ . '/..' . '/sabre/event/lib/coroutine.php',
-        'd81bab31d3feb45bfe2f283ea3c8fdf7' => __DIR__ . '/..' . '/sabre/event/lib/Loop/functions.php',
-        'a1cce3d26cc15c00fcd0b3354bd72c88' => __DIR__ . '/..' . '/sabre/event/lib/Promise/functions.php',
-        '3569eecfeed3bcf0bad3c998a494ecb8' => __DIR__ . '/..' . '/sabre/xml/lib/Deserializer/functions.php',
-        '93aa591bc4ca510c520999e34229ee79' => __DIR__ . '/..' . '/sabre/xml/lib/Serializer/functions.php',
-        'ebdb698ed4152ae445614b69b5e4bb6a' => __DIR__ . '/..' . '/sabre/http/lib/functions.php',
-    );
-
-    public static $prefixLengthsPsr4 = array (
-        'S' => 
-        array (
-            'Sabre\\Xml\\' => 10,
-            'Sabre\\VObject\\' => 14,
-            'Sabre\\Uri\\' => 10,
-            'Sabre\\HTTP\\' => 11,
-            'Sabre\\Event\\' => 12,
-            'Sabre\\DAV\\' => 10,
-            'Sabre\\DAVACL\\' => 13,
-            'Sabre\\CardDAV\\' => 14,
-            'Sabre\\CalDAV\\' => 13,
-        ),
-    );
-
-    public static $prefixDirsPsr4 = array (
-        'Sabre\\Xml\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/sabre/xml/lib',
-        ),
-        'Sabre\\VObject\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/sabre/vobject/lib',
-        ),
-        'Sabre\\Uri\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/sabre/uri/lib',
-        ),
-        'Sabre\\HTTP\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/sabre/http/lib',
-        ),
-        'Sabre\\Event\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/sabre/event/lib',
-        ),
-        'Sabre\\DAV\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/sabre/dav/lib/DAV',
-        ),
-        'Sabre\\DAVACL\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/sabre/dav/lib/DAVACL',
-        ),
-        'Sabre\\CardDAV\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/sabre/dav/lib/CardDAV',
-        ),
-        'Sabre\\CalDAV\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/sabre/dav/lib/CalDAV',
-        ),
-    );
-
-    public static function getInitializer(ClassLoader $loader)
-    {
-        return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit85a1cefa95be2f464cf7f947cbc4c785::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit85a1cefa95be2f464cf7f947cbc4c785::$prefixDirsPsr4;
-
-        }, null, ClassLoader::class);
-    }
-}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 5714e1c19..4c5a019d8 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1,5 +1,45 @@
 [
     {
+        "name": "psr/log",
+        "version": "1.0.0",
+        "version_normalized": "1.0.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/php-fig/log.git",
+            "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
+            "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
+            "shasum": ""
+        },
+        "time": "2012-12-21 11:40:51",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Psr\\Log\\": ""
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "PHP-FIG",
+                "homepage": "http://www.php-fig.org/"
+            }
+        ],
+        "description": "Common interface for logging libraries",
+        "keywords": [
+            "log",
+            "psr",
+            "psr-3"
+        ]
+    },
+    {
         "name": "sabre/uri",
         "version": "1.1.0",
         "version_normalized": "1.1.0.0",
@@ -170,17 +210,17 @@
     },
     {
         "name": "sabre/xml",
-        "version": "1.4.1",
-        "version_normalized": "1.4.1.0",
+        "version": "1.4.2",
+        "version_normalized": "1.4.2.0",
         "source": {
             "type": "git",
             "url": "https://github.com/fruux/sabre-xml.git",
-            "reference": "59998046db252634259a878baf1af18159f508f3"
+            "reference": "f48d98c22a4a4bef76cabb5968ffaddbb2bb593e"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/fruux/sabre-xml/zipball/59998046db252634259a878baf1af18159f508f3",
-            "reference": "59998046db252634259a878baf1af18159f508f3",
+            "url": "https://api.github.com/repos/fruux/sabre-xml/zipball/f48d98c22a4a4bef76cabb5968ffaddbb2bb593e",
+            "reference": "f48d98c22a4a4bef76cabb5968ffaddbb2bb593e",
             "shasum": ""
         },
         "require": {
@@ -195,7 +235,7 @@
             "phpunit/phpunit": "*",
             "sabre/cs": "~0.0.2"
         },
-        "time": "2016-03-12 22:23:16",
+        "time": "2016-05-19 21:56:49",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -332,17 +372,17 @@
     },
     {
         "name": "sabre/dav",
-        "version": "3.1.3",
-        "version_normalized": "3.1.3.0",
+        "version": "3.2.0-beta1",
+        "version_normalized": "3.2.0.0-beta1",
         "source": {
             "type": "git",
             "url": "https://github.com/fruux/sabre-dav.git",
-            "reference": "8a266c7b5e140da79529414b9cde2a2d058b536b"
+            "reference": "32524c79a5890056123aa64499719e7c061bfde8"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/fruux/sabre-dav/zipball/8a266c7b5e140da79529414b9cde2a2d058b536b",
-            "reference": "8a266c7b5e140da79529414b9cde2a2d058b536b",
+            "url": "https://api.github.com/repos/fruux/sabre-dav/zipball/32524c79a5890056123aa64499719e7c061bfde8",
+            "reference": "32524c79a5890056123aa64499719e7c061bfde8",
             "shasum": ""
         },
         "require": {
@@ -356,14 +396,16 @@
             "ext-spl": "*",
             "lib-libxml": ">=2.7.0",
             "php": ">=5.5.0",
+            "psr/log": "^1.0",
             "sabre/event": ">=2.0.0, <4.0.0",
             "sabre/http": "^4.2.1",
-            "sabre/uri": "~1.0",
-            "sabre/vobject": "~4.0",
-            "sabre/xml": "~1.0"
+            "sabre/uri": "^1.0.1",
+            "sabre/vobject": "^4.1.0",
+            "sabre/xml": "^1.4.0"
         },
         "require-dev": {
             "evert/phpdoc-md": "~0.1.0",
+            "monolog/monolog": "^1.18",
             "phpunit/phpunit": "> 4.8, <=6.0.0",
             "sabre/cs": "~0.0.5"
         },
@@ -371,7 +413,7 @@
             "ext-curl": "*",
             "ext-pdo": "*"
         },
-        "time": "2016-04-07 01:02:57",
+        "time": "2016-05-21 03:49:31",
         "bin": [
             "bin/sabredav",
             "bin/naturalselection"