From a0ceca5099cb9d27beec804410f4626c442086b4 Mon Sep 17 00:00:00 2001 From: Florian Schuhmann Date: Thu, 24 Apr 2025 09:05:11 +0200 Subject: [PATCH 1/3] [FEATURE] Use a ConfigurationInterface to add the ability to extend/override the configuration by an extension with di config. --- Classes/Configuration.php | 10 ++++---- Classes/ConfigurationInterface.php | 24 +++++++++++++++++++ Classes/Service/Api.php | 9 +++---- .../ViewHelpers/ConfigurationViewHelper.php | 5 ++-- Configuration/Services.yaml | 4 ++++ 5 files changed, 40 insertions(+), 12 deletions(-) create mode 100644 Classes/ConfigurationInterface.php diff --git a/Classes/Configuration.php b/Classes/Configuration.php index 34bd68a..fb36c76 100644 --- a/Classes/Configuration.php +++ b/Classes/Configuration.php @@ -6,10 +6,9 @@ use TYPO3\CMS\Core\Core\Environment; use TYPO3\CMS\Core\Http\ServerRequest; -use TYPO3\CMS\Core\Site\Entity\Site; use TYPO3\CMS\Core\Utility\GeneralUtility; -class Configuration +class Configuration implements ConfigurationInterface { public const DEFAULT_JS_PATH = 'EXT:friendlycaptcha_official/Resources/Public/JavaScript/lib/sdk@0.1.8-site.compat.min.js'; @@ -20,11 +19,10 @@ class Configuration protected string $jsPath = ''; protected bool $skipDevValidation = false; - public function __construct(Site $site = null) + public function __construct() { - if ($site === null) { - $site = $GLOBALS['TYPO3_REQUEST']->getAttribute('site'); - } + $site = $GLOBALS['TYPO3_REQUEST']->getAttribute('site'); + if ($site === null) { return; } diff --git a/Classes/ConfigurationInterface.php b/Classes/ConfigurationInterface.php new file mode 100644 index 0000000..b1df363 --- /dev/null +++ b/Classes/ConfigurationInterface.php @@ -0,0 +1,24 @@ +factory = $factory; $this->client = $client; $this->logger = $logger; - $this->configuration = new Configuration(); + $this->configuration = $configuration; } public function verify(string $response = ''): bool diff --git a/Classes/ViewHelpers/ConfigurationViewHelper.php b/Classes/ViewHelpers/ConfigurationViewHelper.php index ea05c4f..312c7a6 100644 --- a/Classes/ViewHelpers/ConfigurationViewHelper.php +++ b/Classes/ViewHelpers/ConfigurationViewHelper.php @@ -4,7 +4,8 @@ namespace StudioMitte\FriendlyCaptcha\ViewHelpers; -use StudioMitte\FriendlyCaptcha\Configuration; +use StudioMitte\FriendlyCaptcha\ConfigurationInterface; +use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper; use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; @@ -14,7 +15,7 @@ class ConfigurationViewHelper extends AbstractViewHelper public static function render() { - $configuration = new Configuration(); + $configuration = GeneralUtility::makeInstance(ConfigurationInterface::class); return [ 'siteKey' => $configuration->getSiteKey(), 'verifyUrl' => $configuration->getVerifyUrl(), diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml index e7df2ac..0ded971 100644 --- a/Configuration/Services.yaml +++ b/Configuration/Services.yaml @@ -9,3 +9,7 @@ services: StudioMitte\FriendlyCaptcha\Service\Api: public: true + + StudioMitte\FriendlyCaptcha\ConfigurationInterface: + alias: StudioMitte\FriendlyCaptcha\Configuration + public: true From 2f866b9426e88431263b9db13e5977c9feb2ebe4 Mon Sep 17 00:00:00 2001 From: Florian Schuhmann Date: Tue, 29 Sep 2026 15:59:33 +0200 Subject: [PATCH 2/3] Fix Friendly Captcha ViewHelper configuration injection Inject ConfigurationInterface in the ViewHelper so the DI binding is respected and unit tests can exercise the output without booting the application container. --- Classes/ViewHelpers/ConfigurationViewHelper.php | 16 +++++++++------- .../ViewHelpers/ConfigurationViewHelperTest.php | 13 ++++++++----- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Classes/ViewHelpers/ConfigurationViewHelper.php b/Classes/ViewHelpers/ConfigurationViewHelper.php index 835495d..9d614a2 100644 --- a/Classes/ViewHelpers/ConfigurationViewHelper.php +++ b/Classes/ViewHelpers/ConfigurationViewHelper.php @@ -5,20 +5,22 @@ namespace StudioMitte\FriendlyCaptcha\ViewHelpers; use StudioMitte\FriendlyCaptcha\ConfigurationInterface; -use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper; class ConfigurationViewHelper extends AbstractViewHelper { + public function __construct(private readonly ConfigurationInterface $configuration) + { + } + public function render(): array { - $configuration = GeneralUtility::makeInstance(ConfigurationInterface::class); return [ - 'siteKey' => $configuration->getSiteKey(), - 'verifyUrl' => $configuration->getVerifyUrl(), - 'useEuPuzzleEndpoint' => $configuration->useEuPuzzleEndpoint(), - 'jsPath' => $configuration->getJsPath(), - 'enabled' => $configuration->isEnabled(), + 'siteKey' => $this->configuration->getSiteKey(), + 'verifyUrl' => $this->configuration->getVerifyUrl(), + 'useEuPuzzleEndpoint' => $this->configuration->useEuPuzzleEndpoint(), + 'jsPath' => $this->configuration->getJsPath(), + 'enabled' => $this->configuration->isEnabled(), ]; } } diff --git a/Tests/Unit/ViewHelpers/ConfigurationViewHelperTest.php b/Tests/Unit/ViewHelpers/ConfigurationViewHelperTest.php index 98855b7..887f0c3 100644 --- a/Tests/Unit/ViewHelpers/ConfigurationViewHelperTest.php +++ b/Tests/Unit/ViewHelpers/ConfigurationViewHelperTest.php @@ -5,19 +5,22 @@ namespace StudioMitte\FriendlyCaptcha\Tests\Unit\ViewHelpers; use PHPUnit\Framework\Attributes\Test; -use StudioMitte\FriendlyCaptcha\Tests\RequestTrait; +use StudioMitte\FriendlyCaptcha\ConfigurationInterface; use StudioMitte\FriendlyCaptcha\ViewHelpers\ConfigurationViewHelper; use TYPO3\TestingFramework\Core\BaseTestCase; class ConfigurationViewHelperTest extends BaseTestCase { - use RequestTrait; - #[Test] public function viewHelperReturnsProperConfiguration(): void { - self::setupRequest(); - $configurationViewHelper = new ConfigurationViewHelper(); + $configuration = $this->createMock(ConfigurationInterface::class); + $configuration->method('getSiteKey')->willReturn('1234'); + $configuration->method('getVerifyUrl')->willReturn('https://verify,https://verify2'); + $configuration->method('useEuPuzzleEndpoint')->willReturn(false); + $configuration->method('getJsPath')->willReturn('EXT:friendlycaptcha_official/Resources/Public/JavaScript/lib/sdk@0.1.26-site.compat.min.js'); + $configuration->method('isEnabled')->willReturn(true); + $configurationViewHelper = new ConfigurationViewHelper($configuration); self::assertSame([ 'siteKey' => '1234', From 460c823176add4db65febf4e5a594a222d979a61 Mon Sep 17 00:00:00 2001 From: Florian Schuhmann Date: Wed, 30 Sep 2026 08:26:01 +0200 Subject: [PATCH 3/3] Fix ViewHelper constructor formatting Match the TYPO3 coding standards for an empty constructor body. --- Classes/ViewHelpers/ConfigurationViewHelper.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Classes/ViewHelpers/ConfigurationViewHelper.php b/Classes/ViewHelpers/ConfigurationViewHelper.php index 9d614a2..8bfd4b9 100644 --- a/Classes/ViewHelpers/ConfigurationViewHelper.php +++ b/Classes/ViewHelpers/ConfigurationViewHelper.php @@ -9,9 +9,7 @@ class ConfigurationViewHelper extends AbstractViewHelper { - public function __construct(private readonly ConfigurationInterface $configuration) - { - } + public function __construct(private readonly ConfigurationInterface $configuration) {} public function render(): array {