[Pkg-owncloud-commits] [php-sabredav] 07/148: XML to Xml
David Prévot
taffit at moszumanska.debian.org
Wed Apr 15 01:37:00 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository php-sabredav.
commit d9d120995b61ffd6c46e31dd6142284f097e534d
Author: Evert Pot <evert at rooftopsolutions.nl>
Date: Wed Dec 17 00:13:33 2014 -0500
XML to Xml
---
lib/DAV/Browser/Plugin.php | 6 +++---
lib/DAV/CorePlugin.php | 10 +++++-----
lib/DAV/Locks/Plugin.php | 4 ++--
lib/DAV/Server.php | 4 ++--
lib/DAV/TemporaryFileFilterPlugin.php | 4 ++--
lib/DAV/XMLUtil.php | 4 ++--
lib/DAV/{XML => Xml}/Element/Response.php | 8 ++++----
lib/DAV/{XML => Xml}/Property/GetLastModified.php | 8 ++++----
lib/DAV/{XML => Xml}/Property/Href.php | 8 ++++----
lib/DAV/{XML => Xml}/Property/LockDiscovery.php | 8 ++++----
lib/DAV/{XML => Xml}/Property/ResourceType.php | 8 ++++----
lib/DAV/{XML => Xml}/Property/SupportedLock.php | 8 ++++----
lib/DAV/{XML => Xml}/Property/SupportedMethodSet.php | 10 +++++-----
lib/DAV/{XML => Xml}/Property/SupportedReportSet.php | 10 +++++-----
lib/DAV/{XML => Xml}/Request/MkCol.php | 8 ++++----
lib/DAV/{XML => Xml}/Request/PropFind.php | 10 +++++-----
lib/DAV/{XML => Xml}/Request/PropPatch.php | 8 ++++----
lib/DAV/{XML => Xml}/Request/SyncCollectionReport.php | 10 +++++-----
lib/DAV/{XML => Xml}/Response/MultiStatus.php | 14 +++++++-------
19 files changed, 75 insertions(+), 75 deletions(-)
diff --git a/lib/DAV/Browser/Plugin.php b/lib/DAV/Browser/Plugin.php
index a4b0ca9..9ca4ec0 100644
--- a/lib/DAV/Browser/Plugin.php
+++ b/lib/DAV/Browser/Plugin.php
@@ -636,9 +636,9 @@ HTML;
$mapping = [
'Sabre\\DAV\\Property\\IHref' => 'href',
'Sabre\\DAV\\Property\\HrefList' => 'hreflist',
- 'Sabre\\DAV\\XML\\Property\\SupportedMethodSet' => 'valuelist',
- 'Sabre\\DAV\\XML\\Property\\ResourceType' => 'xmlvaluelist',
- 'Sabre\\DAV\\XML\\Property\\SupportedReportSet' => 'xmlvaluelist',
+ 'Sabre\\DAV\\Xml\\Property\\SupportedMethodSet' => 'valuelist',
+ 'Sabre\\DAV\\Xml\\Property\\ResourceType' => 'xmlvaluelist',
+ 'Sabre\\DAV\\Xml\\Property\\SupportedReportSet' => 'xmlvaluelist',
'Sabre\\DAVACL\\Property\\CurrentUserPrivilegeSet' => 'xmlvaluelist',
'Sabre\\DAVACL\\Property\\SupportedPrivilegeSet' => 'supported-privilege-set',
];
diff --git a/lib/DAV/CorePlugin.php b/lib/DAV/CorePlugin.php
index e3cf9ac..1fa69af 100644
--- a/lib/DAV/CorePlugin.php
+++ b/lib/DAV/CorePlugin.php
@@ -324,7 +324,7 @@ class CorePlugin extends ServerPlugin {
}
$propFindXml = $propFindXml['value'];
} else {
- $propFindXml = new XML\Request\PropFind();
+ $propFindXml = new Xml\Request\PropFind();
$propFindXml->allProp = true;
$propFindXml->properties = [];
}
@@ -785,7 +785,7 @@ class CorePlugin extends ServerPlugin {
$propFind->handle('{DAV:}getlastmodified', function() use ($node) {
$lm = $node->getLastModified();
if ($lm) {
- return new XML\Property\GetLastModified($lm);
+ return new Xml\Property\GetLastModified($lm);
}
});
@@ -814,13 +814,13 @@ class CorePlugin extends ServerPlugin {
foreach($this->server->getPlugins() as $plugin) {
$reports = array_merge($reports, $plugin->getSupportedReportSet($propFind->getPath()));
}
- return new XML\Property\SupportedReportSet($reports);
+ return new Xml\Property\SupportedReportSet($reports);
});
$propFind->handle('{DAV:}resourcetype', function() use ($node) {
- return new XML\Property\ResourceType($this->server->getResourceTypeForNode($node));
+ return new Xml\Property\ResourceType($this->server->getResourceTypeForNode($node));
});
$propFind->handle('{DAV:}supported-method-set', function() use ($propFind) {
- return new XML\Property\SupportedMethodSet(
+ return new Xml\Property\SupportedMethodSet(
$this->server->getAllowedMethods($propFind->getPath())
);
});
diff --git a/lib/DAV/Locks/Plugin.php b/lib/DAV/Locks/Plugin.php
index 69b2949..8e6f49b 100644
--- a/lib/DAV/Locks/Plugin.php
+++ b/lib/DAV/Locks/Plugin.php
@@ -92,10 +92,10 @@ class Plugin extends DAV\ServerPlugin {
function propFind(DAV\PropFind $propFind, DAV\INode $node) {
$propFind->handle('{DAV:}supportedlock', function() {
- return new DAV\XML\Property\SupportedLock(!!$this->locksBackend);
+ return new DAV\Xml\Property\SupportedLock(!!$this->locksBackend);
});
$propFind->handle('{DAV:}lockdiscovery', function() use ($propFind) {
- return new DAV\XML\Property\LockDiscovery(
+ return new DAV\Xml\Property\LockDiscovery(
$this->getLocks( $propFind->getPath() )
);
});
diff --git a/lib/DAV/Server.php b/lib/DAV/Server.php
index 28c6b2a..ab7c943 100644
--- a/lib/DAV/Server.php
+++ b/lib/DAV/Server.php
@@ -857,7 +857,7 @@ class Server extends EventEmitter {
$headers[$header] = $properties[$property];
// GetLastModified gets special cased
- } elseif ($properties[$property] instanceof XML\Property\GetLastModified) {
+ } elseif ($properties[$property] instanceof Xml\Property\GetLastModified) {
$headers[$header] = HTTP\Util::toHTTPDate($properties[$property]->getTime());
}
@@ -1651,7 +1651,7 @@ class Server extends EventEmitter {
if ($strip404s) {
unset($entry[404]);
}
- $response = new XML\Element\Response(
+ $response = new Xml\Element\Response(
'/' . ltrim($href,'/'),
$entry
);
diff --git a/lib/DAV/TemporaryFileFilterPlugin.php b/lib/DAV/TemporaryFileFilterPlugin.php
index 50e6709..ccf53b3 100644
--- a/lib/DAV/TemporaryFileFilterPlugin.php
+++ b/lib/DAV/TemporaryFileFilterPlugin.php
@@ -267,9 +267,9 @@ class TemporaryFileFilterPlugin extends ServerPlugin {
$properties = [
'href' => $request->getPath(),
200 => [
- '{DAV:}getlastmodified' => new XML\Property\GetLastModified(filemtime($tempLocation)),
+ '{DAV:}getlastmodified' => new Xml\Property\GetLastModified(filemtime($tempLocation)),
'{DAV:}getcontentlength' => filesize($tempLocation),
- '{DAV:}resourcetype' => new XML\Property\ResourceType(null),
+ '{DAV:}resourcetype' => new Xml\Property\ResourceType(null),
'{'.Server::NS_SABREDAV.'}tempFile' => true,
],
diff --git a/lib/DAV/XMLUtil.php b/lib/DAV/XMLUtil.php
index 3d4c212..af8b373 100644
--- a/lib/DAV/XMLUtil.php
+++ b/lib/DAV/XMLUtil.php
@@ -1,7 +1,7 @@
<?php
namespace Sabre\DAV;
-use Sabre\XML;
+use Sabre\Xml;
/**
* XML utilities for WebDAV
@@ -16,7 +16,7 @@ class XMLUtil {
* This is a list of XML elements that we automatically map to PHP classes.
*
* For instance, this list may contain an entry `{DAV:}propfind` that would
- * be mapped to Sabre\DAV\XML\Request\PropFind
+ * be mapped to Sabre\DAV\Xml\Request\PropFind
*/
public $elementMap = [
'{DAV:}multistatus' => 'Sabre\\DAV\\Xml\\Response\\MultiStatus',
diff --git a/lib/DAV/XML/Element/Response.php b/lib/DAV/Xml/Element/Response.php
similarity index 98%
rename from lib/DAV/XML/Element/Response.php
rename to lib/DAV/Xml/Element/Response.php
index 58a3d98..c4f4e19 100644
--- a/lib/DAV/XML/Element/Response.php
+++ b/lib/DAV/Xml/Element/Response.php
@@ -1,11 +1,11 @@
<?php
-namespace Sabre\DAV\XML\Element;
+namespace Sabre\DAV\Xml\Element;
use
- Sabre\XML\Element,
- Sabre\XML\Reader,
- Sabre\XML\Writer,
+ Sabre\Xml\Element,
+ Sabre\Xml\Reader,
+ Sabre\Xml\Writer,
Sabre\DAV\Exception\CannotSerialize;
/**
diff --git a/lib/DAV/XML/Property/GetLastModified.php b/lib/DAV/Xml/Property/GetLastModified.php
similarity index 96%
rename from lib/DAV/XML/Property/GetLastModified.php
rename to lib/DAV/Xml/Property/GetLastModified.php
index 1388cf0..4bc9ff5 100644
--- a/lib/DAV/XML/Property/GetLastModified.php
+++ b/lib/DAV/Xml/Property/GetLastModified.php
@@ -1,11 +1,11 @@
<?php
-namespace Sabre\DAV\XML\Property;
+namespace Sabre\DAV\Xml\Property;
use
- Sabre\XML\Element,
- Sabre\XML\Reader,
- Sabre\XML\Writer,
+ Sabre\Xml\Element,
+ Sabre\Xml\Reader,
+ Sabre\Xml\Writer,
Sabre\HTTP;
/**
diff --git a/lib/DAV/XML/Property/Href.php b/lib/DAV/Xml/Property/Href.php
similarity index 97%
rename from lib/DAV/XML/Property/Href.php
rename to lib/DAV/Xml/Property/Href.php
index 9ce2e50..b1e0fad 100644
--- a/lib/DAV/XML/Property/Href.php
+++ b/lib/DAV/Xml/Property/Href.php
@@ -1,11 +1,11 @@
<?php
-namespace Sabre\DAV\XML\Property;
+namespace Sabre\DAV\Xml\Property;
use
- Sabre\XML\Element,
- Sabre\XML\Reader,
- Sabre\XML\Writer;
+ Sabre\Xml\Element,
+ Sabre\Xml\Reader,
+ Sabre\Xml\Writer;
/**
* Href property
diff --git a/lib/DAV/XML/Property/LockDiscovery.php b/lib/DAV/Xml/Property/LockDiscovery.php
similarity index 97%
rename from lib/DAV/XML/Property/LockDiscovery.php
rename to lib/DAV/Xml/Property/LockDiscovery.php
index e693cb6..4e92eed 100644
--- a/lib/DAV/XML/Property/LockDiscovery.php
+++ b/lib/DAV/Xml/Property/LockDiscovery.php
@@ -1,12 +1,12 @@
<?php
-namespace Sabre\DAV\XML\Property;
+namespace Sabre\DAV\Xml\Property;
use
Sabre\DAV,
- Sabre\XML\Element,
- Sabre\XML\Reader,
- Sabre\XML\Writer;
+ Sabre\Xml\Element,
+ Sabre\Xml\Reader,
+ Sabre\Xml\Writer;
/**
* Represents {DAV:}lockdiscovery property.
diff --git a/lib/DAV/XML/Property/ResourceType.php b/lib/DAV/Xml/Property/ResourceType.php
similarity index 96%
rename from lib/DAV/XML/Property/ResourceType.php
rename to lib/DAV/Xml/Property/ResourceType.php
index 51e8fff..bf12df7 100644
--- a/lib/DAV/XML/Property/ResourceType.php
+++ b/lib/DAV/Xml/Property/ResourceType.php
@@ -1,11 +1,11 @@
<?php
-namespace Sabre\DAV\XML\Property;
+namespace Sabre\DAV\Xml\Property;
use
- Sabre\XML\Element,
- Sabre\XML\Reader,
- Sabre\XML\Writer,
+ Sabre\Xml\Element,
+ Sabre\Xml\Reader,
+ Sabre\Xml\Writer,
Sabre\DAV\Exception\CannotSerialize;
/**
diff --git a/lib/DAV/XML/Property/SupportedLock.php b/lib/DAV/Xml/Property/SupportedLock.php
similarity index 96%
rename from lib/DAV/XML/Property/SupportedLock.php
rename to lib/DAV/Xml/Property/SupportedLock.php
index ffa8d20..979442c 100644
--- a/lib/DAV/XML/Property/SupportedLock.php
+++ b/lib/DAV/Xml/Property/SupportedLock.php
@@ -1,12 +1,12 @@
<?php
-namespace Sabre\DAV\XML\Property;
+namespace Sabre\DAV\Xml\Property;
use
Sabre\DAV,
- Sabre\XML\Element,
- Sabre\XML\Reader,
- Sabre\XML\Writer;
+ Sabre\Xml\Element,
+ Sabre\Xml\Reader,
+ Sabre\Xml\Writer;
/**
* This class represents the {DAV:}supportedlock property.
diff --git a/lib/DAV/XML/Property/SupportedMethodSet.php b/lib/DAV/Xml/Property/SupportedMethodSet.php
similarity index 95%
rename from lib/DAV/XML/Property/SupportedMethodSet.php
rename to lib/DAV/Xml/Property/SupportedMethodSet.php
index 70340e2..732dbd1 100644
--- a/lib/DAV/XML/Property/SupportedMethodSet.php
+++ b/lib/DAV/Xml/Property/SupportedMethodSet.php
@@ -1,13 +1,13 @@
<?php
-namespace Sabre\DAV\XML\Property;
+namespace Sabre\DAV\Xml\Property;
use
Sabre\DAV,
- Sabre\XML\Element,
- Sabre\XML\Reader,
- Sabre\XML\Writer,
- Sabre\XML\Element\Elements;
+ Sabre\Xml\Element,
+ Sabre\Xml\Reader,
+ Sabre\Xml\Writer,
+ Sabre\Xml\Element\Elements;
/**
* supported-method-set property.
diff --git a/lib/DAV/XML/Property/SupportedReportSet.php b/lib/DAV/Xml/Property/SupportedReportSet.php
similarity index 96%
rename from lib/DAV/XML/Property/SupportedReportSet.php
rename to lib/DAV/Xml/Property/SupportedReportSet.php
index 1a0c2c6..2e7adc0 100644
--- a/lib/DAV/XML/Property/SupportedReportSet.php
+++ b/lib/DAV/Xml/Property/SupportedReportSet.php
@@ -1,13 +1,13 @@
<?php
-namespace Sabre\DAV\XML\Property;
+namespace Sabre\DAV\Xml\Property;
use
Sabre\DAV,
- Sabre\XML\Element,
- Sabre\XML\Reader,
- Sabre\XML\Writer,
- Sabre\XML\Element\Elements;
+ Sabre\Xml\Element,
+ Sabre\Xml\Reader,
+ Sabre\Xml\Writer,
+ Sabre\Xml\Element\Elements;
/**
* supported-report-set property.
diff --git a/lib/DAV/XML/Request/MkCol.php b/lib/DAV/Xml/Request/MkCol.php
similarity index 96%
rename from lib/DAV/XML/Request/MkCol.php
rename to lib/DAV/Xml/Request/MkCol.php
index a664c99..d8d52652 100644
--- a/lib/DAV/XML/Request/MkCol.php
+++ b/lib/DAV/Xml/Request/MkCol.php
@@ -1,11 +1,11 @@
<?php
-namespace Sabre\DAV\XML\Request;
+namespace Sabre\DAV\Xml\Request;
use
- Sabre\XML\Element,
- Sabre\XML\Reader,
- Sabre\XML\Writer,
+ Sabre\Xml\Element,
+ Sabre\Xml\Reader,
+ Sabre\Xml\Writer,
Sabre\DAV\Exception\CannotSerialize;
/**
diff --git a/lib/DAV/XML/Request/PropFind.php b/lib/DAV/Xml/Request/PropFind.php
similarity index 95%
rename from lib/DAV/XML/Request/PropFind.php
rename to lib/DAV/Xml/Request/PropFind.php
index 87b5ec6..d9a1681 100644
--- a/lib/DAV/XML/Request/PropFind.php
+++ b/lib/DAV/Xml/Request/PropFind.php
@@ -1,12 +1,12 @@
<?php
-namespace Sabre\DAV\XML\Request;
+namespace Sabre\DAV\Xml\Request;
use
- Sabre\XML\Element,
- Sabre\XML\Element\Elements,
- Sabre\XML\Reader,
- Sabre\XML\Writer,
+ Sabre\Xml\Element,
+ Sabre\Xml\Element\Elements,
+ Sabre\Xml\Reader,
+ Sabre\Xml\Writer,
Sabre\DAV\Exception\CannotSerialize;
/**
diff --git a/lib/DAV/XML/Request/PropPatch.php b/lib/DAV/Xml/Request/PropPatch.php
similarity index 96%
rename from lib/DAV/XML/Request/PropPatch.php
rename to lib/DAV/Xml/Request/PropPatch.php
index 48930e1..2e3dfc7 100644
--- a/lib/DAV/XML/Request/PropPatch.php
+++ b/lib/DAV/Xml/Request/PropPatch.php
@@ -1,11 +1,11 @@
<?php
-namespace Sabre\DAV\XML\Request;
+namespace Sabre\DAV\Xml\Request;
use
- Sabre\XML\Element,
- Sabre\XML\Reader,
- Sabre\XML\Writer,
+ Sabre\Xml\Element,
+ Sabre\Xml\Reader,
+ Sabre\Xml\Writer,
Sabre\DAV\Exception\CannotSerialize;
/**
diff --git a/lib/DAV/XML/Request/SyncCollectionReport.php b/lib/DAV/Xml/Request/SyncCollectionReport.php
similarity index 96%
rename from lib/DAV/XML/Request/SyncCollectionReport.php
rename to lib/DAV/Xml/Request/SyncCollectionReport.php
index f66970b..3d167e2 100644
--- a/lib/DAV/XML/Request/SyncCollectionReport.php
+++ b/lib/DAV/Xml/Request/SyncCollectionReport.php
@@ -1,12 +1,12 @@
<?php
-namespace Sabre\DAV\XML\Request;
+namespace Sabre\DAV\Xml\Request;
use
- Sabre\XML\Element,
- Sabre\XML\Reader,
- Sabre\XML\Writer,
- Sabre\XML\Element\KeyValue,
+ Sabre\Xml\Element,
+ Sabre\Xml\Reader,
+ Sabre\Xml\Writer,
+ Sabre\Xml\Element\KeyValue,
Sabre\DAV\Exception\CannotSerialize,
Sabre\DAV\Exception\BadRequest;
diff --git a/lib/DAV/XML/Response/MultiStatus.php b/lib/DAV/Xml/Response/MultiStatus.php
similarity index 93%
rename from lib/DAV/XML/Response/MultiStatus.php
rename to lib/DAV/Xml/Response/MultiStatus.php
index 54dd1f1..bba5784 100644
--- a/lib/DAV/XML/Response/MultiStatus.php
+++ b/lib/DAV/Xml/Response/MultiStatus.php
@@ -1,11 +1,11 @@
<?php
-namespace Sabre\DAV\XML\Response;
+namespace Sabre\DAV\Xml\Response;
use
- Sabre\XML\Element,
- Sabre\XML\Reader,
- Sabre\XML\Writer,
+ Sabre\Xml\Element,
+ Sabre\Xml\Reader,
+ Sabre\Xml\Writer,
Sabre\DAV\Exception\CannotSerialize;
/**
@@ -26,7 +26,7 @@ class MultiStatus implements Element {
/**
* The responses
*
- * @var \Sabre\DAV\XML\Element\Response[]
+ * @var \Sabre\DAV\Xml\Element\Response[]
*/
protected $responses;
@@ -40,7 +40,7 @@ class MultiStatus implements Element {
/**
* Constructor
*
- * @param \Sabre\DAV\XML\Element\Response[] $responses
+ * @param \Sabre\DAV\Xml\Element\Response[] $responses
*/
public function __construct(array $responses, $syncToken = null) {
@@ -52,7 +52,7 @@ class MultiStatus implements Element {
/**
* Returns the response list.
*
- * @return \Sabre\DAV\XML\Element\Response[]
+ * @return \Sabre\DAV\Xml\Element\Response[]
*/
public function getResponses() {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git
More information about the Pkg-owncloud-commits
mailing list