Merge branch 'wip/fix-missing-braces' into 'master'

Draft: Add missing closing braces to ldap_timestamp pattern match condition

See merge request davical-project/davical!147

.gitlab-ci.yml

@@ -11,7 +11,7 @@ build:
   script:
     - apt-get -y update
     - bash -c 'mkdir -p /usr/share/man/man{0..10}'
-    - apt-get -y install build-essential curl devscripts fakeroot dh-exec jdupes doxygen graphviz php-cli phpunit rst2pdf
+    - apt-get -y install build-essential devscripts fakeroot dh-exec jdupes doxygen graphviz php-cli phpunit rst2pdf
     - mv debian/changelog debian/changelog.old
     - >
       cat

debian/changelog

@@ -1,24 +1,3 @@
-davical (1.1.12-2.3) unstable; urgency=medium
-
-  * Non-maintainer upload
-  * No change upload for the reproducible effort
-
- -- David Prévot <taffit@debian.org>  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 <taffit@debian.org>  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 <taffit@debian.org>  Tue, 14 Jan 2025 13:45:14 +0100
-
 davical (1.1.13-1) UNRELEASED; urgency=medium
 
   * New upstream release (Closes: #1040996)

testing/phpunit/ExpansionTest.php

@@ -5,8 +5,6 @@ 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();
@@ -145,8 +143,10 @@ final class ExpansionTest extends TestCase
     '20190124T000000Z/20190124T010000Z',
   ];
 
-  #[PreserveGlobalState('enabled')]
+  /**
-  #[RunInSeparateProcess]
+   * @runInSeparateProcess
+   * @preserveGlobalState enabled
+   */
   public function testUnmodifiedCal() {
     global $base_cal;
 
@@ -156,8 +156,10 @@ final class ExpansionTest extends TestCase
     );
   }
 
-  #[PreserveGlobalState('enabled')]
+  /**
-  #[RunInSeparateProcess]
+   * @runInSeparateProcess
+   * @preserveGlobalState enabled
+   */
   public function testTueRenamed() {
     global $tuesday_renamed_cal;
 
@@ -167,8 +169,10 @@ final class ExpansionTest extends TestCase
     );
   }
 
-  #[PreserveGlobalState('enabled')]
+  /**
-  #[RunInSeparateProcess]
+   * @runInSeparateProcess
+   * @preserveGlobalState enabled
+   */
   public function testTueRenamedSwapped() {
     global $tuesday_renamed_cal_order_swapped;
 
@@ -178,8 +182,10 @@ final class ExpansionTest extends TestCase
     );
   }
 
-  #[PreserveGlobalState('enabled')]
+  /**
-  #[RunInSeparateProcess]
+   * @runInSeparateProcess
+   * @preserveGlobalState enabled
+   */
   public function testCalWithCount() {
     global $count_cal;
 

testing/phpunit/RangeTest.php

@@ -5,8 +5,6 @@ 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();
@@ -14,8 +12,10 @@ $c->rrule_loop_limit = 100;
 
 final class RangeTest extends TestCase
 {
-  #[PreserveGlobalState('enabled')]
+  /**
-  #[RunInSeparateProcess]
+   * @runInSeparateProcess
+   * @preserveGlobalState enabled
+   */
   public function testGetVCalendarRange() {
     $cal = new vCalendar("BEGIN:VCALENDAR
 PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN
@@ -52,8 +52,10 @@ END:VCALENDAR");
     self::assertEquals("20190102T072000Z", (string) $range->until->UTC());
   }
 
-  #[PreserveGlobalState('enabled')]
+  /**
-  #[RunInSeparateProcess]
+   * @runInSeparateProcess
+   * @preserveGlobalState enabled
+   */
   public function testGetVCalendarRangeTwoDayAllDay() {
     $cal = new vCalendar("BEGIN:VCALENDAR
 PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN
@@ -76,8 +78,10 @@ END:VCALENDAR");
     self::assertEquals("20190109T200000Z", (string) $range->until->UTC());
   }
 
-  #[PreserveGlobalState('enabled')]
+  /**
-  #[RunInSeparateProcess]
+   * @runInSeparateProcess
+   * @preserveGlobalState enabled
+   */
   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...
@@ -102,8 +106,10 @@ END:VCALENDAR");
     self::assertEquals("20181210T130000Z", (string) $range->until->UTC());
   }
 
-  #[PreserveGlobalState('enabled')]
+  /**
-  #[RunInSeparateProcess]
+   * @runInSeparateProcess
+   * @preserveGlobalState enabled
+   */
   public function testGetVCalendarRangeAllDayAcrossDST() {
     // When interpreted as being in Greece, this event crosses the daylight savings boundary!