Commit Debian 3.0 (quilt) metadataHEADdebian/2.8.7+dfsg-1.3archive/debian/2.8.7+dfsg-1.3master

[dgit (3.10) quilt-fixup]

3 files changed, 52 insertions, 0 deletions

diff --git a/debian/patches/series b/debian/patches/series
index 66c43c9..676f635 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,5 @@ 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
+vardumper-relax-tests-to-adapt-for-php-7
+vardumper-relax-line-number-for-clidumpe
diff --git a/debian/patches/vardumper-relax-line-number-for-clidumpe b/debian/patches/vardumper-relax-line-number-for-clidumpe
new file mode 100644
index 0000000..3c46980
--- /dev/null
+++ b/debian/patches/vardumper-relax-line-number-for-clidumpe
@@ -0,0 +1,28 @@
+From: James Clarke <jrtc27@debian.org>
+Date: Sat, 27 May 2017 19:48:09 +0100
+X-Dgit-Generated: 2.8.7+dfsg-1.3 d28625b7a6b1b5e9be0b3e2af3e79cbabf6a8bbe
+Subject: [VarDumper] Relax line number for CliDumperTest
+
+Origin: backport, https://github.com/symfony/symfony/commit/6ef78ec55317ac473fa045706244ef1f97d4b2de
+
+---
+
+--- symfony-2.8.7+dfsg.orig/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
++++ symfony-2.8.7+dfsg/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
+@@ -188,7 +188,6 @@ EOTXT
+                 }
+             };'),
+         ));
+-        $line = __LINE__ - 2;
+         $ref = (int) $out;
+ 
+         $data = $cloner->cloneVar($out);
+@@ -261,7 +260,7 @@ stream resource {@{$ref}
+       }
+       %d. %slosure%s() ==> Twig_Template->render(): {
+         src: {
+-          %sCliDumperTest.php:{$line}: """
++          %sCliDumperTest.php:%d: """
+ %A
+             """
+         }
diff --git a/debian/patches/vardumper-relax-tests-to-adapt-for-php-7 b/debian/patches/vardumper-relax-tests-to-adapt-for-php-7
new file mode 100644
index 0000000..b1569de
--- /dev/null
+++ b/debian/patches/vardumper-relax-tests-to-adapt-for-php-7
@@ -0,0 +1,22 @@
+From: Nicolas Grekas <nicolas.grekas@gmail.com>
+Date: Fri, 7 Apr 2017 11:49:35 +0200
+X-Dgit-Generated: 2.8.7+dfsg-1.3 0d8f420c173478e3c199b75e16417bdee99faedf
+Subject: [VarDumper] Relax tests to adapt for php 7.1rc4
+
+Origin: https://github.com/symfony/symfony/commit/3672c01e3c7182888a42b74e2864a20e21cfe7f5
+
+---
+
+--- symfony-2.8.7+dfsg.orig/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
++++ symfony-2.8.7+dfsg/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
+@@ -262,9 +262,7 @@ stream resource {@{$ref}
+       %d. %slosure%s() ==> Twig_Template->render(): {
+         src: {
+           %sCliDumperTest.php:{$line}: """
+-                    }\\n
+-                };'),\\n
+-            ));\\n
++%A
+             """
+         }
+       }