[Pkg-owncloud-commits] [php-sabredav] 01/01: Restore changes lost in merge
David Prévot
taffit at moszumanska.debian.org
Fri May 6 15:06:24 UTC 2016
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch 1.8
in repository php-sabredav.
commit 54c46dc98b4e631e84c43959d7e5c3a5052eee0e
Author: David Prévot <taffit at debian.org>
Date: Fri May 6 11:04:30 2016 -0400
Restore changes lost in merge
Git-Dch: Ignore
---
debian/changelog | 21 +++++
debian/compat | 2 +-
debian/control | 10 +--
...-7-is-going-to-change-operator-precedence.patch | 90 ++++++++++++++++++++++
...-ensure-that-hhvm-doesn-t-trip-over-this-.patch | 25 ++++++
debian/patches/series | 2 +
6 files changed, 144 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1a1af1e..f574913 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+php-sabredav (1.8.12-3) unstable; urgency=medium
+
+ * Team upload
+ * Move away from php5 (Closes: #821708)
+ - Update build- and test- dependencies
+ - Cherry-pick "PHP 7 is going to change operator precedence"
+ - Cherry-pick "ensure that hhvm doesn't trip over this unittest"
+ * Standards-Version: 3.9.8, no change
+ * Use secure Vcs-* URIs
+ * Update debhelper compat from 8 to 9
+
+ -- Mathieu Parent <sathieu at debian.org> Fri, 06 May 2016 15:32:50 +0200
+
+php-sabredav (1.8.12-2) unstable; urgency=medium
+
+ * Move maintenance within Debian PHP PEAR Maintainers
+ * Update Standards-Version to 3.9.7
+ * Use php5 to run tests
+
+ -- David Prévot <taffit at debian.org> Wed, 23 Mar 2016 14:05:51 -0400
+
php-sabredav (1.8.12-1) unstable; urgency=medium
[ Evert Pot ]
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index da139e4..bf5d43e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,20 +3,20 @@ Section: php
Priority: optional
Maintainer: Debian PHP PEAR Maintainers <pkg-php-pear at lists.alioth.debian.org>
Uploaders: David Prévot <taffit at debian.org>
-Build-Depends: debhelper (>= 8.0.0),
+Build-Depends: debhelper (>= 9~),
help2man,
php-curl,
- php-mbstring,
php-sabre-vobject (>= 2.1.7),
php-sqlite3,
+ php-xml,
phpab,
phpunit,
pkg-php-tools (>= 1.7~),
python
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
Homepage: http://sabre.io/dav/
-Vcs-Git: git://anonscm.debian.org/pkg-php/php-sabredav.git -b 1.8
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-php/php-sabredav.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-php/php-sabredav.git -b 1.8
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-php/php-sabredav.git
Package: php-sabre-dav
Architecture: all
diff --git a/debian/patches/0005-PHP-7-is-going-to-change-operator-precedence.patch b/debian/patches/0005-PHP-7-is-going-to-change-operator-precedence.patch
new file mode 100644
index 0000000..61a8bbf
--- /dev/null
+++ b/debian/patches/0005-PHP-7-is-going-to-change-operator-precedence.patch
@@ -0,0 +1,90 @@
+From: Evert Pot <me at evertpot.com>
+Date: Sun, 19 Jul 2015 13:45:57 -0400
+Subject: PHP 7 is going to change operator precedence.
+
+(cherry picked from commit c9f3e7d2be11872eb36873c5410bac476d815871)
+---
+ lib/Sabre/CalDAV/CalendarQueryValidator.php | 12 ++++++------
+ tests/Sabre/DAV/ClientTest.php | 8 ++++++++
+ 2 files changed, 14 insertions(+), 6 deletions(-)
+
+diff --git a/lib/Sabre/CalDAV/CalendarQueryValidator.php b/lib/Sabre/CalDAV/CalendarQueryValidator.php
+index c9cb463..cf36b50 100644
+--- a/lib/Sabre/CalDAV/CalendarQueryValidator.php
++++ b/lib/Sabre/CalDAV/CalendarQueryValidator.php
+@@ -59,7 +59,7 @@ class CalendarQueryValidator {
+
+ foreach($filters as $filter) {
+
+- $isDefined = isset($parent->$filter['name']);
++ $isDefined = isset($parent->{$filter['name']});
+
+ if ($filter['is-not-defined']) {
+
+@@ -75,7 +75,7 @@ class CalendarQueryValidator {
+ }
+
+ if ($filter['time-range']) {
+- foreach($parent->$filter['name'] as $subComponent) {
++ foreach ($parent->{$filter['name']} as $subComponent) {
+ if ($this->validateTimeRange($subComponent, $filter['time-range']['start'], $filter['time-range']['end'])) {
+ continue 2;
+ }
+@@ -89,7 +89,7 @@ class CalendarQueryValidator {
+
+ // If there are sub-filters, we need to find at least one component
+ // for which the subfilters hold true.
+- foreach($parent->$filter['name'] as $subComponent) {
++ foreach ($parent->{$filter['name']} as $subComponent) {
+
+ if (
+ $this->validateCompFilters($subComponent, $filter['comp-filters']) &&
+@@ -128,7 +128,7 @@ class CalendarQueryValidator {
+
+ foreach($filters as $filter) {
+
+- $isDefined = isset($parent->$filter['name']);
++ $isDefined = isset($parent->{$filter['name']});
+
+ if ($filter['is-not-defined']) {
+
+@@ -144,7 +144,7 @@ class CalendarQueryValidator {
+ }
+
+ if ($filter['time-range']) {
+- foreach($parent->$filter['name'] as $subComponent) {
++ foreach ($parent->{$filter['name']} as $subComponent) {
+ if ($this->validateTimeRange($subComponent, $filter['time-range']['start'], $filter['time-range']['end'])) {
+ continue 2;
+ }
+@@ -158,7 +158,7 @@ class CalendarQueryValidator {
+
+ // If there are sub-filters, we need to find at least one property
+ // for which the subfilters hold true.
+- foreach($parent->$filter['name'] as $subComponent) {
++ foreach ($parent->{$filter['name']} as $subComponent) {
+
+ if(
+ $this->validateParamFilters($subComponent, $filter['param-filters']) &&
+diff --git a/tests/Sabre/DAV/ClientTest.php b/tests/Sabre/DAV/ClientTest.php
+index ca67d35..1e8e244 100644
+--- a/tests/Sabre/DAV/ClientTest.php
++++ b/tests/Sabre/DAV/ClientTest.php
+@@ -6,6 +6,14 @@ require_once 'Sabre/DAV/ClientMock.php';
+
+ class ClientTest extends \PHPUnit_Framework_TestCase {
+
++ function setUp() {
++
++ if (!function_exists('curl_init')) {
++ $this->markTestSkipped('CURL must be installed to test the client');
++ }
++
++ }
++
+ function testConstruct() {
+
+ $client = new ClientMock(array(
+--
+2.8.1
+
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 91147e3..40fc841 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@
0002-Install-sabredav.php-in-usr-share-php-Sabre.patch
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
More information about the Pkg-owncloud-commits
mailing list