Merge branch 'master' of https://github.com/spopp8/horde into spopp8-…

…master
horde · Nov 16, 2015 · ae17a54 · ae17a54
2 parents 0f26812 + a929ee5
commit ae17a54
Show file tree

Hide file tree

Showing 366 changed files with 33,991 additions and 14,950 deletions.
diff --git a/framework/Dav/bundle/composer.json b/framework/Dav/bundle/composer.json
@@ -1,5 +1,5 @@
 {
     "require": {
-        "sabre/dav": "~1.8"
+        "sabre/dav": "~2.1"
     }
 }
diff --git a/framework/Dav/bundle/composer.lock b/framework/Dav/bundle/composer.lock
diff --git a/framework/Dav/bundle/vendor/sabre/dav/LICENSE b/framework/Dav/bundle/vendor/sabre/dav/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+Copyright (C) 2007-2015 fruux GmbH (https://fruux.com/).
 
 All rights reserved.
 

diff --git a/framework/Dav/bundle/vendor/sabre/dav/composer.json b/framework/Dav/bundle/vendor/sabre/dav/composer.json
@@ -3,7 +3,7 @@
     "type": "library",
     "description": "WebDAV Framework for PHP",
     "keywords": ["Framework", "WebDAV", "CalDAV", "CardDAV", "iCalendar"],
-    "homepage": "http://code.google.com/p/sabredav/",
+    "homepage": "http://sabre.io/",
     "license" : "BSD-3-Clause",
     "authors": [
         {
@@ -14,8 +14,10 @@
         }
     ],
     "require": {
-        "php": ">=5.3.1",
-        "sabre/vobject" : "~2.1.0",
+        "php": ">=5.4.1",
+        "sabre/vobject": "~3.3",
+        "sabre/event" : "~2.0.0",
+        "sabre/http" : "~3.0.0",
         "ext-dom": "*",
         "ext-pcre": "*",
         "ext-spl": "*",
@@ -27,32 +29,29 @@
         "ext-libxml" : "*"
     },
     "require-dev" : {
-        "phpunit/phpunit" : "~4.0.0",
-        "evert/phpdoc-md" : "~0.0.7"
-    },
-    "provide" : {
-        "evert/sabredav" : "1.7.*"
+        "phpunit/phpunit" : "~4.2",
+        "evert/phpdoc-md" : "~0.1.0",
+        "squizlabs/php_codesniffer": "~1.5.3"
     },
     "suggest" : {
-        "ext-apc" : "*",
         "ext-curl" : "*",
         "ext-pdo" : "*"
     },
     "autoload": {
-        "psr-0" : {
-            "Sabre\\DAV"     : "lib/",
-            "Sabre\\HTTP"    : "lib/",
-            "Sabre\\DAVACL"  : "lib/",
-            "Sabre\\CalDAV"  : "lib/",
-            "Sabre\\CardDAV" : "lib/"
+        "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/evert/sabredav"
+        "source" : "https://github.com/fruux/sabre-dav"
     },
     "bin" : [
-        "bin/sabredav"
+        "bin/sabredav",
+        "bin/naturalselection"
     ],
     "config" : {
         "bin-dir" : "./bin"