upgrade phpunit

tests/Models/CalendarMapperTest.php

@@ -22,12 +22,10 @@ use Modules\Calendar\Models\Event;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Calendar\Models\CalendarMapper::class)]
 final class CalendarMapperTest extends \PHPUnit\Framework\TestCase
 {
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\CalendarMapper
-     * @group module
-     */
     public function testCR() : void
     {
         $calendar = new Calendar();

tests/Models/CalendarTest.php

@@ -20,6 +20,7 @@ use Modules\Calendar\Models\Event;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Calendar\Models\Calendar::class)]
 final class CalendarTest extends \PHPUnit\Framework\TestCase
 {
     private Calendar $calendar;
@@ -32,10 +33,7 @@ final class CalendarTest extends \PHPUnit\Framework\TestCase
         $this->calendar = new Calendar();
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\Calendar
-     * @group module
-     */
     public function testDefault() : void
     {
         self::assertEquals(0, $this->calendar->id);
@@ -49,40 +47,28 @@ final class CalendarTest extends \PHPUnit\Framework\TestCase
         self::assertEquals([], $this->calendar->getEventsOnDate(new \DateTime('now')));
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\Calendar
-     * @group module
-     */
     public function testDateInputOutput() : void
     {
         $this->calendar->date = new \DateTime('2000-05-05');
         self::assertEquals('2000-05-05', $this->calendar->date->format('Y-m-d'));
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\Calendar
-     * @group module
-     */
     public function testTitleInputOutput() : void
     {
         $this->calendar->name = 'Title';
         self::assertEquals('Title', $this->calendar->name);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\Calendar
-     * @group module
-     */
     public function testDescriptionInputOutput() : void
     {
         $this->calendar->description = 'Description';
         self::assertEquals('Description', $this->calendar->description);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\Calendar
-     * @group module
-     */
     public function testEventInputOutput() : void
     {
         $id   = [];
@@ -93,10 +79,7 @@ final class CalendarTest extends \PHPUnit\Framework\TestCase
         self::assertInstanceOf('\Modules\Calendar\Models\Event', $this->calendar->getEvent(1));
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\Calendar
-     * @group module
-     */
     public function testEventRemove() : void
     {
         $id      = [];
@@ -110,10 +93,7 @@ final class CalendarTest extends \PHPUnit\Framework\TestCase
         self::assertTrue($success);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\Calendar
-     * @group module
-     */
     public function testHasEventOnDate() : void
     {
         $event                  = new Event();
@@ -124,10 +104,7 @@ final class CalendarTest extends \PHPUnit\Framework\TestCase
         self::assertTrue($this->calendar->hasEventOnDate(new \DateTime('2005-10-09')));
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\Calendar
-     * @group module
-     */
     public function testGetEventsOnDate() : void
     {
         $event                  = new Event();
@@ -139,10 +116,7 @@ final class CalendarTest extends \PHPUnit\Framework\TestCase
         self::assertEquals([$event], $this->calendar->getEventsOnDate(new \DateTime('2005-10-09')));
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\Calendar
-     * @group module
-     */
     public function testSerialize() : void
     {
         $this->calendar->name        = 'Name';

tests/Models/EventMapperTest.php

@@ -21,12 +21,10 @@ use Modules\Calendar\Models\EventMapper;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Calendar\Models\EventMapper::class)]
 final class EventMapperTest extends \PHPUnit\Framework\TestCase
 {
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\EventMapper
-     * @group module
-     */
     public function testCRUD() : void
     {
         $calendarEvent1 = new Event();

tests/Models/EventTest.php

@@ -23,6 +23,7 @@ use Modules\Calendar\Models\EventType;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Calendar\Models\Event::class)]
 final class EventTest extends \PHPUnit\Framework\TestCase
 {
     private Event $event;
@@ -35,10 +36,7 @@ final class EventTest extends \PHPUnit\Framework\TestCase
         $this->event = new Event();
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\Event
-     * @group module
-     */
     public function testDefault() : void
     {
         self::assertEquals(0, $this->event->id);
@@ -51,60 +49,42 @@ final class EventTest extends \PHPUnit\Framework\TestCase
         self::assertInstanceOf('\phpOMS\Stdlib\Base\Location', $this->event->location);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\Event
-     * @group module
-     */
     public function testCreatedByInputOutput() : void
     {
         $this->event->setCreatedBy(new NullAccount(1));
         self::assertEquals(1, $this->event->getCreatedBy()->id);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\Event
-     * @group module
-     */
     public function testCalendarInputOutput() : void
     {
         $this->event->calendar = 99;
         self::assertEquals(99, $this->event->calendar);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\Event
-     * @group module
-     */
     public function testNameInputOutput() : void
     {
         $this->event->name = 'Name';
         self::assertEquals('Name', $this->event->name);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\Event
-     * @group module
-     */
     public function testDescriptionInputOutput() : void
     {
         $this->event->description = 'Description';
         self::assertEquals('Description', $this->event->description);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\Event
-     * @group module
-     */
     public function testPersonInputOutput() : void
     {
         $this->event->addPerson(new Account());
         self::assertCount(1, $this->event->getPeople());
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\Event
-     * @group module
-     */
     public function testPersonRemove() : void
     {
         $this->event->addPerson(new Account());
@@ -117,10 +97,7 @@ final class EventTest extends \PHPUnit\Framework\TestCase
         self::assertTrue($success);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\Event
-     * @group module
-     */
     public function testSerialize() : void
     {
         $this->event->name        = 'Name';

tests/Models/NullCalendarTest.php

@@ -19,31 +19,23 @@ use Modules\Calendar\Models\NullCalendar;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Calendar\Models\NullCalendar::class)]
 final class NullCalendarTest extends \PHPUnit\Framework\TestCase
 {
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\NullCalendar
-     * @group module
-     */
     public function testNull() : void
     {
         self::assertInstanceOf('\Modules\Calendar\Models\Calendar', new NullCalendar());
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\NullCalendar
-     * @group module
-     */
     public function testId() : void
     {
         $null = new NullCalendar(2);
         self::assertEquals(2, $null->id);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\NullCalendar
-     * @group module
-     */
     public function testJsonSerialize() : void
     {
         $null = new NullCalendar(2);

tests/Models/NullEventTest.php

@@ -19,31 +19,23 @@ use Modules\Calendar\Models\NullEvent;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Calendar\Models\NullEvent::class)]
 final class NullEventTest extends \PHPUnit\Framework\TestCase
 {
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\NullEvent
-     * @group module
-     */
     public function testNull() : void
     {
         self::assertInstanceOf('\Modules\Calendar\Models\Event', new NullEvent());
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\NullEvent
-     * @group module
-     */
     public function testId() : void
     {
         $null = new NullEvent(2);
         self::assertEquals(2, $null->id);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\NullEvent
-     * @group module
-     */
     public function testJsonSerialize() : void
     {
         $null = new NullEvent(2);

tests/Models/NullScheduleTest.php

@@ -19,31 +19,23 @@ use Modules\Calendar\Models\NullSchedule;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Calendar\Models\NullSchedule::class)]
 final class NullScheduleTest extends \PHPUnit\Framework\TestCase
 {
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\NullSchedule
-     * @group module
-     */
     public function testNull() : void
     {
         self::assertInstanceOf('\Modules\Calendar\Models\Schedule', new NullSchedule());
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\NullSchedule
-     * @group module
-     */
     public function testId() : void
     {
         $null = new NullSchedule(2);
         self::assertEquals(2, $null->id);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\NullSchedule
-     * @group module
-     */
     public function testJsonSerialize() : void
     {
         $null = new NullSchedule(2);

tests/Models/ScheduleTest.php

@@ -22,6 +22,7 @@ use Modules\Calendar\Models\ScheduleStatus;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Calendar\Models\Schedule::class)]
 final class ScheduleTest extends \PHPUnit\Framework\TestCase
 {
     private Schedule $schedule;
@@ -34,10 +35,7 @@ final class ScheduleTest extends \PHPUnit\Framework\TestCase
         $this->schedule = new Schedule();
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\Schedule
-     * @group module
-     */
     public function testDefault() : void
     {
         self::assertEquals(0, $this->schedule->id);
@@ -47,10 +45,7 @@ final class ScheduleTest extends \PHPUnit\Framework\TestCase
         self::assertInstanceOf('\Modules\Admin\Models\NullAccount', $this->schedule->createdBy);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Calendar\Models\Schedule
-     * @group module
-     */
     public function testSerialize() : void
     {
         $this->schedule->status       = ScheduleStatus::INACTIVE;

tests/phpunit_default.xml

@@ -1,31 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="Bootstrap.php" colors="true" columns="120" stopOnError="true" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" beStrictAboutTestsThatDoNotTestAnything="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="Bootstrap.php" colors="true" columns="120" stopOnError="true" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" beStrictAboutTestsThatDoNotTestAnything="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.0/phpunit.xsd" cacheDirectory=".phpunit.cache">
-  <coverage includeUncoveredFiles="true" processUncoveredFiles="false">
+  <coverage includeUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">../</directory>
-    </include>
-    <exclude>
-      <directory>../vendor*</directory>
-      <directory>../MainRepository*</directory>
-      <directory>../Karaka*</directory>
-      <directory>../Admin/Install/Application*</directory>
-      <directory>../phpOMS*</directory>
-      <directory>../tests*</directory>
-      <directory>../*/tests*</directory>
-      <directory>../**/tests*</directory>
-      <directory>*/tests*</directory>
-      <directory suffix="tpl.php">../*</directory>
-      <directory suffix="lang.php">../*</directory>
-      <directory suffix="Test.php">../*</directory>
-      <directory suffix="Routes.php">../*</directory>
-      <directory suffix="Hooks.php">../*</directory>
-      <directory>../**/test*</directory>
-      <directory>../**/Theme*</directory>
-      <directory>../**/Admin/Routes*</directory>
-      <directory>../**/Admin/Hooks*</directory>
-      <directory>../**/Admin/Install*</directory>
-      <directory>../Media/Files*</directory>
-    </exclude>
     <report>
       <clover outputFile="coverage.xml"/>
       <html outputDirectory="../tests" lowUpperBound="75" highLowerBound="95"/>
@@ -56,4 +31,31 @@
     <const name="WEB_SERVER_DOCROOT" value="./Karaka"/>
     <const name="RESET" value="1"/>
   </php>
+  <source>
+    <include>
+      <directory suffix=".php">../</directory>
+    </include>
+    <exclude>
+      <directory>../vendor*</directory>
+      <directory>../MainRepository*</directory>
+      <directory>../Karaka*</directory>
+      <directory>../Admin/Install/Application*</directory>
+      <directory>../phpOMS*</directory>
+      <directory>../tests*</directory>
+      <directory>../*/tests*</directory>
+      <directory>../**/tests*</directory>
+      <directory>*/tests*</directory>
+      <directory suffix="tpl.php">../*</directory>
+      <directory suffix="lang.php">../*</directory>
+      <directory suffix="Test.php">../*</directory>
+      <directory suffix="Routes.php">../*</directory>
+      <directory suffix="Hooks.php">../*</directory>
+      <directory>../**/test*</directory>
+      <directory>../**/Theme*</directory>
+      <directory>../**/Admin/Routes*</directory>
+      <directory>../**/Admin/Hooks*</directory>
+      <directory>../**/Admin/Install*</directory>
+      <directory>../Media/Files*</directory>
+    </exclude>
+  </source>
 </phpunit>