Package: release.debian.org
Severity: normal
Tags: bullseye
X-Debbugs-Cc: symf...@packages.debian.org
Control: affects -1 + src:symfony
User: release.debian....@packages.debian.org
Usertags: pu

This fixes an issue introduced in the latest update, that causes several
packages to FTBFS, hence the proposed fix closes the following bugs:
#1078843, #1078838, #1078837, #1078836.

Unfortunately, the previously introduced bug causes an FTBFS breaking
the “boostraping”, and I had to upload locally build binary packages
(and since all the packages are arch:all, no binNMU are possible).

[ Checklist ]
  [x] *all* changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in oldstable
  [x] the issue is verified as fixed in unstable

Thanks in advance for considering (FYI, I already uploaded the package).

Cheers

David
diff -Nru symfony-4.4.19+dfsg/debian/changelog symfony-4.4.19+dfsg/debian/changelog
--- symfony-4.4.19+dfsg/debian/changelog	2024-02-18 10:59:51.000000000 +0100
+++ symfony-4.4.19+dfsg/debian/changelog	2024-08-17 07:41:44.000000000 +0200
@@ -1,3 +1,10 @@
+symfony (4.4.19+dfsg-2+deb11u6) bullseye; urgency=medium
+
+  * Fix homemade autoload (Closes: #1078843, #1078838, #1078837, #1078836)
+  * Skip failing test with library loaded from system path
+
+ -- David Prévot <taf...@debian.org>  Sat, 17 Aug 2024 07:41:44 +0200
+
 symfony (4.4.19+dfsg-2+deb11u5) bullseye; urgency=medium
 
   * make sure that the submitted year is an accepted choice (Closes: #1061033)
diff -Nru symfony-4.4.19+dfsg/debian/patches/series symfony-4.4.19+dfsg/debian/patches/series
--- symfony-4.4.19+dfsg/debian/patches/series	2024-02-18 10:59:51.000000000 +0100
+++ symfony-4.4.19+dfsg/debian/patches/series	2024-08-17 07:41:44.000000000 +0200
@@ -25,3 +25,4 @@
 Mime-regenerate-test-certificates.patch
 TwigBridge-Ensure-CodeExtension-s-filters-properly-escape.patch
 make-sure-that-the-submitted-year-is-an-accepted-choice.patch
+Skip-failing-test-with-library-loaded-from-system-path.patch
diff -Nru symfony-4.4.19+dfsg/debian/patches/Skip-failing-test-with-library-loaded-from-system-path.patch symfony-4.4.19+dfsg/debian/patches/Skip-failing-test-with-library-loaded-from-system-path.patch
--- symfony-4.4.19+dfsg/debian/patches/Skip-failing-test-with-library-loaded-from-system-path.patch	1970-01-01 01:00:00.000000000 +0100
+++ symfony-4.4.19+dfsg/debian/patches/Skip-failing-test-with-library-loaded-from-system-path.patch	2024-08-17 07:41:44.000000000 +0200
@@ -0,0 +1,21 @@
+From: =?utf-8?q?David_Pr=C3=A9vot?= <da...@tilapin.org>
+Date: Tue, 20 Aug 2024 11:36:01 +0200
+Subject: Skip failing test with library loaded from system path
+
+Forwarded: not-needed
+---
+ src/Symfony/Component/Cache/Tests/LockRegistryTest.php | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Symfony/Component/Cache/Tests/LockRegistryTest.php b/src/Symfony/Component/Cache/Tests/LockRegistryTest.php
+index 0771347..ae733dd 100644
+--- a/src/Symfony/Component/Cache/Tests/LockRegistryTest.php
++++ b/src/Symfony/Component/Cache/Tests/LockRegistryTest.php
+@@ -18,6 +18,7 @@ class LockRegistryTest extends TestCase
+ {
+     public function testFiles()
+     {
++        $this->markTestSkipped('Irrelevant with library loaded from system path');
+         $lockFiles = LockRegistry::setFiles([]);
+         LockRegistry::setFiles($lockFiles);
+         $expected = array_map('realpath', glob(__DIR__.'/../Adapter/*'));
diff -Nru symfony-4.4.19+dfsg/debian/php-symfony-http-kernel.autoload.php.tpl symfony-4.4.19+dfsg/debian/php-symfony-http-kernel.autoload.php.tpl
--- symfony-4.4.19+dfsg/debian/php-symfony-http-kernel.autoload.php.tpl	2024-02-18 10:59:51.000000000 +0100
+++ symfony-4.4.19+dfsg/debian/php-symfony-http-kernel.autoload.php.tpl	2024-08-17 07:41:44.000000000 +0200
@@ -3,8 +3,8 @@
 require_once __DIR__ . '/../../../Psr/Log/autoload.php';
 require_once __DIR__ . '/../ErrorHandler/autoload.php';
 require_once __DIR__ . '/../EventDispatcher/autoload.php';
-require_once __DIR__ . '/../HttpClient/autoload.php';
 require_once __DIR__ . '/../HttpFoundation/autoload.php';
+require_once __DIR__ . '/../../Contracts/HttpClient/autoload.php';
 require_once __DIR__ . '/../../Polyfill/Php80/autoload.php';
 
 // suggest:
@@ -12,7 +12,6 @@
 if (stream_resolve_include_path(__DIR__ . '/../Config/autoload.php')) { include_once __DIR__ . '/../Config/autoload.php'; }
 if (stream_resolve_include_path(__DIR__ . '/../Console/autoload.php')) { include_once __DIR__ . '/../Console/autoload.php'; }
 if (stream_resolve_include_path(__DIR__ . '/../DependencyInjection/autoload.php')) { include_once __DIR__ . '/../DependencyInjection/autoload.php'; }
-if (stream_resolve_include_path(__DIR__ . '/../VarDumper/autoload.php')) { include_once __DIR__ . '/../VarDumper/autoload.php'; }
 
 // @codingStandardsIgnoreFile
 // @codeCoverageIgnoreStart

Attachment: signature.asc
Description: PGP signature

Reply via email to