upgrade phpunit

tests/Controller/ApiControllerTest.php

@@ -35,10 +35,10 @@ use phpOMS\System\MimeType;
 use phpOMS\Utils\TestUtils;
 
 /**
- * @testdox Modules\Surveys\tests\Controller\ApiControllerTest: Surveys api controller
- *
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Surveys\Controller\ApiController::class)]
+#[\PHPUnit\Framework\Attributes\TestDox('Modules\Surveys\tests\Controller\ApiControllerTest: Surveys api controller')]
 final class ApiControllerTest extends \PHPUnit\Framework\TestCase
 {
     protected ApplicationAbstract $app;
@@ -93,10 +93,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         TestUtils::setMember($this->module, 'app', $this->app);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Surveys\Controller\ApiController
-     * @group module
-     */
     public function testApiSurveyTemplateCreate() : void
     {
         $response = new HttpResponse();
@@ -128,10 +125,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         self::assertGreaterThan(0, $response->getDataArray('')['response']->id);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Surveys\Controller\ApiController
-     * @group module
-     */
     public function testApiSurveyTemplateCreateInvalidData() : void
     {
         $response = new HttpResponse();
@@ -144,10 +138,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         self::assertEquals(RequestStatusCode::R_400, $response->header->status);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Surveys\Controller\ApiController
-     * @group module
-     */
     public function testApiSurveyTemplateElementCreate() : void
     {
         $response = new HttpResponse();
@@ -169,10 +160,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         self::assertGreaterThan(0, $response->getDataArray('')['response']->id);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Surveys\Controller\ApiController
-     * @group module
-     */
     public function testApiSurveyTemplateElementCreateInvalidData() : void
     {
         $response = new HttpResponse();
@@ -185,10 +173,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         self::assertEquals(RequestStatusCode::R_400, $response->header->status);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Surveys\Controller\ApiController
-     * @group module
-     */
     public function testApiSurveyAnswerCreate() : void
     {
         $response = new HttpResponse();
@@ -203,10 +188,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         self::assertGreaterThan(0, $response->getDataArray('')['response']->id);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Surveys\Controller\ApiController
-     * @group module
-     */
     public function testApiSurveyAnswerCreateInvalidData() : void
     {
         $response = new HttpResponse();

tests/Models/NullSurveyTemplateElementL11nTest.php

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

tests/Models/NullSurveyTemplateElementTest.php

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

tests/Models/NullSurveyTemplateL11nTest.php

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

tests/Models/NullSurveyTemplateLabelL11nTest.php

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

tests/Models/NullSurveyTemplateTest.php

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

tests/Models/SurveyTemplateElementL11nTest.php

@@ -20,6 +20,7 @@ use phpOMS\Localization\ISO639x1Enum;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Surveys\Models\SurveyTemplateElementL11n::class)]
 final class SurveyTemplateElementL11nTest extends \PHPUnit\Framework\TestCase
 {
     private SurveyTemplateElementL11n $l11n;
@@ -32,10 +33,7 @@ final class SurveyTemplateElementL11nTest extends \PHPUnit\Framework\TestCase
         $this->l11n = new SurveyTemplateElementL11n();
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Surveys\Models\SurveyTemplateElementL11n
-     * @group module
-     */
     public function testDefault() : void
     {
         self::assertEquals(0, $this->l11n->id);
@@ -45,30 +43,21 @@ final class SurveyTemplateElementL11nTest extends \PHPUnit\Framework\TestCase
         self::assertEquals(ISO639x1Enum::_EN, $this->l11n->language);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Surveys\Models\SurveyTemplateElementL11n
-     * @group module
-     */
     public function testTextInputOutput() : void
     {
         $this->l11n->text = 'TestName';
         self::assertEquals('TestName', $this->l11n->text);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Surveys\Models\SurveyTemplateElementL11n
-     * @group module
-     */
     public function testDescriptionInputOutput() : void
     {
         $this->l11n->description = 'TestContent';
         self::assertEquals('TestContent', $this->l11n->description);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Surveys\Models\SurveyTemplateElementL11n
-     * @group module
-     */
     public function testSerialize() : void
     {
         $this->l11n->text             = 'Title';

tests/Models/SurveyTemplateElementTest.php

@@ -22,6 +22,7 @@ use Modules\Surveys\Models\SurveyTemplateLabelL11n;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Surveys\Models\SurveyTemplateElement::class)]
 final class SurveyTemplateElementTest extends \PHPUnit\Framework\TestCase
 {
     private SurveyTemplateElement $element;
@@ -34,10 +35,7 @@ final class SurveyTemplateElementTest extends \PHPUnit\Framework\TestCase
         $this->element = new SurveyTemplateElement();
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Surveys\Models\SurveyTemplateElement
-     * @group module
-     */
     public function testDefault() : void
     {
         self::assertEquals(0, $this->element->id);
@@ -48,40 +46,28 @@ final class SurveyTemplateElementTest extends \PHPUnit\Framework\TestCase
         self::assertInstanceOf('\Modules\Surveys\Models\SurveyTemplateElementL11n', $this->element->getL11n());
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Surveys\Models\SurveyTemplateElement
-     * @group module
-     */
     public function testL11nInputOutput() : void
     {
         $this->element->setL11n(new SurveyTemplateElementL11n('NewTest'));
         self::assertEquals('NewTest', $this->element->getL11n()->text);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Surveys\Models\SurveyTemplateElement
-     * @group module
-     */
     public function testLabelInputOutput() : void
     {
         $this->element->addLabel(new SurveyTemplateLabelL11n());
         self::assertCount(1, $this->element->getLabels());
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Surveys\Models\SurveyTemplateElement
-     * @group module
-     */
     public function testValueInputOutput() : void
     {
         $this->element->addValue('testValue');
         self::assertCount(1, $this->element->getValues());
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Surveys\Models\SurveyTemplateElement
-     * @group module
-     */
     public function testSerialize() : void
     {
         $this->element->isOptional = true;

tests/Models/SurveyTemplateL11nTest.php

@@ -20,6 +20,7 @@ use phpOMS\Localization\ISO639x1Enum;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Surveys\Models\SurveyTemplateL11n::class)]
 final class SurveyTemplateL11nTest extends \PHPUnit\Framework\TestCase
 {
     private SurveyTemplateL11n $l11n;
@@ -32,10 +33,7 @@ final class SurveyTemplateL11nTest extends \PHPUnit\Framework\TestCase
         $this->l11n = new SurveyTemplateL11n();
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Surveys\Models\SurveyTemplateL11n
-     * @group module
-     */
     public function testDefault() : void
     {
         self::assertEquals(0, $this->l11n->id);
@@ -45,30 +43,21 @@ final class SurveyTemplateL11nTest extends \PHPUnit\Framework\TestCase
         self::assertEquals(ISO639x1Enum::_EN, $this->l11n->language);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Surveys\Models\SurveyTemplateL11n
-     * @group module
-     */
     public function testTextInputOutput() : void
     {
         $this->l11n->title = 'TestName';
         self::assertEquals('TestName', $this->l11n->title);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Surveys\Models\SurveyTemplateL11n
-     * @group module
-     */
     public function testDescriptionInputOutput() : void
     {
         $this->l11n->description = 'TestContent';
         self::assertEquals('TestContent', $this->l11n->description);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Surveys\Models\SurveyTemplateL11n
-     * @group module
-     */
     public function testSerialize() : void
     {
         $this->l11n->title            = 'Title';

tests/Models/SurveyTemplateLabelL11nTest.php

@@ -20,6 +20,7 @@ use phpOMS\Localization\ISO639x1Enum;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Surveys\Models\SurveyTemplateLabelL11n::class)]
 final class SurveyTemplateLabelL11nTest extends \PHPUnit\Framework\TestCase
 {
     private SurveyTemplateLabelL11n $l11n;
@@ -32,10 +33,7 @@ final class SurveyTemplateLabelL11nTest extends \PHPUnit\Framework\TestCase
         $this->l11n = new SurveyTemplateLabelL11n();
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Surveys\Models\SurveyTemplateLabelL11n
-     * @group module
-     */
     public function testDefault() : void
     {
         self::assertEquals(0, $this->l11n->id);
@@ -43,20 +41,14 @@ final class SurveyTemplateLabelL11nTest extends \PHPUnit\Framework\TestCase
         self::assertEquals(ISO639x1Enum::_EN, $this->l11n->language);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Surveys\Models\SurveyTemplateLabelL11n
-     * @group module
-     */
     public function testTextInputOutput() : void
     {
         $this->l11n->title = 'TestName';
         self::assertEquals('TestName', $this->l11n->title);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Surveys\Models\SurveyTemplateLabelL11n
-     * @group module
-     */
     public function testSerialize() : void
     {
         $this->l11n->title    = 'Title';

tests/Models/SurveyTemplateTest.php

@@ -21,6 +21,7 @@ use Modules\Surveys\Models\SurveyTemplateL11n;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Surveys\Models\SurveyTemplate::class)]
 final class SurveyTemplateTest extends \PHPUnit\Framework\TestCase
 {
     private SurveyTemplate $survey;
@@ -33,10 +34,7 @@ final class SurveyTemplateTest extends \PHPUnit\Framework\TestCase
         $this->survey = new SurveyTemplate();
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Surveys\Models\SurveyTemplate
-     * @group module
-     */
     public function testDefault() : void
     {
         self::assertEquals(0, $this->survey->id);
@@ -47,20 +45,14 @@ final class SurveyTemplateTest extends \PHPUnit\Framework\TestCase
         self::assertEquals([], $this->survey->files);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Surveys\Models\SurveyTemplate
-     * @group module
-     */
     public function testL11nInputOutput() : void
     {
         $this->survey->setL11n(new SurveyTemplateL11n('NewTest'));
         self::assertEquals('NewTest', $this->survey->getL11n()->title);
     }
 
-    /**
+    #[\PHPUnit\Framework\Attributes\Group('module')]
-     * @covers \Modules\Surveys\Models\SurveyTemplate
-     * @group module
-     */
     public function testSerialize() : void
     {
         $this->survey->hasPublicResult = false;

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>