Merge ~utkarsh/ubuntu/+source/php-parser:merge-php-parser-jammy into ubuntu/+source/php-parser:debian/sid

[Utkarsh Gupta]

Merge of php-parser from Debian unstable to unblock php-codecoverage.

[Chloé Smith (kajiya)]

lgtm!

review: Approve

[Utkarsh Gupta (utkarsh)]

Thank you! Uploaded to the archive! \o/

Only to find out that it has a missing dependency, php-codecoverage, which also has a missing dependency of php-codecoverage. Heh, funny. Turns out, we've hit another circular-dependency hellhole, albeit not so hell-y :P

I'll see what I can do to fix this. Meanwhile over to Bryce from here.

[Bryce Harrington (bryce)]

Indeed, the php-parser merge is needed to resolve this circular dependency. With this merge done it should hopefully be possible to bootstrap php-codecoverage. I'm going to test build locally and then work with vorlon on untangling things.

Thanks again for tackling the merge.

[Christian Ehrhardt  (paelzer)]

 php-parser | 4.13.1-1ubuntu2 | jammy/universe | source, all

I think this could be set merged, for now I'm consuming the team review slot to remove it from our overview.

diff --git a/debian/changelog b/debian/changelog
index d68c56c..03f8988 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+php-parser (4.13.1-1ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/p/0003-Disable-new-test-cases-not-yet-32-bit-compatible.patch:
+      + Disable two new test cases in order to fix proposed migration
+        blockage on armhf due to autopkgtest failures. Upstream indicates
+        these new test cases have not been verified to work with
+        32-bit. (LP #1878102)
+    - d/p/0004-Disable-CodeParsingTest-due-to-integer-syntax.patch:
+      + Disable another test case that is not yet 32-bit compatible, to
+        fix proposed migration blockage on armhf.
+
+ -- Utkarsh Gupta <[e-mail]>  Tue, 09 Nov 2021 17:51:30 +0530
+
 php-parser (4.13.1-1) unstable; urgency=medium
 
   [ Nikita Popov ]
@@ -25,6 +39,20 @@ php-parser (4.13.0-1) unstable; urgency=medium
 
  -- David Prévot <[e-mail]>  Thu, 07 Oct 2021 14:17:02 -0400
 
+php-parser (4.10.4-1ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian unstable.  Remaining changes:
+    - d/p/0003-Disable-new-test-cases-not-yet-32-bit-compatible.patch:
+      + Disable two new test cases in order to fix proposed migration
+        blockage on armhf due to autopkgtest failures.  Upstream indicates
+        these new test cases have not been verified to work with 32-bit.
+        (LP #1878102)
+    - d/p/0004-Disable-CodeParsingTest-due-to-integer-syntax.patch:
+      + Disable another test case that is not yet 32-bit compatible, to fix
+        proposed migration blockage on armhf.
+
+ -- Bryce Harrington <[e-mail]>  Thu, 21 Jan 2021 13:39:03 -0800
+
 php-parser (4.10.4-1) unstable; urgency=medium
 
   [ Nikita Popov ]
diff --git a/debian/control b/debian/control
index 2e9c63d..9d06b17 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: php-parser
 Section: php
 Priority: optional
-Maintainer: Debian PHP PEAR Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian PHP PEAR Maintainers <[e-mail]>
 Uploaders: David Prévot <[e-mail]>,
            Prach Pongpanich <[e-mail]>
 Build-Depends: debhelper-compat (= 13),
diff --git a/debian/patches/0003-Disable-new-test-cases-not-yet-32-bit-compatible.patch b/debian/patches/0003-Disable-new-test-cases-not-yet-32-bit-compatible.patch
 new file mode 100644
index 0000000..759c633
--- /dev/null
+++ b/debian/patches/0003-Disable-new-test-cases-not-yet-32-bit-compatible.patch
@@ -0,0 +1,57 @@
+From d8a2b2392cc65b493e375987cb593a4f641e7b64 Mon Sep 17 00:00:00 2001
+From: Bryce Harrington <[e-mail]>
+Date: Tue, 12 May 2020 20:37:14 +0000
+Subject: [PATCH] Disable new test cases not yet 32-bit compatible
+
+Two test cases new in 4.4.0 fail on armhf:
+
+  - CodeParsingTest::testParse: Different integer syntaxes
+  - Lexer\EmulativeTest::testLexNewFeatures: '0xCAFE_F00D'
+
+Upstream reports these may not be 32-bit compatible.
+
+For now, don't run these two new test cases, until they're expected to be
+able to run on all platforms.
+
+Signed-off-by: Bryce Harrington <[e-mail]>
+---
+ test/PhpParser/Lexer/EmulativeTest.php | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+Origin: vendor
+Bug: https://github.com/nikic/PHP-Parser/issues/662
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/php-parser/+bug/1878102
+Last-Updated: 2020-12-18
+
+diff --git a/test/PhpParser/Lexer/EmulativeTest.php b/test/PhpParser/Lexer/EmulativeTest.php
+index e141b13..9b74fd1 100644
+--- a/test/PhpParser/Lexer/EmulativeTest.php
++++ b/test/PhpParser/Lexer/EmulativeTest.php
+@@ -105,15 +105,6 @@ class EmulativeTest extends LexerTest
+         $this->assertSame($expectedTokens, $tokens);
+     }
+ 
+-    /**
+-     * @dataProvider provideTestLexNewFeatures
+-     */
+-    public function testLexNewFeatures($code, array $expectedTokens) {
+-        $lexer = $this->getLexer();
+-        $lexer->startLexing('<?php ' . $code);
+-        $this->assertSameTokens($expectedTokens, $lexer);
+-    }
+-
+     /**
+      * @dataProvider provideTestLexNewFeatures
+      */
+@@ -241,9 +232,6 @@ class EmulativeTest extends LexerTest
+             ['1_000', [
+                 [Tokens::T_LNUMBER, '1_000'],
+             ]],
+-            ['0xCAFE_F00D', [
+-                [Tokens::T_LNUMBER, '0xCAFE_F00D'],
+-            ]],
+             ['0b0101_1111', [
+                 [Tokens::T_LNUMBER, '0b0101_1111'],
+             ]],
+-- 
+2.25.1
diff --git a/debian/patches/0004-Disable-CodeParsingTest-due-to-integer-syntax.patch b/debian/patches/0004-Disable-CodeParsingTest-due-to-integer-syntax.patch
 new file mode 100644
index 0000000..de04972
--- /dev/null
+++ b/debian/patches/0004-Disable-CodeParsingTest-due-to-integer-syntax.patch
@@ -0,0 +1,71 @@
+From a354b3bc4fcf1bfe22d84741ebd1d945c4fa50df Mon Sep 17 00:00:00 2001
+From: Bryce Harrington <[e-mail]>
+Date: Thu, 14 May 2020 23:11:18 +0000
+Subject: [PATCH] Disable CodeParsingTest due to integer syntax inconsistency
+ on armhf
+
+Workaround testsuite failure when run on armhf by disabling the test
+case.  The specific failing test case is from
+PhpParser\CodeParsingTest::testParse with the
+scalar/numberSeparators.test#0 data set:
+
+      2: Stmt_Expression(
+ -        expr: Scalar_LNumber(
+ -            value: 3405705229
+ +        expr: Scalar_DNumber(
+ +            value: 0
+          )
+
+Signed-off-by: Bryce Harrington <[e-mail]>
+---
+ test/PhpParser/CodeParsingTest.php | 29 -----------------------------
+ 1 file changed, 29 deletions(-)
+
+Origin: vendor
+Bug: https://github.com/nikic/PHP-Parser/issues/662
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/php-parser/+bug/1878102
+Last-Updated: 2020-12-18
+
+diff --git a/test/PhpParser/CodeParsingTest.php b/test/PhpParser/CodeParsingTest.php
+index 24e93dd..1947932 100644
+--- a/test/PhpParser/CodeParsingTest.php
++++ b/test/PhpParser/CodeParsingTest.php
+@@ -7,35 +7,6 @@ use PhpParser\Node\Stmt;
+ 
+ class CodeParsingTest extends CodeTestAbstract
+ {
+-    /**
+-     * @dataProvider provideTestParse
+-     */
+-    public function testParse($name, $code, $expected, $modeLine) {
+-        if (null !== $modeLine) {
+-            $modes = array_fill_keys(explode(',', $modeLine), true);
+-        } else {
+-            $modes = [];
+-        }
+-
+-        list($parser5, $parser7) = $this->createParsers($modes);
+-        list($stmts5, $output5) = $this->getParseOutput($parser5, $code, $modes);
+-        list($stmts7, $output7) = $this->getParseOutput($parser7, $code, $modes);
+-
+-        if (isset($modes['php5'])) {
+-            $this->assertSame($expected, $output5, $name);
+-            $this->assertNotSame($expected, $output7, $name);
+-        } elseif (isset($modes['php7'])) {
+-            $this->assertNotSame($expected, $output5, $name);
+-            $this->assertSame($expected, $output7, $name);
+-        } else {
+-            $this->assertSame($expected, $output5, $name);
+-            $this->assertSame($expected, $output7, $name);
+-        }
+-
+-        $this->checkAttributes($stmts5);
+-        $this->checkAttributes($stmts7);
+-    }
+-
+     public function createParsers(array $modes) {
+         $lexer = new Lexer\Emulative(['usedAttributes' => [
+             'startLine', 'endLine',
+-- 
+2.25.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 629876c..5ce80e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 0001-Allow-require-to-search-in-the-path.patch
 0002-Adapt-shebang-for-PHP-script.patch
+0003-Disable-new-test-cases-not-yet-32-bit-compatible.patch
+0004-Disable-CodeParsingTest-due-to-integer-syntax.patch