From 745515b11f438d3658203aaaaf151c72e30d5e7c Mon Sep 17 00:00:00 2001
From: Klaus Weidenbach <Klaus.Weidenbach@gmx.net>
Date: Mon, 17 Oct 2016 23:26:48 +0200
Subject: [FEATURE] Add config and use composer autoloader.

We use composer already to install SabreDAV. Include config
composer.(json|lock) to install and manage more dependencies
in future.
Also provide PSR-4 autoloading for our namespaced classes, e.g.
"Zotlabs\". To regenerate autoloader maps use:
$ composer install --optimize-autoloader --no-dev

We could also remove the whole vendor/ folder from our repository, but
that would need changes in deployment and how to install hubs and needs
more discussion first.
---
 vendor/sabre/dav/composer.json              | 68 +++++++++++++++++++++++++++++
 vendor/sabre/dav/lib/DAV/Browser/Plugin.php |  6 +--
 2 files changed, 71 insertions(+), 3 deletions(-)
 create mode 100644 vendor/sabre/dav/composer.json

(limited to 'vendor/sabre/dav')

diff --git a/vendor/sabre/dav/composer.json b/vendor/sabre/dav/composer.json
new file mode 100644
index 000000000..f85d9655e
--- /dev/null
+++ b/vendor/sabre/dav/composer.json
@@ -0,0 +1,68 @@
+{
+    "name": "sabre/dav",
+    "type": "library",
+    "description": "WebDAV Framework for PHP",
+    "keywords": ["Framework", "WebDAV", "CalDAV", "CardDAV", "iCalendar"],
+    "homepage": "http://sabre.io/",
+    "license" : "BSD-3-Clause",
+    "authors": [
+        {
+            "name": "Evert Pot",
+            "email": "me@evertpot.com",
+            "homepage" : "http://evertpot.com/",
+            "role" : "Developer"
+        }
+    ],
+    "require": {
+        "php": ">=5.5.0",
+        "sabre/vobject": "^4.1.0",
+        "sabre/event" : ">=2.0.0, <4.0.0",
+        "sabre/xml"  : "^1.4.0",
+        "sabre/http" : "^4.2.1",
+        "sabre/uri" : "^1.0.1",
+        "ext-dom": "*",
+        "ext-pcre": "*",
+        "ext-spl": "*",
+        "ext-simplexml": "*",
+        "ext-mbstring" : "*",
+        "ext-ctype" : "*",
+        "ext-date" : "*",
+        "ext-iconv" : "*",
+        "lib-libxml" : ">=2.7.0",
+        "psr/log": "^1.0"
+    },
+    "require-dev" : {
+        "phpunit/phpunit" : "> 4.8, <=6.0.0",
+        "evert/phpdoc-md" : "~0.1.0",
+        "sabre/cs"        : "~0.0.5",
+        "monolog/monolog": "^1.18"
+    },
+    "suggest" : {
+        "ext-curl" : "*",
+        "ext-pdo" : "*"
+    },
+    "autoload": {
+        "psr-4" : {
+            "Sabre\\DAV\\"     : "lib/DAV/",
+            "Sabre\\DAVACL\\"  : "lib/DAVACL/",
+            "Sabre\\CalDAV\\"  : "lib/CalDAV/",
+            "Sabre\\CardDAV\\" : "lib/CardDAV/"
+        }
+    },
+    "support" : {
+        "forum" : "https://groups.google.com/group/sabredav-discuss",
+        "source" : "https://github.com/fruux/sabre-dav"
+    },
+    "bin" : [
+        "bin/sabredav",
+        "bin/naturalselection"
+    ],
+    "config" : {
+        "bin-dir" : "./bin"
+    },
+    "extra" : {
+        "branch-alias": {
+            "dev-master": "3.1.0-dev"
+        }
+    }
+}
diff --git a/vendor/sabre/dav/lib/DAV/Browser/Plugin.php b/vendor/sabre/dav/lib/DAV/Browser/Plugin.php
index 4959193ea..49359a045 100644
--- a/vendor/sabre/dav/lib/DAV/Browser/Plugin.php
+++ b/vendor/sabre/dav/lib/DAV/Browser/Plugin.php
@@ -163,7 +163,7 @@ class Plugin extends DAV\ServerPlugin {
      * @return bool
      */
     function httpPOST(RequestInterface $request, ResponseInterface $response) {
-			
+
         $contentType = $request->getHeader('Content-Type');
         list($contentType) = explode(';', $contentType);
         if ($contentType !== 'application/x-www-form-urlencoded' &&
@@ -179,7 +179,7 @@ class Plugin extends DAV\ServerPlugin {
 
         if ($this->server->emit('onBrowserPostAction', [$uri, $postVars['sabreAction'], $postVars])) {
 
-					switch ($postVars['sabreAction']) {
+            switch ($postVars['sabreAction']) {
 
                 case 'mkcol' :
                     if (isset($postVars['name']) && trim($postVars['name'])) {
@@ -221,7 +221,7 @@ class Plugin extends DAV\ServerPlugin {
 
                     if ($_FILES) $file = current($_FILES);
                     else break;
-										
+
                     list(, $newName) = URLUtil::splitPath(trim($file['name']));
                     if (isset($postVars['name']) && trim($postVars['name']))
                         $newName = trim($postVars['name']);
-- 
cgit v1.2.3