[Merge] ~bryce/ubuntu/+source/php-parser:merge-v4.10.3-1-hirsute into ubuntu/+source/php-parser:ubuntu/devel

[Bryce Harrington]

You have been requested to review the proposed merge of ~bryce/ubuntu/+source/php-parser:merge-v4.10.3-1-hirsute into ubuntu/+source/php-parser:ubuntu/devel.

For more details, see:
https://code.launchpad.net/~bryce/ubuntu/+source/php-parser/+git/php-parser/+merge/395546

Straightforward merge of php-parser carrying the delta forward.

Upstream did a bunch of work on their tests, including the test cases we had disabled, so I tried a sync hoping they had fixed the issues but just hadn't updated the bug report we sent them.  Unfortunately, the exact same armhf issues cropped up, so no dice.

Anyway, because of that sync attempt, I merged manually rather than through the traditional git ubuntu merge process, so there aren't the usual tags.

I took some time looking through upstream's changes to tests, and also into why the tests are failing.  But I didn't want to devote too much time to that this cycle so timeboxed it when I didn't uncover any insights.  The patches are a bit brute force and could be better constrained (e.g. only take affect for armhf), however I think when time is more available it would be worth figuring out exactly what's failing, or perhaps work closer with upstream so they can understand/reproduce it.  Work for another day...

PPA: https://launchpad.net/~bryce/+archive/ubuntu/php-parser-merge-v4.10.3-1

-- 
Your team Ubuntu Server Developers is requested to review the proposed merge of ~bryce/ubuntu/+source/php-parser:merge-v4.10.3-1-hirsute into ubuntu/+source/php-parser:ubuntu/devel.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 8038 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20201218/ce5af3d2/attachment.diff>