diff -Nru php-net-ldap2-2.2.0/debian/changelog php-net-ldap2-2.2.0/debian/changelog --- php-net-ldap2-2.2.0/debian/changelog 2020-03-03 14:38:30.000000000 +0000 +++ php-net-ldap2-2.2.0/debian/changelog 2021-01-05 08:34:09.000000000 +0000 @@ -1,21 +1,44 @@ -php-net-ldap2 (2.2.0-3ubuntu3) focal; urgency=medium +php-net-ldap2 (2.2.0-6) unstable; urgency=medium - * d/p/phpunit8.5_compatibility.patch: fix test issues with phpunit 8.5 + * debian/clean: Add .phpunit.result.cache to the list. + * d/patches/ftbfs-phpunit.patch: Add "Forwarded: not-needed". Net_LDAP2 is + dead upstream and will likely be removed from Debian if/when Net_LDAP3 + stops depending on it. + * Add d/salsa-ci.yml file for GitLab CI. (Run reprotest under nocheck + profile for now.) + * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository, + Repository-Browse. + * Move phpunit 9 FTBFS fix to separate patch. + * Preemptively fix FTBFS with phpunit 10. + + -- Guilhem Moulin Tue, 05 Jan 2021 09:34:09 +0100 + +php-net-ldap2 (2.2.0-5) unstable; urgency=medium + + * Run wrap-and-sort(1). + * d/rules: Remove check for DEB_BUILD_OPTIONS=nocheck, no longer needed as + of debhelper compatibility level 13. + * d/control: Exclude phpunit from Build-Depends under nocheck profile. + * d/patches/ftbfs-phpunit.patch: Replace deprecated calls assertInternalType() + calls with assertIs*(). This preemptively fixes a FTBFS with phpunit 9. + + -- Guilhem Moulin Mon, 14 Dec 2020 12:30:15 +0100 + +php-net-ldap2 (2.2.0-4) unstable; urgency=medium + + * Add self to Uploaders. + * Fix FTBFS with phpunit {6.4.4-2,7.5.6-1,8.5.13-1} (Closes: #882938) + * Use secure copyright file specification URI. + * Update watch file format version to 4. + * Use secure URI in Homepage field. + * Bump debhelper from deprecated 9 to 13. + * Set debhelper-compat version in Build-Depends. + * Update Vcs-* headers to use salsa repository. + * Remove unnecessary get-orig-source-target. + * Set Rules-Requires-Root: no. + * Bump Standards-Version from ancient 3.9.8 to 4.5.1 (no change necessary). - -- Christian Ehrhardt Tue, 03 Mar 2020 15:38:30 +0100 - -php-net-ldap2 (2.2.0-3ubuntu2) cosmic; urgency=medium - - * debian/patches/phpunit7-compatibility.patch: assertTrue returns void. - - -- Iain Lane Wed, 08 Aug 2018 11:00:25 +0100 - -php-net-ldap2 (2.2.0-3ubuntu1) bionic; urgency=medium - - * debian/patches/phpunit6_compatibility.patch: PHPUnit 6 has - namespaced classes. - - -- Nishanth Aravamudan Wed, 14 Feb 2018 13:06:16 -0800 + -- Guilhem Moulin Tue, 08 Dec 2020 19:33:40 +0100 php-net-ldap2 (2.2.0-3) unstable; urgency=medium diff -Nru php-net-ldap2-2.2.0/debian/clean php-net-ldap2-2.2.0/debian/clean --- php-net-ldap2-2.2.0/debian/clean 1970-01-01 00:00:00.000000000 +0000 +++ php-net-ldap2-2.2.0/debian/clean 2021-01-05 08:34:09.000000000 +0000 @@ -0,0 +1 @@ +.phpunit.result.cache diff -Nru php-net-ldap2-2.2.0/debian/compat php-net-ldap2-2.2.0/debian/compat --- php-net-ldap2-2.2.0/debian/compat 2016-06-24 06:23:45.000000000 +0000 +++ php-net-ldap2-2.2.0/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru php-net-ldap2-2.2.0/debian/control php-net-ldap2-2.2.0/debian/control --- php-net-ldap2-2.2.0/debian/control 2018-08-08 09:48:29.000000000 +0000 +++ php-net-ldap2-2.2.0/debian/control 2021-01-05 08:34:09.000000000 +0000 @@ -1,24 +1,23 @@ Source: php-net-ldap2 Section: php Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian PHP PEAR Maintainers +Maintainer: Debian PHP PEAR Maintainers Uploaders: Benoit Mortier , - Prach Pongpanich -Build-Depends: debhelper (>= 9), + Prach Pongpanich , + Guilhem Moulin +Build-Depends: debhelper-compat (= 13), php-pear (>= 1.10.1), - phpunit (>= 7), + phpunit (>= 9~) , pkg-php-tools (>= 1.32) -Standards-Version: 3.9.8 -Homepage: http://pear.php.net/package/Net_LDAP2/ -Vcs-Git: git://anonscm.debian.org/pkg-php/php-net-ldap2.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-php/php-net-ldap2.git +Standards-Version: 4.5.1 +Homepage: https://pear.php.net/package/Net_LDAP2/ +Vcs-Git: https://salsa.debian.org/php-team/pear/php-net-ldap2.git +Vcs-Browser: https://salsa.debian.org/php-team/pear/php-net-ldap2 +Rules-Requires-Root: no Package: php-net-ldap2 Architecture: all -Depends: php-pear, - ${misc:Depends}, - ${phppear:Debian-Depends} +Depends: php-pear, ${misc:Depends}, ${phppear:Debian-Depends} Recommends: ${phppear:Debian-Recommends} Breaks: ${phppear:Debian-Breaks} Description: ${phppear:summary} diff -Nru php-net-ldap2-2.2.0/debian/copyright php-net-ldap2-2.2.0/debian/copyright --- php-net-ldap2-2.2.0/debian/copyright 2016-06-24 06:30:13.000000000 +0000 +++ php-net-ldap2-2.2.0/debian/copyright 2021-01-05 08:34:09.000000000 +0000 @@ -1,6 +1,6 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Net_LDAP2 -Source: http://pear.php.net/package/Net_LDAP2/download +Source: https://pear.php.net/package/Net_LDAP2/download Files: * Copyright: 2003-2009, Benedikt Hallinger diff -Nru php-net-ldap2-2.2.0/debian/gbp.conf php-net-ldap2-2.2.0/debian/gbp.conf --- php-net-ldap2-2.2.0/debian/gbp.conf 2016-06-24 06:23:45.000000000 +0000 +++ php-net-ldap2-2.2.0/debian/gbp.conf 2021-01-05 08:34:09.000000000 +0000 @@ -1,8 +1,9 @@ [DEFAULT] -upstream-branch = upstream-sid -debian-branch = debian-sid +debian-branch = debian/latest pristine-tar = True -[git-buildpackage] -export-dir = ../build-area/ -tarball-dir = ../tarballs/ +[import-orig] +upstream-vcs-tag = v%(version)s + +[pq] +patch-numbers = False diff -Nru php-net-ldap2-2.2.0/debian/patches/Fix-FTBFS-with-phpunit-10.patch php-net-ldap2-2.2.0/debian/patches/Fix-FTBFS-with-phpunit-10.patch --- php-net-ldap2-2.2.0/debian/patches/Fix-FTBFS-with-phpunit-10.patch 1970-01-01 00:00:00.000000000 +0000 +++ php-net-ldap2-2.2.0/debian/patches/Fix-FTBFS-with-phpunit-10.patch 2021-01-05 08:34:09.000000000 +0000 @@ -0,0 +1,23 @@ +From: Guilhem Moulin +Date: Mon, 21 Dec 2020 14:39:01 +0100 +Subject: Fix FTBFS with phpunit 10. + +Last-Update: 2020-12-21 +Forwarded: not-needed +--- + Net_LDAP2-2.2.0/tests/Net_LDAP2_FilterTest.php | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Net_LDAP2-2.2.0/tests/Net_LDAP2_FilterTest.php b/Net_LDAP2-2.2.0/tests/Net_LDAP2_FilterTest.php +index 118b4f0..811ec3a 100644 +--- a/Net_LDAP2-2.2.0/tests/Net_LDAP2_FilterTest.php ++++ b/Net_LDAP2-2.2.0/tests/Net_LDAP2_FilterTest.php +@@ -144,7 +144,7 @@ class Net_LDAP2_FilterTest extends Net_LDAP2_TestBase { + $filter = Net_LDAP2_Filter::create($testattr, $match, $testval, false); + + $this->assertInstanceOf('Net_LDAP2_Filter', $filter); +- $this->assertRegExp($regex, $filter->asString(), "Filter generation failed for MatchType: $match"); ++ $this->assertMatchesRegularExpression($regex, $filter->asString(), "Filter generation failed for MatchType: $match"); + } + + // test creating failure diff -Nru php-net-ldap2-2.2.0/debian/patches/Fix-FTBFS-with-phpunit-8.5.13-1.patch php-net-ldap2-2.2.0/debian/patches/Fix-FTBFS-with-phpunit-8.5.13-1.patch --- php-net-ldap2-2.2.0/debian/patches/Fix-FTBFS-with-phpunit-8.5.13-1.patch 1970-01-01 00:00:00.000000000 +0000 +++ php-net-ldap2-2.2.0/debian/patches/Fix-FTBFS-with-phpunit-8.5.13-1.patch 2021-01-05 08:34:09.000000000 +0000 @@ -0,0 +1,192 @@ +From: Guilhem Moulin +Date: Tue, 8 Dec 2020 19:04:07 +0100 +Subject: Fix FTBFS with phpunit 8.5.13-1. + +Last-Update: 2020-12-08 +Bug-Debian: https://bugs.debian.org/882938 +Forwarded: not-needed +--- + Net_LDAP2-2.2.0/tests/Net_LDAP2Test.php | 4 ++-- + Net_LDAP2-2.2.0/tests/Net_LDAP2_EntryTest.php | 4 ++-- + Net_LDAP2-2.2.0/tests/Net_LDAP2_FilterTest.php | 4 ++-- + Net_LDAP2-2.2.0/tests/Net_LDAP2_LDIFTest.php | 4 ++-- + Net_LDAP2-2.2.0/tests/Net_LDAP2_RootDSETest.php | 4 ++-- + Net_LDAP2-2.2.0/tests/Net_LDAP2_SearchTest.php | 4 ++-- + Net_LDAP2-2.2.0/tests/Net_LDAP2_TestBase.php | 6 +++--- + Net_LDAP2-2.2.0/tests/Net_LDAP2_UtilTest.php | 4 ++-- + 8 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/Net_LDAP2-2.2.0/tests/Net_LDAP2Test.php b/Net_LDAP2-2.2.0/tests/Net_LDAP2Test.php +index 00da7c6..845c33c 100644 +--- a/Net_LDAP2-2.2.0/tests/Net_LDAP2Test.php ++++ b/Net_LDAP2-2.2.0/tests/Net_LDAP2Test.php +@@ -18,7 +18,7 @@ class Net_LDAP2Test extends Net_LDAP2_TestBase { + * + * @access protected + */ +- protected function setUp() { ++ protected function setUp(): void { + $this->ldapcfg = $this->getTestConfig(); + } + +@@ -28,7 +28,7 @@ class Net_LDAP2Test extends Net_LDAP2_TestBase { + * + * @access protected + */ +- protected function tearDown() { ++ protected function tearDown(): void { + } + + /** +diff --git a/Net_LDAP2-2.2.0/tests/Net_LDAP2_EntryTest.php b/Net_LDAP2-2.2.0/tests/Net_LDAP2_EntryTest.php +index 21995a1..cb3bc5e 100644 +--- a/Net_LDAP2-2.2.0/tests/Net_LDAP2_EntryTest.php ++++ b/Net_LDAP2-2.2.0/tests/Net_LDAP2_EntryTest.php +@@ -34,7 +34,7 @@ class Net_LDAP2_EntryTest extends Net_LDAP2_TestBase { + * + * @access protected + */ +- protected function setUp() { ++ protected function setUp(): void { + $this->ldapcfg = $this->getTestConfig(); + } + +@@ -44,7 +44,7 @@ class Net_LDAP2_EntryTest extends Net_LDAP2_TestBase { + * + * @access protected + */ +- protected function tearDown() { ++ protected function tearDown(): void { + } + + /** +diff --git a/Net_LDAP2-2.2.0/tests/Net_LDAP2_FilterTest.php b/Net_LDAP2-2.2.0/tests/Net_LDAP2_FilterTest.php +index 20a190b..118b4f0 100644 +--- a/Net_LDAP2-2.2.0/tests/Net_LDAP2_FilterTest.php ++++ b/Net_LDAP2-2.2.0/tests/Net_LDAP2_FilterTest.php +@@ -31,7 +31,7 @@ class Net_LDAP2_FilterTest extends Net_LDAP2_TestBase { + * + * @access protected + */ +- protected function setUp() { ++ protected function setUp(): void { + } + + /** +@@ -40,7 +40,7 @@ class Net_LDAP2_FilterTest extends Net_LDAP2_TestBase { + * + * @access protected + */ +- protected function tearDown() { ++ protected function tearDown(): void { + } + + /** +diff --git a/Net_LDAP2-2.2.0/tests/Net_LDAP2_LDIFTest.php b/Net_LDAP2-2.2.0/tests/Net_LDAP2_LDIFTest.php +index 0d4f60e..6f32d20 100644 +--- a/Net_LDAP2-2.2.0/tests/Net_LDAP2_LDIFTest.php ++++ b/Net_LDAP2-2.2.0/tests/Net_LDAP2_LDIFTest.php +@@ -100,7 +100,7 @@ class Net_LDAP2_LDIFTest extends Net_LDAP2_TestBase { + * + * @access protected + */ +- protected function setUp() { ++ protected function setUp(): void { + // initialize test entries + $this->testentries = array(); + foreach ($this->testentries_data as $dn => $attrs) { +@@ -120,7 +120,7 @@ class Net_LDAP2_LDIFTest extends Net_LDAP2_TestBase { + * + * @access protected + */ +- protected function tearDown() { ++ protected function tearDown(): void { + // uncomment this if you debug the test cases so you will have output available + if (file_exists($this->outfile)) @unlink($this->outfile); + } +diff --git a/Net_LDAP2-2.2.0/tests/Net_LDAP2_RootDSETest.php b/Net_LDAP2-2.2.0/tests/Net_LDAP2_RootDSETest.php +index 97b7b93..aacb7bd 100644 +--- a/Net_LDAP2-2.2.0/tests/Net_LDAP2_RootDSETest.php ++++ b/Net_LDAP2-2.2.0/tests/Net_LDAP2_RootDSETest.php +@@ -26,7 +26,7 @@ class Net_LDAP2_RootDSETest extends Net_LDAP2_TestBase { + * + * @access protected + */ +- protected function setUp() { ++ protected function setUp(): void { + $this->markTestIncomplete('Test not implemented yet.'); + } + +@@ -36,7 +36,7 @@ class Net_LDAP2_RootDSETest extends Net_LDAP2_TestBase { + * + * @access protected + */ +- protected function tearDown() { ++ protected function tearDown(): void { + } + + /** +diff --git a/Net_LDAP2-2.2.0/tests/Net_LDAP2_SearchTest.php b/Net_LDAP2-2.2.0/tests/Net_LDAP2_SearchTest.php +index e46849a..6a15933 100644 +--- a/Net_LDAP2-2.2.0/tests/Net_LDAP2_SearchTest.php ++++ b/Net_LDAP2-2.2.0/tests/Net_LDAP2_SearchTest.php +@@ -19,7 +19,7 @@ class Net_LDAP2_SearchTest extends Net_LDAP2_TestBase { + * + * @access protected + */ +- protected function setUp() { ++ protected function setUp(): void { + $this->ldapcfg = $this->getTestConfig(); + } + +@@ -29,7 +29,7 @@ class Net_LDAP2_SearchTest extends Net_LDAP2_TestBase { + * + * @access protected + */ +- protected function tearDown() { ++ protected function tearDown(): void { + } + + /** +diff --git a/Net_LDAP2-2.2.0/tests/Net_LDAP2_TestBase.php b/Net_LDAP2-2.2.0/tests/Net_LDAP2_TestBase.php +index 593f86e..abf005b 100644 +--- a/Net_LDAP2-2.2.0/tests/Net_LDAP2_TestBase.php ++++ b/Net_LDAP2-2.2.0/tests/Net_LDAP2_TestBase.php +@@ -1,12 +1,12 @@ + getMessage()); + } +- return parent::assertTrue($condition, $msg); ++ parent::assertTrue($condition, $message); + } + } + ?> +diff --git a/Net_LDAP2-2.2.0/tests/Net_LDAP2_UtilTest.php b/Net_LDAP2-2.2.0/tests/Net_LDAP2_UtilTest.php +index 5218ebc..f8adeb0 100644 +--- a/Net_LDAP2-2.2.0/tests/Net_LDAP2_UtilTest.php ++++ b/Net_LDAP2-2.2.0/tests/Net_LDAP2_UtilTest.php +@@ -26,7 +26,7 @@ class Net_LDAP2_UtilTest extends Net_LDAP2_TestBase { + * + * @access protected + */ +- protected function setUp() { ++ protected function setUp(): void { + } + + /** +@@ -35,7 +35,7 @@ class Net_LDAP2_UtilTest extends Net_LDAP2_TestBase { + * + * @access protected + */ +- protected function tearDown() { ++ protected function tearDown(): void { + } + + /** diff -Nru php-net-ldap2-2.2.0/debian/patches/Fix-FTBFS-with-phpunit-9.5.0-1.patch php-net-ldap2-2.2.0/debian/patches/Fix-FTBFS-with-phpunit-9.5.0-1.patch --- php-net-ldap2-2.2.0/debian/patches/Fix-FTBFS-with-phpunit-9.5.0-1.patch 1970-01-01 00:00:00.000000000 +0000 +++ php-net-ldap2-2.2.0/debian/patches/Fix-FTBFS-with-phpunit-9.5.0-1.patch 2021-01-05 08:34:09.000000000 +0000 @@ -0,0 +1,25 @@ +From: Guilhem Moulin +Date: Tue, 8 Dec 2020 20:42:29 +0100 +Subject: Fix FTBFS with phpunit 9.5.0-1. + +Last-Update: 2020-12-08 +Forwarded: not-needed +--- + Net_LDAP2-2.2.0/tests/Net_LDAP2_LDIFTest.php | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Net_LDAP2-2.2.0/tests/Net_LDAP2_LDIFTest.php b/Net_LDAP2-2.2.0/tests/Net_LDAP2_LDIFTest.php +index 6f32d20..fd445b8 100644 +--- a/Net_LDAP2-2.2.0/tests/Net_LDAP2_LDIFTest.php ++++ b/Net_LDAP2-2.2.0/tests/Net_LDAP2_LDIFTest.php +@@ -551,8 +551,8 @@ class Net_LDAP2_LDIFTest extends Net_LDAP2_TestBase { + $ldif = new Net_LDAP2_LDIF(dirname(__FILE__).'/some_not_existing/path/for/net_ldap_ldif', 'r', $this->defaultConfig); + $this->assertTrue((boolean)$ldif->error()); + $this->assertInstanceOf('Net_LDAP2_Error', $ldif->error()); +- $this->assertInternalType('string', $ldif->error(true)); +- $this->assertInternalType('int', $ldif->error_lines()); ++ $this->assertIsString($ldif->error(true)); ++ $this->assertIsInt($ldif->error_lines()); + $this->assertThat(strlen($ldif->error(true)), $this->greaterThan(0)); + + // Test for line number reporting diff -Nru php-net-ldap2-2.2.0/debian/patches/phpunit6_compatibility.patch php-net-ldap2-2.2.0/debian/patches/phpunit6_compatibility.patch --- php-net-ldap2-2.2.0/debian/patches/phpunit6_compatibility.patch 2018-02-14 21:06:09.000000000 +0000 +++ php-net-ldap2-2.2.0/debian/patches/phpunit6_compatibility.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -Description: PHPUnit 6 has namespaced classes -Author: Nishanth Aravamudan -Forwarded: Will be done by Nishanth Aravamudan -Last-Update: 2018-02-14 - ---- php-net-ldap2-2.2.0.orig/Net_LDAP2-2.2.0/tests/Net_LDAP2_EntryTest.php -+++ php-net-ldap2-2.2.0/Net_LDAP2-2.2.0/tests/Net_LDAP2_EntryTest.php -@@ -24,8 +24,8 @@ class Net_LDAP2_EntryTest extends Net_LD - public static function main() { - require_once "PHPUnit/TextUI/TestRunner.php"; - -- $suite = new PHPUnit_Framework_TestSuite("Net_LDAP2_EntryTest"); -- $result = PHPUnit_TextUI_TestRunner::run($suite); -+ $suite = new PHPUnit\Framework\TestSuite("Net_LDAP2_EntryTest"); -+ $result = PHPUnit\TextUI\TestRunner::run($suite); - } - - /** ---- php-net-ldap2-2.2.0.orig/Net_LDAP2-2.2.0/tests/Net_LDAP2_FilterTest.php -+++ php-net-ldap2-2.2.0/Net_LDAP2-2.2.0/tests/Net_LDAP2_FilterTest.php -@@ -21,8 +21,8 @@ class Net_LDAP2_FilterTest extends Net_L - public static function main() { - require_once "PHPUnit/TextUI/TestRunner.php"; - -- $suite = new PHPUnit_Framework_TestSuite("Net_LDAP2_FilterTest"); -- $result = PHPUnit_TextUI_TestRunner::run($suite); -+ $suite = new PHPUnit\Framework\TestSuite("Net_LDAP2_FilterTest"); -+ $result = PHPUnit\TextUI\TestRunner::run($suite); - } - - /** ---- php-net-ldap2-2.2.0.orig/Net_LDAP2-2.2.0/tests/Net_LDAP2_LDIFTest.php -+++ php-net-ldap2-2.2.0/Net_LDAP2-2.2.0/tests/Net_LDAP2_LDIFTest.php -@@ -91,8 +91,8 @@ class Net_LDAP2_LDIFTest extends Net_LDA - public static function main() { - require_once "PHPUnit/TextUI/TestRunner.php"; - -- $suite = new PHPUnit_Framework_TestSuite("Net_LDAP2_LDIFTest"); -- $result = PHPUnit_TextUI_TestRunner::run($suite); -+ $suite = new PHPUnit\Framework\TestSuite("Net_LDAP2_LDIFTest"); -+ $result = PHPUnit\TextUI\TestRunner::run($suite); - } - - /** ---- php-net-ldap2-2.2.0.orig/Net_LDAP2-2.2.0/tests/Net_LDAP2_RootDSETest.php -+++ php-net-ldap2-2.2.0/Net_LDAP2-2.2.0/tests/Net_LDAP2_RootDSETest.php -@@ -16,8 +16,8 @@ class Net_LDAP2_RootDSETest extends Net_ - public static function main() { - require_once "PHPUnit/TextUI/TestRunner.php"; - -- $suite = new PHPUnit_Framework_TestSuite("Net_LDAP2_RootDSETest"); -- $result = PHPUnit_TextUI_TestRunner::run($suite); -+ $suite = new PHPUnit\Framework\TestSuite("Net_LDAP2_RootDSETest"); -+ $result = PHPUnit\TextUI\TestRunner::run($suite); - } - - /** ---- php-net-ldap2-2.2.0.orig/Net_LDAP2-2.2.0/tests/Net_LDAP2_TestBase.php -+++ php-net-ldap2-2.2.0/Net_LDAP2-2.2.0/tests/Net_LDAP2_TestBase.php -@@ -1,5 +1,5 @@ - -Forwarded: not-needed (upstream is dead) - -Index: b/Net_LDAP2-2.2.0/tests/Net_LDAP2_TestBase.php -=================================================================== ---- a/Net_LDAP2-2.2.0/tests/Net_LDAP2_TestBase.php -+++ b/Net_LDAP2-2.2.0/tests/Net_LDAP2_TestBase.php -@@ -1,12 +1,12 @@ - getMessage()); - } -- return parent::assertTrue($condition, $msg); -+ parent::assertTrue($condition, $msg); - } - } - ?> diff -Nru php-net-ldap2-2.2.0/debian/patches/phpunit8.5_compatibility.patch php-net-ldap2-2.2.0/debian/patches/phpunit8.5_compatibility.patch --- php-net-ldap2-2.2.0/debian/patches/phpunit8.5_compatibility.patch 2020-03-03 14:38:30.000000000 +0000 +++ php-net-ldap2-2.2.0/debian/patches/phpunit8.5_compatibility.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,153 +0,0 @@ -Description: follow phpunit to use explicit return types - phpunit when going from 7.x to 8.5 will now break with an issue like - HTTP_Request2_Adapter_CommonNetworkTest::setUp() must be compatible with - PHPUnit\Framework\TestCase::setUp(): void in .../CommonNetworkTest.php - This is due to - https://github.com/sebastianbergmann/phpunit/commit/f5e5add13e7 - and explained here - https://github.com/sebastianbergmann/phpunit/issues/3288 - https://phpunit.de/announcements/phpunit-7.html -Forwarded: no -X-Not-Forwarded-Reason: upstream seems dead -Author: Christian Ehrhardt -Last-Update: 2020-03-03 ---- a/Net_LDAP2-2.2.0/tests/Net_LDAP2Test.php -+++ b/Net_LDAP2-2.2.0/tests/Net_LDAP2Test.php -@@ -18,7 +18,7 @@ class Net_LDAP2Test extends Net_LDAP2_Te - * - * @access protected - */ -- protected function setUp() { -+ protected function setUp(): void { - $this->ldapcfg = $this->getTestConfig(); - } - -@@ -28,7 +28,7 @@ class Net_LDAP2Test extends Net_LDAP2_Te - * - * @access protected - */ -- protected function tearDown() { -+ protected function tearDown(): void { - } - - /** ---- a/Net_LDAP2-2.2.0/tests/Net_LDAP2_EntryTest.php -+++ b/Net_LDAP2-2.2.0/tests/Net_LDAP2_EntryTest.php -@@ -34,7 +34,7 @@ class Net_LDAP2_EntryTest extends Net_LD - * - * @access protected - */ -- protected function setUp() { -+ protected function setUp(): void { - $this->ldapcfg = $this->getTestConfig(); - } - -@@ -44,7 +44,7 @@ class Net_LDAP2_EntryTest extends Net_LD - * - * @access protected - */ -- protected function tearDown() { -+ protected function tearDown(): void { - } - - /** ---- a/Net_LDAP2-2.2.0/tests/Net_LDAP2_FilterTest.php -+++ b/Net_LDAP2-2.2.0/tests/Net_LDAP2_FilterTest.php -@@ -31,7 +31,7 @@ class Net_LDAP2_FilterTest extends Net_L - * - * @access protected - */ -- protected function setUp() { -+ protected function setUp(): void { - } - - /** -@@ -40,7 +40,7 @@ class Net_LDAP2_FilterTest extends Net_L - * - * @access protected - */ -- protected function tearDown() { -+ protected function tearDown(): void { - } - - /** ---- a/Net_LDAP2-2.2.0/tests/Net_LDAP2_LDIFTest.php -+++ b/Net_LDAP2-2.2.0/tests/Net_LDAP2_LDIFTest.php -@@ -100,7 +100,7 @@ class Net_LDAP2_LDIFTest extends Net_LDA - * - * @access protected - */ -- protected function setUp() { -+ protected function setUp(): void { - // initialize test entries - $this->testentries = array(); - foreach ($this->testentries_data as $dn => $attrs) { -@@ -120,7 +120,7 @@ class Net_LDAP2_LDIFTest extends Net_LDA - * - * @access protected - */ -- protected function tearDown() { -+ protected function tearDown(): void { - // uncomment this if you debug the test cases so you will have output available - if (file_exists($this->outfile)) @unlink($this->outfile); - } ---- a/Net_LDAP2-2.2.0/tests/Net_LDAP2_RootDSETest.php -+++ b/Net_LDAP2-2.2.0/tests/Net_LDAP2_RootDSETest.php -@@ -26,7 +26,7 @@ class Net_LDAP2_RootDSETest extends Net_ - * - * @access protected - */ -- protected function setUp() { -+ protected function setUp(): void { - $this->markTestIncomplete('Test not implemented yet.'); - } - -@@ -36,7 +36,7 @@ class Net_LDAP2_RootDSETest extends Net_ - * - * @access protected - */ -- protected function tearDown() { -+ protected function tearDown(): void { - } - - /** ---- a/Net_LDAP2-2.2.0/tests/Net_LDAP2_SearchTest.php -+++ b/Net_LDAP2-2.2.0/tests/Net_LDAP2_SearchTest.php -@@ -19,7 +19,7 @@ class Net_LDAP2_SearchTest extends Net_L - * - * @access protected - */ -- protected function setUp() { -+ protected function setUp(): void { - $this->ldapcfg = $this->getTestConfig(); - } - -@@ -29,7 +29,7 @@ class Net_LDAP2_SearchTest extends Net_L - * - * @access protected - */ -- protected function tearDown() { -+ protected function tearDown():void { - } - - /** ---- a/Net_LDAP2-2.2.0/tests/Net_LDAP2_UtilTest.php -+++ b/Net_LDAP2-2.2.0/tests/Net_LDAP2_UtilTest.php -@@ -26,7 +26,7 @@ class Net_LDAP2_UtilTest extends Net_LDA - * - * @access protected - */ -- protected function setUp() { -+ protected function setUp(): void { - } - - /** -@@ -35,7 +35,7 @@ class Net_LDAP2_UtilTest extends Net_LDA - * - * @access protected - */ -- protected function tearDown() { -+ protected function tearDown(): void { - } - - /** diff -Nru php-net-ldap2-2.2.0/debian/patches/series php-net-ldap2-2.2.0/debian/patches/series --- php-net-ldap2-2.2.0/debian/patches/series 2020-03-03 14:30:12.000000000 +0000 +++ php-net-ldap2-2.2.0/debian/patches/series 2021-01-05 08:34:09.000000000 +0000 @@ -1,3 +1,3 @@ -phpunit6_compatibility.patch -phpunit7-compatibility.patch -phpunit8.5_compatibility.patch +Fix-FTBFS-with-phpunit-8.5.13-1.patch +Fix-FTBFS-with-phpunit-9.5.0-1.patch +Fix-FTBFS-with-phpunit-10.patch diff -Nru php-net-ldap2-2.2.0/debian/rules php-net-ldap2-2.2.0/debian/rules --- php-net-ldap2-2.2.0/debian/rules 2016-06-24 06:23:45.000000000 +0000 +++ php-net-ldap2-2.2.0/debian/rules 2021-01-05 08:34:09.000000000 +0000 @@ -3,11 +3,4 @@ dh $@ --buildsystem=phppear --with phppear override_dh_auto_test: -ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) phpunit --include-path Net_LDAP2-*/ Net_LDAP2-*/tests -else - @echo "** tests disabled" -endif - -get-orig-source: - uscan --rename --verbose --force diff -Nru php-net-ldap2-2.2.0/debian/salsa-ci.yml php-net-ldap2-2.2.0/debian/salsa-ci.yml --- php-net-ldap2-2.2.0/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ php-net-ldap2-2.2.0/debian/salsa-ci.yml 2021-01-05 08:34:09.000000000 +0000 @@ -0,0 +1,10 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml + +reprotest: + extends: .test-reprotest + variables: + # false-positive Net_LDAP2_LDIFTest::testConstruction + DEB_BUILD_OPTIONS: nocheck diff -Nru php-net-ldap2-2.2.0/debian/tests/control php-net-ldap2-2.2.0/debian/tests/control --- php-net-ldap2-2.2.0/debian/tests/control 2018-08-08 09:49:10.000000000 +0000 +++ php-net-ldap2-2.2.0/debian/tests/control 2021-01-05 08:34:09.000000000 +0000 @@ -1,2 +1,2 @@ Test-Command: phpunit Net_LDAP2-*/tests -Depends: @, phpunit (>= 7) +Depends: phpunit, @ diff -Nru php-net-ldap2-2.2.0/debian/upstream/metadata php-net-ldap2-2.2.0/debian/upstream/metadata --- php-net-ldap2-2.2.0/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ php-net-ldap2-2.2.0/debian/upstream/metadata 2021-01-05 08:34:09.000000000 +0000 @@ -0,0 +1,5 @@ +--- +Bug-Database: https://github.com/pear/Net_LDAP2/issues +Bug-Submit: https://github.com/pear/Net_LDAP2/issues/new +Repository: https://github.com/pear/Net_LDAP2.git +Repository-Browse: https://github.com/pear/Net_LDAP2 diff -Nru php-net-ldap2-2.2.0/debian/watch php-net-ldap2-2.2.0/debian/watch --- php-net-ldap2-2.2.0/debian/watch 2016-06-24 06:23:45.000000000 +0000 +++ php-net-ldap2-2.2.0/debian/watch 2021-01-05 08:34:09.000000000 +0000 @@ -1,2 +1,2 @@ -version=3 -http://pear.php.net/package/Net_LDAP2/download http://download.pear.php.net/package/Net_LDAP2-([\d.]+)\.tgz +version=4 +https://pear.php.net/package/Net_LDAP2/download https?://download.pear.php.net/package/Net_LDAP2-([\d.]+)\.tgz