feat: update dependencies

.ddev/config.yaml

@@ -1,7 +1,7 @@
 name: bw-captcha
 type: typo3
 docroot: public
-php_version: "8.1"
+php_version: "8.2"
 webserver_type: nginx-fpm
 router_http_port: "80"
 router_https_port: "443"

Classes/Domain/Model/FormElements/CaptchaElement.php

@@ -2,6 +2,7 @@
 
 namespace Blueways\BwCaptcha\Domain\Model\FormElements;
 
+use Throwable;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManager;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
@@ -11,7 +12,7 @@
 class CaptchaElement extends AbstractFormElement
 {
     /**
-     * @throws InvalidConfigurationTypeException
+     * @throws InvalidConfigurationTypeException&Throwable
      */
     public function initializeFormElement(): void
     {

Classes/Middleware/Audio.php

@@ -9,6 +9,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use Throwable;
 use TYPO3\CMS\Core\Crypto\PasswordHashing\InvalidPasswordHashException;
 use TYPO3\CMS\Core\Routing\PageArguments;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManager;
@@ -30,8 +31,8 @@ public function __construct(
     }
 
     /**
-     * @throws InvalidConfigurationTypeException
-     * @throws InvalidPasswordHashException
+     * @throws InvalidConfigurationTypeException&Throwable
+     * @throws InvalidPasswordHashException&Throwable
      */
     public function process(
         ServerRequestInterface $request,
@@ -44,13 +45,7 @@ public function process(
             return $handler->handle($request);
         }
 
-        $locale = $request->getAttribute('language')?->getLocale();
-        if ($locale instanceof \TYPO3\CMS\Core\Localization\Locale) {
-            $languageCode = $locale->getCountryCode() ?? '';
-        } else {
-            $languageCode = $request->getAttribute('language')?->getTwoLetterIsoCode() ?? '';
-        }
-
+        $languageCode = $request->getAttribute('language')?->getLocale()->getCountryCode() ?? '';
         $body = $request->getParsedBody();
 
         $ts = $this->configurationManager->getConfiguration(

Classes/Middleware/Captcha.php

@@ -9,6 +9,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use Throwable;
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Routing\PageArguments;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManager;
@@ -34,7 +35,7 @@ public function __construct(
     }
 
     /**
-     * @throws InvalidConfigurationTypeException
+     * @throws InvalidConfigurationTypeException&Throwable
      */
     public function process(
         ServerRequestInterface $request,

Configuration/Icons.php

@@ -0,0 +1,8 @@
+<?php
+
+return [
+    't3-form-captcha-element' => [
+        'provider' => \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider::class,
+        'source' => 'EXT:bw_captcha/Resources/Public/Images/form-captcha-icon.svg',
+    ],
+];

composer.json

@@ -4,7 +4,7 @@
   "description": "Captcha element with audio support for TYPO3 form components. The captcha generation does not rely on Google or third-party integrations.",
   "require": {
     "php": "^8.1",
-    "typo3/cms-core": "^11.0 || ^12.0 || ^13.0",
+    "typo3/cms-core": "^12.0 || ^13.0",
     "ext-gd": "*"
   },
   "autoload": {
@@ -16,13 +16,13 @@
   },
   "require-dev": {
     "roave/security-advisories": "dev-latest",
-    "typo3/cms-base-distribution": "^12.0",
-    "typo3/cms-lowlevel": "^12.0",
+    "typo3/cms-base-distribution": "^12.4 || ^13.4",
+    "typo3/cms-lowlevel": "^12.4 || ^13.4",
     "bk2k/bootstrap-package": "^15.0",
     "friendsofphp/php-cs-fixer": "^3.12",
     "saschaegerer/phpstan-typo3": "^1.9",
-    "helhum/typo3-console": "^8.0",
-    "derhansen/sf_event_mgt": "^7.6"
+    "helhum/typo3-console": "^7.0 || ^8.0",
+    "derhansen/sf_event_mgt": "^7.6 || ^8.0"
   },
   "extra": {
     "typo3/cms": {

ext_emconf.php

@@ -12,7 +12,7 @@
     'version' => '4.1.2',
     'constraints' => [
         'depends' => [
-            'typo3' => '11.0.0-13.99.99',
+            'typo3' => '12.0.0-13.99.99',
         ],
         'conflicts' => [],
         'suggests' => [],

ext_localconf.php

@@ -1,9 +1,12 @@
 <?php
 
+use TYPO3\CMS\Core\Utility\ArrayUtility;
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+
 defined('TYPO3') or die();
 
-call_user_func(function () {
-    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScriptSetup(trim('
+call_user_func(static function () {
+    ExtensionManagementUtility::addTypoScriptSetup(trim('
             module.tx_form {
                 settings {
                     yamlConfigurations {
@@ -13,15 +16,8 @@
             }
         '));
 
-    $iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Imaging\IconRegistry::class);
-    $iconRegistry->registerIcon(
-        't3-form-captcha-element',
-        \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider::class,
-        ['source' => 'EXT:bw_captcha/Resources/Public/Images/form-captcha-icon.svg']
-    );
-
     $GLOBALS['TYPO3_CONF_VARS']['FE']['cacheHash']['excludedParameters'] ??= [];
-    \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule(
+    ArrayUtility::mergeRecursiveWithOverrule(
         $GLOBALS['TYPO3_CONF_VARS']['FE']['cacheHash']['excludedParameters'],
         ['now']
     );