Revert "Update SabreDAV to 1.7.1"

This reverts commit 183cc22501b75ab8819971f70b88dbc010026ac1.

1 files changed, 13 insertions, 15 deletions

diff --git a/3rdparty/Sabre/CalDAV/CalendarQueryValidator.php b/3rdparty/Sabre/CalDAV/CalendarQueryValidator.php
index 53e86fc509f..8f674840e87 100755
--- a/3rdparty/Sabre/CalDAV/CalendarQueryValidator.php
+++ b/3rdparty/Sabre/CalDAV/CalendarQueryValidator.php
@@ -1,7 +1,5 @@
 <?php
 
-use Sabre\VObject;
-
 /**
  * CalendarQuery Validator
  *
@@ -24,11 +22,11 @@ class Sabre_CalDAV_CalendarQueryValidator {
      *
      * The list of filters must be formatted as parsed by Sabre_CalDAV_CalendarQueryParser
      *
-     * @param VObject\Component $vObject
+     * @param Sabre_VObject_Component $vObject
      * @param array $filters
      * @return bool
      */
-    public function validate(VObject\Component $vObject,array $filters) {
+    public function validate(Sabre_VObject_Component $vObject,array $filters) {
 
         // The top level object is always a component filter.
         // We'll parse it manually, as it's pretty simple.
@@ -50,11 +48,11 @@ class Sabre_CalDAV_CalendarQueryValidator {
      * component we're checking should be specified, not the component to check
      * itself.
      *
-     * @param VObject\Component $parent
+     * @param Sabre_VObject_Component $parent
      * @param array $filters
      * @return bool
      */
-    protected function validateCompFilters(VObject\Component $parent, array $filters) {
+    protected function validateCompFilters(Sabre_VObject_Component $parent, array $filters) {
 
         foreach($filters as $filter) {
 
@@ -119,11 +117,11 @@ class Sabre_CalDAV_CalendarQueryValidator {
      * property we're checking should be specified, not the property to check
      * itself.
      *
-     * @param VObject\Component $parent
+     * @param Sabre_VObject_Component $parent
      * @param array $filters
      * @return bool
      */
-    protected function validatePropFilters(VObject\Component $parent, array $filters) {
+    protected function validatePropFilters(Sabre_VObject_Component $parent, array $filters) {
 
         foreach($filters as $filter) {
 
@@ -189,11 +187,11 @@ class Sabre_CalDAV_CalendarQueryValidator {
      * parameter we're checking should be specified, not the parameter to check
      * itself.
      *
-     * @param VObject\Property $parent
+     * @param Sabre_VObject_Property $parent
      * @param array $filters
      * @return bool
      */
-    protected function validateParamFilters(VObject\Property $parent, array $filters) {
+    protected function validateParamFilters(Sabre_VObject_Property $parent, array $filters) {
 
         foreach($filters as $filter) {
 
@@ -245,11 +243,11 @@ class Sabre_CalDAV_CalendarQueryValidator {
      * A single text-match should be specified as well as the specific property
      * or parameter we need to validate.
      *
-     * @param VObject\Node $parent
+     * @param Sabre_VObject_Node $parent
      * @param array $textMatch
      * @return bool
      */
-    protected function validateTextMatch(VObject\Node $parent, array $textMatch) {
+    protected function validateTextMatch(Sabre_VObject_Node $parent, array $textMatch) {
 
         $value = (string)$parent;
 
@@ -265,12 +263,12 @@ class Sabre_CalDAV_CalendarQueryValidator {
      * This is all based on the rules specified in rfc4791, which are quite
      * complex.
      *
-     * @param VObject\Node $component
+     * @param Sabre_VObject_Node $component
      * @param DateTime $start
      * @param DateTime $end
      * @return bool
      */
-    protected function validateTimeRange(VObject\Node $component, $start, $end) {
+    protected function validateTimeRange(Sabre_VObject_Node $component, $start, $end) {
 
         if (is_null($start)) {
             $start = new DateTime('1900-01-01');
@@ -298,7 +296,7 @@ class Sabre_CalDAV_CalendarQueryValidator {
                 if ($component->parent->name === 'VEVENT' && $component->parent->RRULE) {
 
                     // Fire up the iterator!
-                    $it = new VObject\RecurrenceIterator($component->parent->parent, (string)$component->parent->UID);
+                    $it = new Sabre_VObject_RecurrenceIterator($component->parent->parent, (string)$component->parent->UID);
                     while($it->valid()) {
                         $expandedEvent = $it->getEventObject();