diff --git a/Classes/Configuration.php b/Classes/Configuration.php index 4494bad..89314f8 100644 --- a/Classes/Configuration.php +++ b/Classes/Configuration.php @@ -9,7 +9,7 @@ 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.26-site.compat.min.js'; @@ -25,6 +25,7 @@ public function __construct(?Site $site = null) if ($site === null) { $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..340ba17 --- /dev/null +++ b/Classes/ConfigurationInterface.php @@ -0,0 +1,26 @@ +factory = $factory; $this->client = $client; $this->logger = $logger; - $this->configuration = new Configuration(); + $this->configuration = $configuration ?? GeneralUtility::makeInstance(ConfigurationInterface::class); } public function verify(string $response = ''): bool diff --git a/Classes/ViewHelpers/ConfigurationViewHelper.php b/Classes/ViewHelpers/ConfigurationViewHelper.php index 1eb4565..8bfd4b9 100644 --- a/Classes/ViewHelpers/ConfigurationViewHelper.php +++ b/Classes/ViewHelpers/ConfigurationViewHelper.php @@ -4,20 +4,21 @@ namespace StudioMitte\FriendlyCaptcha\ViewHelpers; -use StudioMitte\FriendlyCaptcha\Configuration; +use StudioMitte\FriendlyCaptcha\ConfigurationInterface; use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper; class ConfigurationViewHelper extends AbstractViewHelper { + public function __construct(private readonly ConfigurationInterface $configuration) {} + public function render(): array { - $configuration = new Configuration(); 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/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 diff --git a/Tests/Unit/Service/ApiTest.php b/Tests/Unit/Service/ApiTest.php index e6e9fe6..a5f1926 100644 --- a/Tests/Unit/Service/ApiTest.php +++ b/Tests/Unit/Service/ApiTest.php @@ -11,6 +11,7 @@ use GuzzleHttp\Psr7\Response; use PHPUnit\Framework\Attributes\Test; use Psr\Log\NullLogger; +use StudioMitte\FriendlyCaptcha\ConfigurationInterface; use StudioMitte\FriendlyCaptcha\Service\Api; use StudioMitte\FriendlyCaptcha\Tests\RequestTrait; use TYPO3\CMS\Core\Http\Client\GuzzleClientFactory; @@ -39,8 +40,14 @@ public function verifyUrlIsCalledWithProperData(): void } else { $factory = new RequestFactory(); } - $api = new Api($factory, $client, new NullLogger()); + $configuration = $this->createMock(ConfigurationInterface::class); + $configuration->method('isEnabled')->willReturn(true); + $configuration->method('getSiteSecretKey')->willReturn('ABCDE'); + $configuration->method('getFirstVerifyUrl')->willReturn('https://verify'); + + $api = new Api($factory, $client, new NullLogger(), $configuration); self::assertTrue($api->verify()); + self::assertSame('https://verify', (string)$historyContainer[0]['request']->getUri()); } #[Test] 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',