summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Clarke <jrtc27@jrtc27.com>2017-01-29 16:16:42 +0000
committerJames Clarke <jrtc27@jrtc27.com>2017-01-29 16:16:42 +0000
commit813740ec87e84e39a57d0d912cdc05f45e9527a4 (patch)
tree4fc8a113250e16b6010bb8ff8180b698e7ba2ac7
parent6828b9a29047033f3ca948169dde69755b5b7fdc (diff)
Commit Debian 3.0 (quilt) metadatadebian/2.8.7+dfsg-1.2archive/debian/2.8.7+dfsg-1.2
[dgit (3.9) quilt-fixup]
-rw-r--r--debian/patches/relax-1-test-failing-with-latest-php-ver26
-rw-r--r--debian/patches/series2
-rw-r--r--debian/patches/update-ipvalidatortest-data-set-with-a-v22
3 files changed, 50 insertions, 0 deletions
diff --git a/debian/patches/relax-1-test-failing-with-latest-php-ver b/debian/patches/relax-1-test-failing-with-latest-php-ver
new file mode 100644
index 0000000..74cbf0c
--- /dev/null
+++ b/debian/patches/relax-1-test-failing-with-latest-php-ver
@@ -0,0 +1,26 @@
+From: Remi Collet <fedora@famillecollet.com>
+Date: Fri, 5 Aug 2016 09:21:03 +0200
+X-Dgit-Generated: 2.8.7+dfsg-1.2 5f7c01770fe23c699caa96782ce8a6e2cad4811a
+Subject: Relax 1 test failing with latest PHP versions
+
+Related to php bug #52646 which is fixed in 5.6.25RC1, 7.0.10RC1, 7.1.0beta2
+
+Origin: https://github.com/symfony/symfony/commit/6703b416d8e7edc2fd04a214b317ea4a189cac51
+
+---
+
+--- symfony-2.8.7+dfsg.orig/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
++++ symfony-2.8.7+dfsg/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
+@@ -94,10 +94,10 @@ SplFileObject {
+ file: true
+ dir: false
+ link: false
+-%AcsvControl: array:2 [
++%AcsvControl: array:%d [
+ 0 => ","
+ 1 => """
+- ]
++%A]
+ flags: DROP_NEW_LINE|SKIP_EMPTY
+ maxLineLen: 0
+ fstat: array:26 [
diff --git a/debian/patches/series b/debian/patches/series
index 7057efd..66c43c9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,5 @@ FrameworkBundle-SecurityBundle-Don-t-try-to-include-.patch
HttpFoundation-Fix-incompatibility-with-php-memcache.patch
fix-php-7.1-related-failures
do-not-depend-on-a-fixed-date-in-layout-
+update-ipvalidatortest-data-set-with-a-v
+relax-1-test-failing-with-latest-php-ver
diff --git a/debian/patches/update-ipvalidatortest-data-set-with-a-v b/debian/patches/update-ipvalidatortest-data-set-with-a-v
new file mode 100644
index 0000000..bbc4667
--- /dev/null
+++ b/debian/patches/update-ipvalidatortest-data-set-with-a-v
@@ -0,0 +1,22 @@
+From: Jakub Zalas <jakub@zalas.pl>
+Date: Tue, 13 Sep 2016 12:11:56 +0100
+X-Dgit-Generated: 2.8.7+dfsg-1.2 007ac6e42739ef24a35a1872a566ac35e90f0aaf
+Subject: Update IpValidatorTest data set with a valid reserved IP
+
+The validator uses PHP filter which was recently fixed (see https://bugs.php.net/bug.php?id=72972).
+
+Origin: https://github.com/symfony/symfony/commit/86a151c9f57adc3cb3734aa7b74d5bf1462bf0ce
+
+---
+
+--- symfony-2.8.7+dfsg.orig/src/Symfony/Component/Validator/Tests/Constraints/IpValidatorTest.php
++++ symfony-2.8.7+dfsg/src/Symfony/Component/Validator/Tests/Constraints/IpValidatorTest.php
+@@ -221,7 +221,7 @@ class IpValidatorTest extends AbstractCo
+ {
+ return array(
+ array('0.0.0.0'),
+- array('224.0.0.1'),
++ array('240.0.0.1'),
+ array('255.255.255.255'),
+ );
+ }