[Pkg-owncloud-commits] [php-sabredav] 80/148: Fixed another Litmus test.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabredav.

commit dbd5f6607a2414673bf9f04dd51e164eff2845d1
Author: Evert Pot <me at evertpot.com>
Date:   Fri Mar 20 23:16:22 2015 -0400

    Fixed another Litmus test.
---
 lib/DAV/Locks/Plugin.php               | 1 -
 lib/DAV/Xml/Property/LockDiscovery.php | 7 ++++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/DAV/Locks/Plugin.php b/lib/DAV/Locks/Plugin.php
index 112c7cd..e1e16db 100644
--- a/lib/DAV/Locks/Plugin.php
+++ b/lib/DAV/Locks/Plugin.php
@@ -558,7 +558,6 @@ class Plugin extends DAV\ServerPlugin {
         $lockInfo = new LockInfo();
 
         $lockInfo->owner = $result->owner;
-
         $lockInfo->token = DAV\UUIDUtil::getUUID();
         $lockInfo->scope = $result->scope;
 
diff --git a/lib/DAV/Xml/Property/LockDiscovery.php b/lib/DAV/Xml/Property/LockDiscovery.php
index 8b716f5..f0b52aa 100644
--- a/lib/DAV/Xml/Property/LockDiscovery.php
+++ b/lib/DAV/Xml/Property/LockDiscovery.php
@@ -4,6 +4,7 @@ namespace Sabre\DAV\Xml\Property;
 
 use
     Sabre\DAV,
+    Sabre\DAV\Locks\LockInfo,
     Sabre\Xml\Element\XmlFragment,
     Sabre\Xml\Reader,
     Sabre\Xml\Writer,
@@ -27,7 +28,7 @@ class LockDiscovery implements XmlSerializable {
     /**
      * locks
      *
-     * @var \Sabre\DAV\Locks\LockInfo[]
+     * @var LockInfo[]
      */
     public $locks;
 
@@ -44,7 +45,7 @@ class LockDiscovery implements XmlSerializable {
     /**
      * __construct
      *
-     * @param \Sabre\DAV\Locks\LockInfo[] $locks
+     * @param LockInfo[] $locks
      */
     function __construct($locks) {
 
@@ -74,7 +75,7 @@ class LockDiscovery implements XmlSerializable {
             $writer->startElement('{DAV:}activelock');
 
             $writer->startElement('{DAV:}lockscope');
-            if ($lock->scope === 'shared') {
+            if ($lock->scope === LockInfo::SHARED) {
                 $writer->writeElement('{DAV:}shared');
             } else {
                 $writer->writeElement('{DAV:}exclusive');

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git