[Pkg-owncloud-commits] [php-sabre-vobject] 01/02: Fix the testsuite for recent PHP version

[David Prévot]

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

taffit pushed a commit to branch 2.1
in repository php-sabre-vobject.

commit 46b17da8deeebcc633e758c2fcb79174b0022161
Author: David Prévot <taffit at debian.org>
Date:   Sun Mar 13 14:53:08 2016 -0400

    Fix the testsuite for recent PHP version
---
 ...0002-This-should-never-have-worked-on-php.patch | 45 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 46 insertions(+)

diff --git a/debian/patches/0002-This-should-never-have-worked-on-php.patch b/debian/patches/0002-This-should-never-have-worked-on-php.patch
new file mode 100644
index 0000000..0f6c723
--- /dev/null
+++ b/debian/patches/0002-This-should-never-have-worked-on-php.patch
@@ -0,0 +1,45 @@
+From: Evert Pot <evert at rooftopsolutions.nl>
+Date: Wed, 22 Jan 2014 00:46:49 -0500
+Subject: This should never have worked on php.
+
+But it's fixed now anyway, and works for hhvm as well.
+
+Origin: upstream, https://github.com/fruux/sabre-vobject/commit/5945cad232eb880ae8fa64239fc7dbef33fae3e6
+---
+ tests/Sabre/VObject/StringUtilTest.php | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/Sabre/VObject/StringUtilTest.php b/tests/Sabre/VObject/StringUtilTest.php
+index 59a83d2..7d062ac 100644
+--- a/tests/Sabre/VObject/StringUtilTest.php
++++ b/tests/Sabre/VObject/StringUtilTest.php
+@@ -6,7 +6,7 @@ class StringUtilTest extends \PHPUnit_Framework_TestCase {
+ 
+     function testNonUTF8() {
+ 
+-        $string = StringUtil::isUTF8(chr('0xbf'));
++        $string = StringUtil::isUTF8(chr(0xbf));
+ 
+         $this->assertEquals(false, $string);
+ 
+@@ -22,7 +22,7 @@ class StringUtilTest extends \PHPUnit_Framework_TestCase {
+ 
+     function testUTF8ControlChar() {
+ 
+-        $string = StringUtil::isUTF8(chr('0x00'));
++        $string = StringUtil::isUTF8(chr(0x00));
+ 
+         $this->assertEquals(false, $string);
+ 
+@@ -30,9 +30,9 @@ class StringUtilTest extends \PHPUnit_Framework_TestCase {
+ 
+     function testConvertToUTF8nonUTF8() {
+ 
+-        $string = StringUtil::convertToUTF8(chr('0xbf'));
++        $string = StringUtil::convertToUTF8(chr(0xbf));
+ 
+-        $this->assertEquals(utf8_encode(chr('0xbf')), $string);
++        $this->assertEquals(utf8_encode(chr(0xbf)), $string);
+ 
+     }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 2ed88ed..052ce0a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Use-homemade-autoloader.php.patch
+0002-This-should-never-have-worked-on-php.patch

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