Merge ~athos-ribeiro/ubuntu/+source/php-doctrine-cache:merge-lp1976624-kinetic into ubuntu/+source/php-doctrine-cache:debian/sid

What if we make this a sync? And see what happens then? Is that still failing? If so, we should probably document why this delta is needed and what changed, et al.

Thanks for the review!

Please see the linked bug at LP: #1976624.

"""
The current delta introduces a build dependency that used to be installed through php-cache-integration-tests. That was removed in the latter package delta (the change came from upstream). Hence, the delta is still needed for now. This should be a simple merge keeping the only delta available.
"""

Since the test dependency was removed, it is also needed for a test suite run.

IIRC the test failure was pretty apparent, so I bet if you put the delta-less package into a PPA and ran lp-test-ppa on it, if the problem is still there it should fail.

$ lp-test-ppa -r kinetic --showpass ppa:athos-ribeiro/lp1976624-merge-php-doctrine-cache-kinetic
Tests for PPA lp1976624-merge-php-doctrine-cache-kinetic
---- ---- ---- ----
Release: kinetic
Sources:
  SRC: php-doctrine-cache @ 2.2.0-1ubuntu1~ppa1 - Published
Triggers on published Sources:
    php-doctrine-cache @ amd64 for php-doctrine-cache/2.2.0-1ubuntu1~ppa1 Trigger @amd64 ♻️ Trigger all proposed @amd64 ♻️ 💍
    php-doctrine-cache @ s390x for php-doctrine-cache/2.2.0-1ubuntu1~ppa1 Trigger @s390x ♻️ Trigger all proposed @s390x ♻️ 💍
    php-doctrine-cache @ ppc64el for php-doctrine-cache/2.2.0-1ubuntu1~ppa1 Trigger @ppc64el ♻️ Trigger all proposed @ppc64el ♻️ 💍
    php-doctrine-cache @ arm64 for php-doctrine-cache/2.2.0-1ubuntu1~ppa1 Trigger @arm64 ♻️ Trigger all proposed @arm64 ♻️ 💍
    php-doctrine-cache @ armhf for php-doctrine-cache/2.2.0-1ubuntu1~ppa1 Trigger @armhf ♻️ Trigger all proposed @armhf ♻️ 💍
    php-doctrine-cache @ riscv64 for php-doctrine-cache/2.2.0-1ubuntu1~ppa1 Trigger @riscv64 ♻️ Trigger all proposed @riscv64 ♻️ 💍
Results from https://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-athos-ribeiro-lp1976624-merge-php-doctrine-cache-kinetic/?format=plain:
    No results published yet
Running:
    time pkg release arch ppa trigger
    0:00:50 php-doctrine-cache kinetic s390x athos-ribeiro/lp1976624-merge-php-doctrine-cache-kinetic php-doctrine-cache/2.2.0-1ubuntu1~ppa1
    0:01:10 php-doctrine-cache kinetic ppc64el athos-ribeiro/lp1976624-merge-php-doctrine-cache-kinetic php-doctrine-cache/2.2.0-1ubuntu1~ppa1
    0:01:30 php-doctrine-cache kinetic armhf athos-ribeiro/lp1976624-merge-php-doctrine-cache-kinetic php-doctrine-cache/2.2.0-1ubuntu1~ppa1
Waiting:
    Q-num pkg release arch ppa trigger
    1 php-doctrine-cache kinetic arm64 athos-ribeiro/lp1976624-merge-php-doctrine-cache-kinetic php-doctrine-cache/2.2.0-1ubuntu1~ppa1
    1 php-doctrine-cache kinetic amd64 athos-ribeiro/lp1976624-merge-php-doctrine-cache-kinetic php-doctrine-cache/2.2.0-1ubuntu1~ppa1

Probably would also be worth running the autopkgtests for the delta-less package for jammy too, and see if the issue reproduces there or not. Some of the final changes we introduced late in the jammy cycle likely fixed a lot of the issues we'd seen previously.

The build dependency is needed for the package tests to run during its build.

make[1]: Leaving directory '/<<PKGBUILDDIR>>'
   debian/rules override_dh_auto_test
make[1]: Entering directory '/<<PKGBUILDDIR>>'
memcached -d -u memcache
redis-server --daemonize yes
phpunit --include-path lib --bootstrap vendor/autoload.php
PHP Warning: require_once(Cache/TagInterop/autoload.php): Failed to open stream: No such file or directory in /usr/share/php/Cache/IntegrationTests/autoload.php on line 4
PHPUnit 9.5.20 #StandWithUkraine

Error in bootstrap script: Error:
Failed opening required 'Cache/TagInterop/autoload.php' (include_path='lib:.:/usr/share/php')
#0 /<<PKGBUILDDIR>>/vendor/autoload.php(4): require_once()
#1 /usr/share/php/PHPUnit/Util/FileLoader.php(65): include_once('...')
#2 /usr/share/php/PHPUnit/Util/FileLoader.php(49): PHPUnit\Util\FileLoader::load()
#3 /usr/share/php/PHPUnit/TextUI/Command.php(562): PHPUnit\Util\FileLoader::checkAndLoad()
#4 /usr/share/php/PHPUnit/TextUI/Command.php(342): PHPUnit\TextUI\Command->handleBootstrap()
#5 /usr/share/php/PHPUnit/TextUI/Command.php(111): PHPUnit\TextUI\Command->handleArguments()
#6 /usr/share/php/PHPUnit/TextUI/Command.php(96): PHPUnit\TextUI\Command->run()
#7 /usr/bin/phpunit(73): PHPUnit\TextUI\Command::main()
#8 {main}
make[1]: *** [debian/rules:25: override_dh_auto_test] Error 1
make[1]: Leaving directory '/<<PKGBUILDDIR>>'
make: *** [debian/rules:3: binary] Error 2
dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2
--------------------------------------------------------------------------------
Build finished at 2022-06-02T18:26:07Z

Finished
--------

What I initially thought was that we could drop the delta in php-cache-integration-tests, which would make it pull the missing dependency for this package during the build (and for DEP8 tests).

But analyzing the delta in php-cache-integration-tests one will find it came from upstream, hence, we are just anticipating here what will be required soon in Debian as well. Then I decided to just merge this one and wait for a new php-cache-integration-tests upstream release so we can forward this delta to Debian.

Yep, sounds good. Yeah this was an issue that was pretty apparent, so if it's still showing itself let's keep it for now.

Thanks Utkarsh, Bryce!

Uploaded:

$ dput ubuntu ../php-doctrine-cache_2.2.0-1ubuntu1_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../php-doctrine-cache_2.2.0-1ubuntu1_source.changes: Valid signature from 033C4CA276024834
Checking signature on .dsc
gpg: ../php-doctrine-cache_2.2.0-1ubuntu1.dsc: Valid signature from 033C4CA276024834
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading php-doctrine-cache_2.2.0-1ubuntu1.dsc: done.
  Uploading php-doctrine-cache_2.2.0.orig.tar.xz: done.
  Uploading php-doctrine-cache_2.2.0-1ubuntu1.debian.tar.xz: done.
  Uploading php-doctrine-cache_2.2.0-1ubuntu1_source.buildinfo: done.
  Uploading php-doctrine-cache_2.2.0-1ubuntu1_source.changes: done.
Successfully uploaded packages.