[Pkg-owncloud-commits] [php-sabredav] 03/07: Cherry-pick "This should ensure that hhvm doesn't trip over this unittest"

[Mathieu Parent]

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

sathieu pushed a commit to branch 1.8-php5
in repository php-sabredav.

commit cf807643af9237310f73f853333b62ca636934b0
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Fri May 6 15:21:39 2016 +0200

    Cherry-pick "This should ensure that hhvm doesn't trip over this unittest"
---
 ...-ensure-that-hhvm-doesn-t-trip-over-this-.patch | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 26 insertions(+)

diff --git a/debian/patches/0006-This-should-ensure-that-hhvm-doesn-t-trip-over-this-.patch b/debian/patches/0006-This-should-ensure-that-hhvm-doesn-t-trip-over-this-.patch
new file mode 100644
index 0000000..0ba6438
--- /dev/null
+++ b/debian/patches/0006-This-should-ensure-that-hhvm-doesn-t-trip-over-this-.patch
@@ -0,0 +1,25 @@
+From: Evert Pot <me at evertpot.com>
+Date: Mon, 26 May 2014 00:40:51 -0400
+Subject: This should ensure that hhvm doesn't trip over this unittest.
+
+(cherry picked from commit 21a529e2c45fc6904aee7a6892b65e5fc0c2ae92)
+---
+ tests/Sabre/DAV/Mount/PluginTest.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/Sabre/DAV/Mount/PluginTest.php b/tests/Sabre/DAV/Mount/PluginTest.php
+index e818fe0..d732cba 100644
+--- a/tests/Sabre/DAV/Mount/PluginTest.php
++++ b/tests/Sabre/DAV/Mount/PluginTest.php
+@@ -47,7 +47,7 @@ class PluginTest extends DAV\AbstractServer {
+         $this->assertEquals('HTTP/1.1 200 OK',$this->response->status);
+ 
+         $xml = simplexml_load_string($this->response->body);
+-        $this->assertTrue($xml==true,'Response was not a valid xml document');
++        $this->assertInstanceOf('SimpleXMLElement',$xml, 'Response was not a valid xml document. The list of errors:' . print_r(libxml_get_errors(),true) . '. xml body: ' . $this->response->body . '. What type we got: ' . gettype($xml) . ' class, if object: ' . get_class($xml));
+ 
+         $xml->registerXPathNamespace('dm','http://purl.org/NET/webdav/mount');
+         $url = $xml->xpath('//dm:url');
+-- 
+2.8.1
+
diff --git a/debian/patches/series b/debian/patches/series
index ee42a7d..40fc841 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-tfix-threshold.patch
 0004-tfix-selection.patch
 0005-PHP-7-is-going-to-change-operator-precedence.patch
+0006-This-should-ensure-that-hhvm-doesn-t-trip-over-this-.patch

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