[Pkg-owncloud-commits] [php-sabredav] 05/148: Upgraded to sabre/xml 0.2.0
David Prévot
taffit at moszumanska.debian.org
Wed Apr 15 01:36:59 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 df25f3333bf5966c29a0b7833cb2d7710cce5c5e
Author: Evert Pot <me at evertpot.com>
Date: Tue Dec 9 14:06:31 2014 -0500
Upgraded to sabre/xml 0.2.0
---
composer.json | 2 +-
lib/DAV/XML/Element/Response.php | 4 ++--
lib/DAV/XML/Property/GetLastModified.php | 4 ++--
lib/DAV/XML/Property/Href.php | 4 ++--
lib/DAV/XML/Property/LockDiscovery.php | 4 ++--
lib/DAV/XML/Property/ResourceType.php | 2 +-
lib/DAV/XML/Property/SupportedLock.php | 4 ++--
lib/DAV/XML/Property/SupportedMethodSet.php | 4 ++--
lib/DAV/XML/Property/SupportedReportSet.php | 4 ++--
lib/DAV/XML/Request/MkCol.php | 4 ++--
lib/DAV/XML/Request/PropFind.php | 6 +++---
lib/DAV/XML/Request/PropPatch.php | 4 ++--
lib/DAV/XML/Request/SyncCollectionReport.php | 4 ++--
lib/DAV/XML/Response/MultiStatus.php | 4 ++--
14 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/composer.json b/composer.json
index 9def71f..da9888b 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
"sabre/vobject": "~3.3.4",
"sabre/event" : "~2.0.0",
"sabre/http" : "~3.0.4",
- "sabre/xml" : "dev-master",
+ "sabre/xml" : "~0.2.0",
"ext-dom": "*",
"ext-pcre": "*",
"ext-spl": "*",
diff --git a/lib/DAV/XML/Element/Response.php b/lib/DAV/XML/Element/Response.php
index b3bd9bf..58a3d98 100644
--- a/lib/DAV/XML/Element/Response.php
+++ b/lib/DAV/XML/Element/Response.php
@@ -119,7 +119,7 @@ class Response implements Element {
* @param Writer $writer
* @return void
*/
- public function serializeXml(Writer $writer) {
+ public function xmlSerialize(Writer $writer) {
if ($status = $this->getHTTPStatus()) {
$writer->writeElement('{DAV:}status', 'HTTP/1.1 ' . $status . ' ' . \Sabre\HTTP\Response::$statusCodes[$status]);
@@ -161,7 +161,7 @@ class Response implements Element {
* @param Reader $reader
* @return mixed
*/
- static public function deserializeXml(Reader $reader) {
+ static public function xmlDeserialize(Reader $reader) {
$elems = $reader->parseInnerTree();
diff --git a/lib/DAV/XML/Property/GetLastModified.php b/lib/DAV/XML/Property/GetLastModified.php
index 209e751..1388cf0 100644
--- a/lib/DAV/XML/Property/GetLastModified.php
+++ b/lib/DAV/XML/Property/GetLastModified.php
@@ -79,7 +79,7 @@ class GetLastModified implements Element {
* @param Writer $writer
* @return void
*/
- public function serializeXml(Writer $writer) {
+ public function xmlSerialize(Writer $writer) {
$writer->write(
HTTP\Util::toHTTPDate($this->time)
@@ -108,7 +108,7 @@ class GetLastModified implements Element {
* @param Reader $reader
* @return mixed
*/
- static public function deserializeXml(Reader $reader) {
+ static public function xmlDeserialize(Reader $reader) {
return
new self($reader->parseInnerTree());
diff --git a/lib/DAV/XML/Property/Href.php b/lib/DAV/XML/Property/Href.php
index 529e106..e7776b6 100644
--- a/lib/DAV/XML/Property/Href.php
+++ b/lib/DAV/XML/Property/Href.php
@@ -85,7 +85,7 @@ class Href implements Element {
* @param Writer $writer
* @return void
*/
- public function serializeXml(Writer $writer) {
+ public function xmlSerialize(Writer $writer) {
foreach($this->getHrefs() as $href) {
if ($this->autoPrefix) {
@@ -117,7 +117,7 @@ class Href implements Element {
* @param Reader $reader
* @return mixed
*/
- static public function deserializeXml(Reader $reader) {
+ static public function xmlDeserialize(Reader $reader) {
$hrefs = [];
foreach($reader->parseInnerTree() as $elem) {
diff --git a/lib/DAV/XML/Property/LockDiscovery.php b/lib/DAV/XML/Property/LockDiscovery.php
index bd8f5f7..e693cb6 100644
--- a/lib/DAV/XML/Property/LockDiscovery.php
+++ b/lib/DAV/XML/Property/LockDiscovery.php
@@ -74,7 +74,7 @@ class LockDiscovery implements Element {
* @param Writer $writer
* @return void
*/
- public function serializeXml(Writer $writer) {
+ public function xmlSerialize(Writer $writer) {
foreach($this->locks as $lock) {
@@ -136,7 +136,7 @@ class LockDiscovery implements Element {
* @param Reader $reader
* @return mixed
*/
- static public function deserializeXml(Reader $reader) {
+ static public function xmlDeserialize(Reader $reader) {
throw new CannotDeserialize('This element does not have a deserializer');
diff --git a/lib/DAV/XML/Property/ResourceType.php b/lib/DAV/XML/Property/ResourceType.php
index 0ec6847..51e8fff 100644
--- a/lib/DAV/XML/Property/ResourceType.php
+++ b/lib/DAV/XML/Property/ResourceType.php
@@ -102,7 +102,7 @@ class ResourceType extends Element\Elements {
* @param Reader $reader
* @return mixed
*/
- static public function deserializeXml(Reader $reader) {
+ static public function xmlDeserialize(Reader $reader) {
return
new self(parent::deserializeXml($reader));
diff --git a/lib/DAV/XML/Property/SupportedLock.php b/lib/DAV/XML/Property/SupportedLock.php
index b668d0d..ffa8d20 100644
--- a/lib/DAV/XML/Property/SupportedLock.php
+++ b/lib/DAV/XML/Property/SupportedLock.php
@@ -56,7 +56,7 @@ class SupportedLock implements Element {
* @param Writer $writer
* @return void
*/
- public function serializeXml(Writer $writer) {
+ public function xmlSerialize(Writer $writer) {
if (!$this->supportsLocks) return null;
@@ -92,7 +92,7 @@ class SupportedLock implements Element {
* @param Reader $reader
* @return mixed
*/
- static public function deserializeXml(Reader $reader) {
+ static public function xmlDeserialize(Reader $reader) {
throw new CannotDeserialize('This element does not have a deserializer');
diff --git a/lib/DAV/XML/Property/SupportedMethodSet.php b/lib/DAV/XML/Property/SupportedMethodSet.php
index d64df47..70340e2 100644
--- a/lib/DAV/XML/Property/SupportedMethodSet.php
+++ b/lib/DAV/XML/Property/SupportedMethodSet.php
@@ -88,7 +88,7 @@ class SupportedMethodSet implements Element {
* @param Writer $writer
* @return void
*/
- function serializeXml(Writer $writer) {
+ function xmlSerialize(Writer $writer) {
foreach($this->getValue() as $val) {
$writer->startElement('{DAV:}supported-method');
@@ -119,7 +119,7 @@ class SupportedMethodSet implements Element {
* @param Reader $reader
* @return mixed
*/
- static function deserializeXml(Reader $reader) {
+ static function xmlDeserialize(Reader $reader) {
throw new CannotDeserialize('This element does not have a deserializer');
diff --git a/lib/DAV/XML/Property/SupportedReportSet.php b/lib/DAV/XML/Property/SupportedReportSet.php
index 053452d..1a0c2c6 100644
--- a/lib/DAV/XML/Property/SupportedReportSet.php
+++ b/lib/DAV/XML/Property/SupportedReportSet.php
@@ -113,7 +113,7 @@ class SupportedReportSet implements Element {
* @param Writer $writer
* @return void
*/
- public function serializeXml(Writer $writer) {
+ public function xmlSerialize(Writer $writer) {
foreach($this->getValue() as $val) {
$writer->startElement('{DAV:}supported-report');
@@ -146,7 +146,7 @@ class SupportedReportSet implements Element {
* @param Reader $reader
* @return mixed
*/
- static public function deserializeXml(Reader $reader) {
+ static public function xmlDeserialize(Reader $reader) {
throw new CannotDeserialize('This element does not have a deserializer');
diff --git a/lib/DAV/XML/Request/MkCol.php b/lib/DAV/XML/Request/MkCol.php
index eb86c7d..a664c99 100644
--- a/lib/DAV/XML/Request/MkCol.php
+++ b/lib/DAV/XML/Request/MkCol.php
@@ -43,7 +43,7 @@ class MkCol implements Element {
* @param Writer $writer
* @return void
*/
- public function serializeXml(Writer $writer) {
+ public function xmlSerialize(Writer $writer) {
throw new CannotSerialize('This element cannot be serialized.');
@@ -70,7 +70,7 @@ class MkCol implements Element {
* @param Reader $reader
* @return mixed
*/
- static public function deserializeXml(Reader $reader) {
+ static public function xmlDeserialize(Reader $reader) {
$self = new self();
diff --git a/lib/DAV/XML/Request/PropFind.php b/lib/DAV/XML/Request/PropFind.php
index 2c7d85c..87b5ec6 100644
--- a/lib/DAV/XML/Request/PropFind.php
+++ b/lib/DAV/XML/Request/PropFind.php
@@ -51,7 +51,7 @@ class PropFind implements Element {
* @param Writer $writer
* @return void
*/
- public function serializeXml(Writer $writer) {
+ public function xmlSerialize(Writer $writer) {
throw new CannotSerialize('This element cannot be serialized.');
@@ -78,7 +78,7 @@ class PropFind implements Element {
* @param Reader $reader
* @return mixed
*/
- static public function deserializeXml(Reader $reader) {
+ static public function xmlDeserialize(Reader $reader) {
$self = new self();
@@ -95,7 +95,7 @@ class PropFind implements Element {
$self->allProp = true;
break;
case '{DAV:}prop' :
- $self->properties = Elements::deserializeXml($reader);
+ $self->properties = Elements::xmlDeserialize($reader);
break;
}
$reader->next();
diff --git a/lib/DAV/XML/Request/PropPatch.php b/lib/DAV/XML/Request/PropPatch.php
index 9776c1f..48930e1 100644
--- a/lib/DAV/XML/Request/PropPatch.php
+++ b/lib/DAV/XML/Request/PropPatch.php
@@ -45,7 +45,7 @@ class PropPatch implements Element {
* @param Writer $writer
* @return void
*/
- public function serializeXml(Writer $writer) {
+ public function xmlSerialize(Writer $writer) {
throw new CannotSerialize('This element cannot be serialized.');
@@ -72,7 +72,7 @@ class PropPatch implements Element {
* @param Reader $reader
* @return mixed
*/
- static public function deserializeXml(Reader $reader) {
+ static public function xmlDeserialize(Reader $reader) {
$self = new self();
diff --git a/lib/DAV/XML/Request/SyncCollectionReport.php b/lib/DAV/XML/Request/SyncCollectionReport.php
index e07f1f8..f66970b 100644
--- a/lib/DAV/XML/Request/SyncCollectionReport.php
+++ b/lib/DAV/XML/Request/SyncCollectionReport.php
@@ -66,7 +66,7 @@ class SyncCollectionReport implements Element {
* @param Writer $writer
* @return void
*/
- public function serializeXml(Writer $writer) {
+ public function xmlSerialize(Writer $writer) {
throw new CannotSerialize('This element cannot be serialized.');
@@ -93,7 +93,7 @@ class SyncCollectionReport implements Element {
* @param Reader $reader
* @return mixed
*/
- static public function deserializeXml(Reader $reader) {
+ static public function xmlDeserialize(Reader $reader) {
$self = new self();
diff --git a/lib/DAV/XML/Response/MultiStatus.php b/lib/DAV/XML/Response/MultiStatus.php
index 13239cb..54dd1f1 100644
--- a/lib/DAV/XML/Response/MultiStatus.php
+++ b/lib/DAV/XML/Response/MultiStatus.php
@@ -86,7 +86,7 @@ class MultiStatus implements Element {
* @param Writer $writer
* @return void
*/
- public function serializeXml(Writer $writer) {
+ public function xmlSerialize(Writer $writer) {
foreach($this->getResponses() as $response) {
$writer->writeElement('{DAV:}response', $response);
@@ -118,7 +118,7 @@ class MultiStatus implements Element {
* @param Reader $reader
* @return mixed
*/
- static public function deserializeXml(Reader $reader) {
+ static public function xmlDeserialize(Reader $reader) {
$elements = $reader->parseInnerTree();
--
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