diff --git a/debian/changelog b/debian/changelog index a5eaf7c5..4b0072fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,24 @@ +davical (1.1.12-2.3) unstable; urgency=medium + + * Non-maintainer upload + * No change upload for the reproducible effort + + -- David Prévot Wed, 26 Nov 2025 08:37:04 +0100 + +davical (1.1.12-2.2) unstable; urgency=medium + + * Non-maintainer upload + * Update latest patch to PHPUnit 12 syntax (Closes: #1099659) + + -- David Prévot Thu, 25 Sep 2025 08:27:38 +0200 + +davical (1.1.12-2.1) unstable; urgency=medium + + * Non-maintainer upload + * Add support for PHPUnit 10 (Closes: #1039746) + + -- David Prévot Tue, 14 Jan 2025 13:45:14 +0100 + davical (1.1.13-1) UNRELEASED; urgency=medium * New upstream release (Closes: #1040996) diff --git a/testing/phpunit/ExpansionTest.php b/testing/phpunit/ExpansionTest.php index 7e5bf842..a6ab0b02 100644 --- a/testing/phpunit/ExpansionTest.php +++ b/testing/phpunit/ExpansionTest.php @@ -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,10 +145,8 @@ final class ExpansionTest extends TestCase '20190124T000000Z/20190124T010000Z', ]; - /** - * @runInSeparateProcess - * @preserveGlobalState enabled - */ + #[PreserveGlobalState('enabled')] + #[RunInSeparateProcess] public function testUnmodifiedCal() { global $base_cal; @@ -156,10 +156,8 @@ final class ExpansionTest extends TestCase ); } - /** - * @runInSeparateProcess - * @preserveGlobalState enabled - */ + #[PreserveGlobalState('enabled')] + #[RunInSeparateProcess] public function testTueRenamed() { global $tuesday_renamed_cal; @@ -169,10 +167,8 @@ final class ExpansionTest extends TestCase ); } - /** - * @runInSeparateProcess - * @preserveGlobalState enabled - */ + #[PreserveGlobalState('enabled')] + #[RunInSeparateProcess] public function testTueRenamedSwapped() { global $tuesday_renamed_cal_order_swapped; @@ -182,10 +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 7c68d7a8..99acb1a2 100644 --- a/testing/phpunit/RangeTest.php +++ b/testing/phpunit/RangeTest.php @@ -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,10 +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 @@ -52,10 +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 @@ -78,10 +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... @@ -106,10 +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!