Improve testing on TYPO3 12

Build/Scripts/test.sh

@@ -89,8 +89,8 @@ runFunctionalTests () {
     ./runTests.sh -p ${PHP_VERSION} -s composerValidate || exit 1 ; \
         EXIT_CODE_VALIDATE=$?
 
-#    ./runTests.sh -p ${PHP_VERSION} -d sqlite -s functional Tests/Functional || exit 1 ; \
-#        EXIT_CODE_FUNCTIONAL=$?
+    ./runTests.sh -p ${PHP_VERSION} -d sqlite -s functional Tests/Functional || exit 1 ; \
+        EXIT_CODE_FUNCTIONAL=$?
 
     ./runTests.sh -p ${PHP_VERSION} -d sqlite -s unit Tests/Unit || exit 1 ; \
         EXIT_CODE_FUNCTIONAL=$?

Tests/Functional/AbstractTestBase.php

@@ -153,7 +153,7 @@ public function createRecord(string $tableName, array $insertArray): string
         return $connection->lastInsertId($tableName);
     }
 
-    public function loginFrontEndUser(int $frontEndUserUid)
+    public function loginFrontEndUser(int $frontEndUserUid): void
     {
         if ($frontEndUserUid === 0) {
             throw new \InvalidArgumentException('The user ID must be > 0.', 1334439475);
@@ -176,7 +176,7 @@ public function loginFrontEndUser(int $frontEndUserUid)
         $context->setAspect('frontend.user', $userAspect);
     }
 
-    public function createEmptyFrontendUser()
+    public function createEmptyFrontendUser(): void
     {
         $this->frontendUser = GeneralUtility::makeInstance(FrontendUserAuthentication::class);
 
@@ -192,16 +192,12 @@ public function createEmptyFrontendUser()
     public function getPrivateMethod($object, $methodName): \ReflectionMethod
     {
         $classReflection = new \ReflectionClass($object);
-        $methodReflection = $classReflection->getMethod($methodName);
-        $methodReflection->setAccessible(true);
-        return $methodReflection;
+        return $classReflection->getMethod($methodName);
     }
 
     public function getPrivateProperty($object, $propertyName): \ReflectionProperty
     {
         $classReflection = new \ReflectionClass($object);
-        $propertyReflection = $classReflection->getProperty($propertyName);
-        $propertyReflection->setAccessible(true);
-        return $propertyReflection;
+        return $classReflection->getProperty($propertyName);
     }
 }

Tests/Functional/Controller/FeuserCreateControllerTest.php

@@ -19,9 +19,11 @@
 use Evoweb\SfRegister\Tests\Functional\AbstractTestBase;
 use Evoweb\SfRegister\Tests\Functional\Mock\FeuserCreateController;
 use Evoweb\SfRegister\Validation\Validator\UserValidator;
+use PHPUnit\Framework\Attributes\Test;
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\TypoScript\TypoScriptService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Mvc\Controller\Arguments;
 use TYPO3\CMS\Extbase\Mvc\Request;
 use TYPO3\CMS\Extbase\Reflection\ReflectionService;
 use TYPO3\CMS\Extbase\Validation\ValidatorResolver;
@@ -39,10 +41,8 @@ public function setUp(): void
         $this->request = $this->initializeTypoScriptFrontendController();
     }
 
-    /**
-     * @test
-     */
-    public function isUserValidatorSet()
+    #[Test]
+    public function isUserValidatorSet(): void
     {
         $this->typoScriptFrontendController->tmpl->setup['plugin.']['tx_sfregister.']['settings.'] = [
             'fields' => [
@@ -89,9 +89,9 @@ public function isUserValidatorSet()
 
         /** @var Request $request */
         $request = $this->getAccessibleMock(Request::class);
-        $request->setArgument('action', 'preview');
-        $request->setArgument('controller', 'FeuserCreate');
-        $request->setArgument('user', [
+        $request = $request->withArgument('action', 'preview');
+        $request = $request->withArgument('controller', 'FeuserCreate');
+        $request = $request->withArgument('user', [
             'gender' => 1,
             'title' => 'none',
             'firstName' => '',
@@ -116,7 +116,7 @@ public function isUserValidatorSet()
         $subject->call('initializeActionMethodArguments');
         $subject->call('initializeActionMethodValidators');
 
-        /** @var \TYPO3\CMS\Extbase\Mvc\Controller\Arguments $arguments */
+        /** @var Arguments $arguments */
         $arguments = $subject->get('arguments');
         $validator = $arguments->getArgument('user')->getValidator();
 

Tests/Functional/Controller/FeuserPasswordControllerTest.php

@@ -21,6 +21,7 @@
 use Evoweb\SfRegister\Services\File;
 use Evoweb\SfRegister\Services\Session;
 use Evoweb\SfRegister\Tests\Functional\AbstractTestBase;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\NullLogger;
 use TYPO3\CMS\Core\Context\Context;
@@ -40,10 +41,8 @@ public function setUp(): void
         $this->importCSVDataSet(__DIR__ . '/../Fixtures/fe_users.csv');
     }
 
-    /**
-     * @test
-     */
-    public function userIsLoggedInReturnsFalseIfNotLoggedIn()
+    #[Test]
+    public function userIsLoggedInReturnsFalseIfNotLoggedIn(): void
     {
         $this->createEmptyFrontendUser();
         $this->request = $this->initializeTypoScriptFrontendController();
@@ -82,10 +81,8 @@ public function userIsLoggedInReturnsFalseIfNotLoggedIn()
         self::assertFalse($method->invoke($subject));
     }
 
-    /**
-     * @test
-     */
-    public function userIsLoggedInReturnsTrueIfLoggedIn()
+    #[Test]
+    public function userIsLoggedInReturnsTrueIfLoggedIn(): void
     {
         $this->createAndLoginFrontEndUser('2', [
             'password' => 'testOld',
@@ -127,10 +124,8 @@ public function userIsLoggedInReturnsTrueIfLoggedIn()
         self::assertTrue($method->invoke($subject));
     }
 
-    /**
-     * @test
-     */
-    public function saveActionFetchUserObjectIfLoggedInSetsThePasswordAndCallsUpdateOnUserRepository()
+    #[Test]
+    public function saveActionFetchUserObjectIfLoggedInSetsThePasswordAndCallsUpdateOnUserRepository(): void
     {
         if (!defined('PASSWORD_ARGON2I')) {
             self::markTestSkipped('Due to missing Argon2 in travisci.');

Tests/Functional/Domain/Repository/FrontendUserRepositoryTest.php

@@ -16,6 +16,7 @@
 use Evoweb\SfRegister\Domain\Model\FrontendUser;
 use Evoweb\SfRegister\Domain\Repository\FrontendUserRepository;
 use Evoweb\SfRegister\Tests\Functional\AbstractTestBase;
+use PHPUnit\Framework\Attributes\Test;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 class FrontendUserRepositoryTest extends AbstractTestBase
@@ -35,12 +36,11 @@ public function setUp(): void
     public function tearDown(): void
     {
         unset($this->subject);
+        parent::tearDown();
     }
 
-    /**
-     * @test
-     */
-    public function findByUid()
+    #[Test]
+    public function findByUid(): void
     {
         /** @var FrontendUser $user */
         $user = $this->subject->findByUid(1);

Tests/Functional/Mock/FeuserCreateController.php

@@ -2,7 +2,10 @@
 
 namespace Evoweb\SfRegister\Tests\Functional\Mock;
 
-class FeuserCreateController extends \Evoweb\SfRegister\Controller\FeuserCreateController
+use Evoweb\SfRegister\Controller\FeuserCreateController as BaseFeuserCreateController;
+use Evoweb\SfRegister\Tests\Functional\SettableCallable;
+
+class FeuserCreateController extends BaseFeuserCreateController
 {
-    use \Evoweb\SfRegister\Tests\Functional\SettableCallable;
+    use SettableCallable;
 }

Tests/Functional/SettableCallable.php

@@ -4,22 +4,17 @@
 
 trait SettableCallable
 {
-    /**
-     * @param string $name
-     *
-     * @return mixed
-     */
-    public function get(string $name)
+    public function get(string $name): mixed
     {
         return $this->{$name};
     }
 
-    public function set(string $name, $value)
+    public function set(string $name, mixed $value): void
     {
         $this->{$name} = $value;
     }
 
-    public function call(string $name)
+    public function call(string $name): void
     {
         $this->{$name}();
     }

Tests/Functional/Validation/Validator/BadWordValidatorTest.php

@@ -15,6 +15,7 @@
 
 use Evoweb\SfRegister\Tests\Functional\AbstractTestBase;
 use Evoweb\SfRegister\Validation\Validator\BadWordValidator;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use TYPO3\CMS\Core\Localization\LanguageServiceFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -52,25 +53,22 @@ public function setUp(): void
     public function tearDown(): void
     {
         unset($this->subject);
+        parent::tearDown();
     }
 
-    /**
-     * @test
-     */
-    public function settingsContainsValidTyposcriptSettings()
+    #[Test]
+    public function settingsContainsValidTyposcriptSettings(): void
     {
         self::assertArrayHasKey(
             'badWordList',
             $this->subject->_get('settings')
         );
     }
 
-    /**
-     * @test
-     */
-    public function isValidReturnsFalseForWordOnBadwordlist()
+    #[Test]
+    public function isValidReturnsFalseForWordOnBadwordlist(): void
     {
-        $controller = $this->request->getAttribute('frontend.controller', null);
+        $controller = $this->request->getAttribute('frontend.controller');
         $words = GeneralUtility::trimExplode(
             ',',
             $controller->tmpl->setup['plugin.']['tx_sfregister.']['settings.']['badWordList']
@@ -81,10 +79,8 @@ public function isValidReturnsFalseForWordOnBadwordlist()
         self::assertTrue($this->subject->validate(current($words))->hasErrors());
     }
 
-    /**
-     * @test
-     */
-    public function isValidReturnsTrueForGoodPassword()
+    #[Test]
+    public function isValidReturnsTrueForGoodPassword(): void
     {
         self::assertFalse($this->subject->validate('4dw$koL')->hasErrors());
     }

Tests/Functional/Validation/Validator/EqualCurrentPasswordValidatorTest.php

@@ -16,6 +16,7 @@
 use Evoweb\SfRegister\Domain\Repository\FrontendUserRepository;
 use Evoweb\SfRegister\Tests\Functional\AbstractTestBase;
 use Evoweb\SfRegister\Validation\Validator\EqualCurrentPasswordValidator;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -34,10 +35,8 @@ public function setUp(): void
         $this->request = $this->initializeTypoScriptFrontendController();
     }
 
-    /**
-     * @test
-     */
-    public function settingsContainsValidTyposcriptSettings()
+    #[Test]
+    public function settingsContainsValidTyposcriptSettings(): void
     {
         $typoScriptSetup = $this->request->getAttribute('frontend.typoscript')->getSetupArray();
         self::assertArrayHasKey(
@@ -46,10 +45,8 @@ public function settingsContainsValidTyposcriptSettings()
         );
     }
 
-    /**
-     * @test
-     */
-    public function isUserLoggedInReturnsFalseIfNotLoggedIn()
+    #[Test]
+    public function isUserLoggedInReturnsFalseIfNotLoggedIn(): void
     {
         /** @var Context $context */
         $context = GeneralUtility::makeInstance(Context::class);
@@ -66,10 +63,8 @@ public function isUserLoggedInReturnsFalseIfNotLoggedIn()
         self::assertFalse($method->invoke($subject));
     }
 
-    /**
-     * @test
-     */
-    public function isUserLoggedInReturnsTrueIfLoggedIn()
+    #[Test]
+    public function isUserLoggedInReturnsTrueIfLoggedIn(): void
     {
         $this->createAndLoginFrontEndUser('2', [
             'password' => 'testOld',

Tests/Unit/Domain/Model/PasswordTest.php

@@ -30,6 +30,7 @@ public function setUp(): void
     public function tearDown(): void
     {
         unset($this->subject);
+        parent::tearDown();
     }
 
     #[Test]

Tests/Unit/Validation/Validator/IsTrueValidatorTest.php

@@ -33,6 +33,7 @@ public function setUp(): void
     public function tearDown(): void
     {
         unset($this->subject);
+        parent::tearDown();
     }
 
     #[Test]