update testing to PHPUnit 11 and PHP 8.2, 8.3

ulrichmathes · ulrichmathes · commit 08f478af09d6 · 2024-07-17T12:12:07.000+02:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -29,7 +29,7 @@ jobs:
 
             -
                 name: Install composer dependencies
-                run: composer install --prefer-dist --no-progress --no-suggest
+                run: composer install --prefer-dist --no-progress
 
             -
                 name: PHP Linting
@@ -45,7 +45,7 @@ jobs:
         strategy:
             max-parallel: 2
             matrix:
-                php-version: [8.0, 8.1, 8.2]
+                php-version: [8.3, 8.2]
 
         name: Unit (PHP ${{ matrix.php-version }})
         steps:
@@ -71,7 +71,7 @@ jobs:
 
             -
                 name: Install composer dependencies
-                run: composer install --prefer-dist --no-progress --no-suggest
+                run: composer install --prefer-dist --no-progress
 
             -
                 name: PHP Unit Testing
diff --git a/composer.json b/composer.json
@@ -21,9 +21,9 @@
     "require-dev": {
         "editorconfig-checker/editorconfig-checker": "^10.0",
         "squizlabs/php_codesniffer": "^3.0",
-        "phpunit/phpunit": "^9.2",
+        "phpunit/phpunit": "^11.2",
         "symfony/var-dumper": "^5.1",
-        "phpstan/phpstan": "^0.12.38"
+        "phpstan/phpstan": "^1.11"
     },
     "autoload": {
         "psr-4": {
diff --git a/tests/Unit/AbstractTestClass.php b/tests/Unit/AbstractTestClass.php
@@ -8,7 +8,7 @@
 use Sitegeist\FluidComponentsLinter\Fluid\ViewHelper\ViewHelperResolver;
 use TYPO3Fluid\Fluid\View\TemplateView;
 
-abstract class AbstractTest extends TestCase
+abstract class AbstractTestClass extends TestCase
 {
     public function createComponent(string $componentSource, bool $strictSyntax = false): Component
     {
diff --git a/tests/Unit/ComponentStructureTest.php b/tests/Unit/ComponentStructureTest.php
@@ -4,59 +4,67 @@
 
 namespace Sitegeist\FluidComponentsLinter\Tests\Unit;
 
-final class ComponentStructureTest extends AbstractTest
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
+use Sitegeist\FluidComponentsLinter\Exception\ComponentStructureException;
+use Sitegeist\FluidComponentsLinter\Exception\StrictComponentStructureException;
+use TYPO3Fluid\Fluid\Core\Parser\Exception;
+
+final class ComponentStructureTest extends AbstractTestClass
 {
-    public function dataProvider()
+    public static function dataProvider()
     {
         return [
             'fluidSyntax' => [
                 '<fc:component><fc:renderer></fc:component>',
                 false,
-                \TYPO3Fluid\Fluid\Core\Parser\Exception::class
+                Exception::class
             ],
             'missingComponent' => [
                 'some content',
                 false,
-                \Sitegeist\FluidComponentsLinter\Exception\ComponentStructureException::class
+                ComponentStructureException::class
             ],
             'missingRenderer1' => [
                 '<fc:component>some content</fc:component>',
                 false,
-                \Sitegeist\FluidComponentsLinter\Exception\ComponentStructureException::class
+                ComponentStructureException::class
             ],
             'missingRenderer2' => [
                 '<fc:component><fc:param name="a" type="string" /></fc:component>',
                 false,
-                \Sitegeist\FluidComponentsLinter\Exception\ComponentStructureException::class
+                ComponentStructureException::class
             ],
             'strictComponentStructure1' => [
                 'some content<fc:component><fc:renderer></fc:renderer></fc:component>',
                 true,
-                \Sitegeist\FluidComponentsLinter\Exception\StrictComponentStructureException::class
+                StrictComponentStructureException::class
             ],
             'strictComponentStructure2' => [
                 '<fc:component>some content<fc:renderer></fc:renderer></fc:component>',
                 true,
-                \Sitegeist\FluidComponentsLinter\Exception\StrictComponentStructureException::class
+                StrictComponentStructureException::class
             ],
             'strictComponentStructure3' => [
                 '<fc:component><fc:renderer></fc:renderer>some content</fc:component>',
                 true,
-                \Sitegeist\FluidComponentsLinter\Exception\StrictComponentStructureException::class
+                StrictComponentStructureException::class
             ],
             'strictComponentStructure4' => [
                 '<fc:component><fc:renderer></fc:renderer></fc:component>some content',
                 true,
-                \Sitegeist\FluidComponentsLinter\Exception\StrictComponentStructureException::class
+                StrictComponentStructureException::class
             ]
         ];
     }
 
-    /**
-     * @dataProvider dataProvider
-     */
-    public function testComponentStructure(string $componentSource, bool $strictSyntax, string $expectedException): void
-    {
+    #[Test]
+    #[DataProvider('dataProvider')]
+    public function testComponentStructure(
+        string $componentSource,
+        bool $strictSyntax,
+        string $expectedException
+    ): void {
         $this->expectException($expectedException);
         $this->createComponent($componentSource, $strictSyntax);
     }
diff --git a/tests/Unit/ComponentVariablesCheckTest.php b/tests/Unit/ComponentVariablesCheckTest.php
@@ -4,70 +4,71 @@
 
 namespace Sitegeist\FluidComponentsLinter\Tests\Unit;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use Sitegeist\FluidComponentsLinter\CodeQuality\Check\ComponentVariablesCheck;
 use Sitegeist\FluidComponentsLinter\CodeQuality\Issue\IssueInterface;
 
-final class ComponentVariablesCheckTest extends AbstractTest
+final class ComponentVariablesCheckTest extends AbstractTestClass
 {
-    public function dataProvider()
+    public static function dataProvider()
     {
         return [
             'requirePrefixerPrefixUsed' => [
-                $this->generateConfiguration(true, IssueInterface::SEVERITY_MAJOR, false, IssueInterface::SEVERITY_MAJOR),
+                static::generateConfiguration(true, IssueInterface::SEVERITY_MAJOR, false, IssueInterface::SEVERITY_MAJOR),
                 '<fc:component><fc:renderer>{component.prefix}</fc:renderer></fc:component>',
                 0,
                 IssueInterface::SEVERITY_MAJOR
             ],
             'requirePrefixerClassUsed' => [
-                $this->generateConfiguration(true, IssueInterface::SEVERITY_MAJOR, false, IssueInterface::SEVERITY_MAJOR),
+                static::generateConfiguration(true, IssueInterface::SEVERITY_MAJOR, false, IssueInterface::SEVERITY_MAJOR),
                 '<fc:component><fc:renderer>{component.class}</fc:renderer></fc:component>',
                 0,
                 IssueInterface::SEVERITY_MAJOR
             ],
             'requirePrefixerMinorSeverity' => [
-                $this->generateConfiguration(true, IssueInterface::SEVERITY_MINOR, false, IssueInterface::SEVERITY_MAJOR),
+                static::generateConfiguration(true, IssueInterface::SEVERITY_MINOR, false, IssueInterface::SEVERITY_MAJOR),
                 '<fc:component><fc:renderer></fc:renderer></fc:component>',
                 1,
                 IssueInterface::SEVERITY_MINOR
             ],
             'requirePrefixerDisabled' => [
-                $this->generateConfiguration(false, IssueInterface::SEVERITY_MAJOR, false, IssueInterface::SEVERITY_MAJOR),
+                static::generateConfiguration(false, IssueInterface::SEVERITY_MAJOR, false, IssueInterface::SEVERITY_MAJOR),
                 '<fc:component><fc:renderer></fc:renderer></fc:component>',
                 0,
                 IssueInterface::SEVERITY_MAJOR
             ],
 
             'requireClassClassUsed' => [
-                $this->generateConfiguration(false, IssueInterface::SEVERITY_MAJOR, true, IssueInterface::SEVERITY_MAJOR),
+                static::generateConfiguration(false, IssueInterface::SEVERITY_MAJOR, true, IssueInterface::SEVERITY_MAJOR),
                 '<fc:component><fc:renderer>{class}</fc:renderer></fc:component>',
                 0,
                 IssueInterface::SEVERITY_MAJOR
             ],
             'requireClassMinorSeverity' => [
-                $this->generateConfiguration(false, IssueInterface::SEVERITY_MAJOR, true, IssueInterface::SEVERITY_MINOR),
+                static::generateConfiguration(false, IssueInterface::SEVERITY_MAJOR, true, IssueInterface::SEVERITY_MINOR),
                 '<fc:component><fc:renderer></fc:renderer></fc:component>',
                 1,
                 IssueInterface::SEVERITY_MINOR
             ],
             'requireClassDisabled' => [
-                $this->generateConfiguration(false, IssueInterface::SEVERITY_MAJOR, false, IssueInterface::SEVERITY_MAJOR),
+                static::generateConfiguration(false, IssueInterface::SEVERITY_MAJOR, false, IssueInterface::SEVERITY_MAJOR),
                 '<fc:component><fc:renderer></fc:renderer></fc:component>',
                 0,
                 IssueInterface::SEVERITY_MAJOR
             ],
 
             'combination' => [
-                $this->generateConfiguration(true, IssueInterface::SEVERITY_MAJOR, true, IssueInterface::SEVERITY_MAJOR),
+                static::generateConfiguration(true, IssueInterface::SEVERITY_MAJOR, true, IssueInterface::SEVERITY_MAJOR),
                 '<fc:component><fc:renderer></fc:renderer></fc:component>',
                 2,
                 IssueInterface::SEVERITY_MAJOR
             ]
         ];
     }
 
-    /**
-     * @dataProvider dataProvider
-     */
+    #[Test]
+    #[DataProvider('dataProvider')]
     public function testChecksForMinimumMaximumParameterCount(
         array $configuration,
         string $componentSource,
@@ -83,7 +84,7 @@ public function testChecksForMinimumMaximumParameterCount(
         }
     }
 
-    public function generateConfiguration(
+    public static function generateConfiguration(
         bool $requirePrefixer,
         string $requirePrefixerSeverity,
         bool $requireClass,
diff --git a/tests/Unit/ContentVariableCheckTest.php b/tests/Unit/ContentVariableCheckTest.php
@@ -3,58 +3,59 @@
 
 namespace Sitegeist\FluidComponentsLinter\Tests\Unit;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use Sitegeist\FluidComponentsLinter\CodeQuality\Check\ContentVariableCheck;
 use Sitegeist\FluidComponentsLinter\CodeQuality\Issue\IssueInterface;
 
-final class ContentVariableCheckTest extends AbstractTest
+final class ContentVariableCheckTest extends AbstractTestClass
 {
-    public function dataProvider()
+    public static function dataProvider()
     {
         return [
             'rawViewHelper' => [
-                $this->generateConfiguration(true, IssueInterface::SEVERITY_MAJOR),
+                static::generateConfiguration(true, IssueInterface::SEVERITY_MAJOR),
                 '<fc:component><fc:renderer><f:format.raw>{content}</f:format.raw></fc:renderer></fc:component>',
                 0,
                 IssueInterface::SEVERITY_MAJOR
             ],
             'rawInlineViewHelper' => [
-                $this->generateConfiguration(true, IssueInterface::SEVERITY_MAJOR),
+                static::generateConfiguration(true, IssueInterface::SEVERITY_MAJOR),
                 '<fc:component><fc:renderer>{content->f:format.raw()}</fc:renderer></fc:component>',
                 0,
                 IssueInterface::SEVERITY_MAJOR
             ],
             'nestedRawViewHelper' => [
-                $this->generateConfiguration(true, IssueInterface::SEVERITY_MAJOR),
+                static::generateConfiguration(true, IssueInterface::SEVERITY_MAJOR),
                 '<fc:component><fc:renderer>
                     <f:format.raw>content<my:viewhelper>content{content}content</my:viewhelper>content</f:format.raw>
                 </fc:renderer></fc:component>',
                 0,
                 IssueInterface::SEVERITY_MAJOR
             ],
             'missingViewHelper' => [
-                $this->generateConfiguration(true, IssueInterface::SEVERITY_MAJOR),
+                static::generateConfiguration(true, IssueInterface::SEVERITY_MAJOR),
                 '<fc:component><fc:renderer>{content}</fc:renderer></fc:component>',
                 1,
                 IssueInterface::SEVERITY_MAJOR
             ],
             'minorSeverity' => [
-                $this->generateConfiguration(true, IssueInterface::SEVERITY_MINOR),
+                static::generateConfiguration(true, IssueInterface::SEVERITY_MINOR),
                 '<fc:component><fc:renderer>{content}</fc:renderer></fc:component>',
                 1,
                 IssueInterface::SEVERITY_MINOR
             ],
             'disabledCheck' => [
-                $this->generateConfiguration(false, IssueInterface::SEVERITY_MAJOR),
+                static::generateConfiguration(false, IssueInterface::SEVERITY_MAJOR),
                 '<fc:component><fc:renderer>{content}</fc:renderer></fc:component>',
                 0,
                 IssueInterface::SEVERITY_MAJOR
             ]
         ];
     }
 
-    /**
-     * @dataProvider dataProvider
-     */
+    #[Test]
+    #[DataProvider('dataProvider')]
     public function testChecksForMinimumMaximumParameterCount(
         array $configuration,
         string $componentSource,
@@ -70,7 +71,7 @@ public function testChecksForMinimumMaximumParameterCount(
         }
     }
 
-    public function generateConfiguration(bool $check, string $severity): array
+    public static function generateConfiguration(bool $check, string $severity): array
     {
         return [
             'renderer' => [
diff --git a/tests/Unit/ParamCountCheckTest.php b/tests/Unit/ParamCountCheckTest.php
@@ -3,22 +3,24 @@
 
 namespace Sitegeist\FluidComponentsLinter\Tests\Unit;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use Sitegeist\FluidComponentsLinter\CodeQuality\Check\ParamCountCheck;
 use Sitegeist\FluidComponentsLinter\CodeQuality\Issue\IssueInterface;
 
-final class ParamCountCheckTest extends AbstractTest
+final class ParamCountCheckTest extends AbstractTestClass
 {
-    public function dataProvider()
+    public static function dataProvider()
     {
         return [
             'tooFewParameters' => [
-                $this->generateConfiguration(3, 10, IssueInterface::SEVERITY_MAJOR),
+                static::generateConfiguration(3, 10, IssueInterface::SEVERITY_MAJOR),
                 '<fc:component><fc:renderer></fc:renderer></fc:component>',
                 1,
                 IssueInterface::SEVERITY_MAJOR
             ],
             'parametersInAllowedRange' => [
-                $this->generateConfiguration(3, 5, IssueInterface::SEVERITY_MAJOR),
+                static::generateConfiguration(3, 5, IssueInterface::SEVERITY_MAJOR),
                 '<fc:component>
                     <fc:param name="a" type="string" />
                     <fc:param name="b" type="string" />
@@ -29,7 +31,7 @@ public function dataProvider()
                 IssueInterface::SEVERITY_MAJOR
             ],
             'tooManyParameters' => [
-                $this->generateConfiguration(1, 5, IssueInterface::SEVERITY_MAJOR),
+                static::generateConfiguration(1, 5, IssueInterface::SEVERITY_MAJOR),
                 '<fc:component>
                     <fc:param name="a" type="string" />
                     <fc:param name="b" type="string" />
@@ -43,17 +45,16 @@ public function dataProvider()
                 IssueInterface::SEVERITY_MAJOR
             ],
             'minorSeverity' => [
-                $this->generateConfiguration(3, 10, IssueInterface::SEVERITY_MINOR),
+                static::generateConfiguration(3, 10, IssueInterface::SEVERITY_MINOR),
                 '<fc:component><fc:renderer></fc:renderer></fc:component>',
                 1,
                 IssueInterface::SEVERITY_MINOR
             ],
         ];
     }
 
-    /**
-     * @dataProvider dataProvider
-     */
+    #[Test]
+    #[DataProvider('dataProvider')]
     public function testChecksForMinimumMaximumParameterCount(
         array $configuration,
         string $componentSource,
@@ -69,7 +70,7 @@ public function testChecksForMinimumMaximumParameterCount(
         }
     }
 
-    public function generateConfiguration(int $min, int $max, string $severity): array
+    public static function generateConfiguration(int $min, int $max, string $severity): array
     {
         return [
             'params' => [

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ jobs:`
`29`	`29`
`30`	`30`	`-`
`31`	`31`	`name: Install composer dependencies`
`32`		`- run: composer install --prefer-dist --no-progress --no-suggest`
	`32`	`+ run: composer install --prefer-dist --no-progress`
`33`	`33`
`34`	`34`	`-`
`35`	`35`	`name: PHP Linting`
`@@ -45,7 +45,7 @@ jobs:`
`45`	`45`	`strategy:`
`46`	`46`	`max-parallel: 2`
`47`	`47`	`matrix:`
`48`		`- php-version: [8.0, 8.1, 8.2]`
	`48`	`+ php-version: [8.3, 8.2]`
`49`	`49`
`50`	`50`	`name: Unit (PHP ${{ matrix.php-version }})`
`51`	`51`	`steps:`
`@@ -71,7 +71,7 @@ jobs:`
`71`	`71`
`72`	`72`	`-`
`73`	`73`	`name: Install composer dependencies`
`74`		`- run: composer install --prefer-dist --no-progress --no-suggest`
	`74`	`+ run: composer install --prefer-dist --no-progress`
`75`	`75`
`76`	`76`	`-`
`77`	`77`	`name: PHP Unit Testing`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`use Sitegeist\FluidComponentsLinter\Fluid\ViewHelper\ViewHelperResolver;`
`9`	`9`	`use TYPO3Fluid\Fluid\View\TemplateView;`
`10`	`10`
`11`		`-abstract class AbstractTest extends TestCase`
	`11`	`+abstract class AbstractTestClass extends TestCase`
`12`	`12`	`{`
`13`	`13`	`public function createComponent(string $componentSource, bool $strictSyntax = false): Component`
`14`	`14`	`{`