Control: tags 1099659 + pending Dear maintainer,
I've prepared an NMU for davical (versioned as 1.1.12-2.2) and uploaded it to DELAYED/5. Please feel free to tell me if I should cancel it. Regards.
diffstat for davical-1.1.12 davical-1.1.12 changelog | 7 + patches/0003-Add-support-for-phpunit-10.patch | 98 ++++++++++++-------------- 2 files changed, 55 insertions(+), 50 deletions(-) diff -Nru davical-1.1.12/debian/changelog davical-1.1.12/debian/changelog --- davical-1.1.12/debian/changelog 2025-01-14 13:45:14.000000000 +0100 +++ davical-1.1.12/debian/changelog 2025-09-25 08:27:38.000000000 +0200 @@ -1,3 +1,10 @@ +davical (1.1.12-2.2) unstable; urgency=medium + + * Non-maintainer upload + * Update latest patch to PHPUnit 12 syntax (Closes: #1099659) + + -- David Prévot <[email protected]> Thu, 25 Sep 2025 08:27:38 +0200 + davical (1.1.12-2.1) unstable; urgency=medium * Non-maintainer upload diff -Nru davical-1.1.12/debian/patches/0003-Add-support-for-phpunit-10.patch davical-1.1.12/debian/patches/0003-Add-support-for-phpunit-10.patch --- davical-1.1.12/debian/patches/0003-Add-support-for-phpunit-10.patch 2025-01-14 13:40:48.000000000 +0100 +++ davical-1.1.12/debian/patches/0003-Add-support-for-phpunit-10.patch 2025-09-25 08:27:10.000000000 +0200 @@ -4,111 +4,109 @@ In phpunit 10, global states are no longer preserved by default [1]. -* https://bugs.debian.org/1039746 +Bugs-Debian: https://bugs.debian.org/1039746 https://bugs.debian.org/1099659 [1] https://github.com/sebastianbergmann/phpunit/blob/10.0.0/ChangeLog-10.0.md#changed - -Origin: upstream, https://gitlab.com/davical-project/davical/-/commit/0502860a9543567e35bf4a770315c03220672c31 -Bug: https://gitlab.com/davical-project/davical/-/merge_requests/115 -Bug-Debian: https://bugs.debian.org/1039746 --- - testing/phpunit/ExpansionTest.php | 16 ++++++++++++++++ - testing/phpunit/RangeTest.php | 16 ++++++++++++++++ - 2 files changed, 32 insertions(+) + testing/phpunit/ExpansionTest.php | 10 ++++++++++ + testing/phpunit/RangeTest.php | 10 ++++++++++ + 2 files changed, 20 insertions(+) diff --git a/testing/phpunit/ExpansionTest.php b/testing/phpunit/ExpansionTest.php -index 5a71318..7e5bf84 100644 +index 5a71318..a6ab0b0 100644 --- a/testing/phpunit/ExpansionTest.php +++ b/testing/phpunit/ExpansionTest.php -@@ -143,6 +143,10 @@ final class ExpansionTest extends TestCase +@@ -5,6 +5,8 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '/usr/share/awl/inc' . PA + require_once('RRule.php'); + require_once('vCalendar.php'); + ++use PHPUnit\Framework\Attributes\PreserveGlobalState; ++use PHPUnit\Framework\Attributes\RunInSeparateProcess; + use PHPUnit\Framework\TestCase; + + $c = (object) array(); +@@ -143,6 +145,8 @@ final class ExpansionTest extends TestCase '20190124T000000Z/20190124T010000Z', ]; -+ /** -+ * @runInSeparateProcess -+ * @preserveGlobalState enabled -+ */ ++ #[PreserveGlobalState('enabled')] ++ #[RunInSeparateProcess] public function testUnmodifiedCal() { global $base_cal; -@@ -152,6 +156,10 @@ final class ExpansionTest extends TestCase +@@ -152,6 +156,8 @@ final class ExpansionTest extends TestCase ); } -+ /** -+ * @runInSeparateProcess -+ * @preserveGlobalState enabled -+ */ ++ #[PreserveGlobalState('enabled')] ++ #[RunInSeparateProcess] public function testTueRenamed() { global $tuesday_renamed_cal; -@@ -161,6 +169,10 @@ final class ExpansionTest extends TestCase +@@ -161,6 +167,8 @@ final class ExpansionTest extends TestCase ); } -+ /** -+ * @runInSeparateProcess -+ * @preserveGlobalState enabled -+ */ ++ #[PreserveGlobalState('enabled')] ++ #[RunInSeparateProcess] public function testTueRenamedSwapped() { global $tuesday_renamed_cal_order_swapped; -@@ -170,6 +182,10 @@ final class ExpansionTest extends TestCase +@@ -170,6 +178,8 @@ final class ExpansionTest extends TestCase ); } -+ /** -+ * @runInSeparateProcess -+ * @preserveGlobalState enabled -+ */ ++ #[PreserveGlobalState('enabled')] ++ #[RunInSeparateProcess] public function testCalWithCount() { global $count_cal; diff --git a/testing/phpunit/RangeTest.php b/testing/phpunit/RangeTest.php -index 5b865d5..7c68d7a 100644 +index 5b865d5..99acb1a 100644 --- a/testing/phpunit/RangeTest.php +++ b/testing/phpunit/RangeTest.php -@@ -12,6 +12,10 @@ $c->rrule_loop_limit = 100; +@@ -5,6 +5,8 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '/usr/share/awl/inc' . PA + require_once('RRule.php'); + require_once('vCalendar.php'); + ++use PHPUnit\Framework\Attributes\PreserveGlobalState; ++use PHPUnit\Framework\Attributes\RunInSeparateProcess; + use PHPUnit\Framework\TestCase; + + $c = (object) array(); +@@ -12,6 +14,8 @@ $c->rrule_loop_limit = 100; final class RangeTest extends TestCase { -+ /** -+ * @runInSeparateProcess -+ * @preserveGlobalState enabled -+ */ ++ #[PreserveGlobalState('enabled')] ++ #[RunInSeparateProcess] public function testGetVCalendarRange() { $cal = new vCalendar("BEGIN:VCALENDAR PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN -@@ -48,6 +52,10 @@ END:VCALENDAR"); +@@ -48,6 +52,8 @@ END:VCALENDAR"); self::assertEquals("20190102T072000Z", (string) $range->until->UTC()); } -+ /** -+ * @runInSeparateProcess -+ * @preserveGlobalState enabled -+ */ ++ #[PreserveGlobalState('enabled')] ++ #[RunInSeparateProcess] public function testGetVCalendarRangeTwoDayAllDay() { $cal = new vCalendar("BEGIN:VCALENDAR PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN -@@ -70,6 +78,10 @@ END:VCALENDAR"); +@@ -70,6 +76,8 @@ END:VCALENDAR"); self::assertEquals("20190109T200000Z", (string) $range->until->UTC()); } -+ /** -+ * @runInSeparateProcess -+ * @preserveGlobalState enabled -+ */ ++ #[PreserveGlobalState('enabled')] ++ #[RunInSeparateProcess] public function testGetVCalendarRangeFloating() { // When interpreted as being in Greece, this event crosses the daylight savings boundary! // TODO deal with how that affects all-day events... -@@ -94,6 +106,10 @@ END:VCALENDAR"); +@@ -94,6 +102,8 @@ END:VCALENDAR"); self::assertEquals("20181210T130000Z", (string) $range->until->UTC()); } -+ /** -+ * @runInSeparateProcess -+ * @preserveGlobalState enabled -+ */ ++ #[PreserveGlobalState('enabled')] ++ #[RunInSeparateProcess] public function testGetVCalendarRangeAllDayAcrossDST() { // When interpreted as being in Greece, this event crosses the daylight savings boundary!
signature.asc
Description: PGP signature
