Skip to content

Commit 814c04b

Browse files
committed
[TASK] Raise requirements of TYPO3 version
1 parent ca77c6d commit 814c04b

File tree

3 files changed

+18
-19
lines changed

3 files changed

+18
-19
lines changed

Classes/Services/ModifyValidator.php

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
use Evoweb\StoreFinder\Annotation\Validate;
2121
use Evoweb\StoreFinder\Validation\Validator\ConstraintValidator;
2222
use Evoweb\StoreFinder\Validation\Validator\SetPropertyNameInterface;
23+
use Exception;
2324
use Psr\Http\Message\ServerRequestInterface;
2425
use Psr\Log\LoggerInterface;
2526
use ReflectionException;
2627
use TYPO3\CMS\Core\Log\LogManager;
27-
use TYPO3\CMS\Core\Utility\GeneralUtility;
2828
use TYPO3\CMS\Extbase\Attribute as Extbase;
2929
use TYPO3\CMS\Extbase\Mvc\Controller\Argument;
3030
use TYPO3\CMS\Extbase\Mvc\Controller\Arguments;
@@ -75,24 +75,25 @@ public function modifyArgumentValidators(
7575
$this->modifyValidatorsBasedOnSettings(
7676
$argument,
7777
$request,
78-
$settings['validation'] ?? [],
78+
$settings,
7979
);
8080
}
8181
return $arguments;
8282
}
8383

8484
/**
85-
* @param array<string, string|string[]> $configuredValidators
85+
* @param array<string, string|string[]> $settings
8686
*/
8787
public function modifyValidatorsBasedOnSettings(
8888
Argument $argument,
8989
ServerRequestInterface $request,
90-
array $configuredValidators,
90+
array $settings,
9191
): void {
92+
$configuredValidators = $settings['validation'] ?? [];
9293
$parser = new DocParser();
9394

9495
/** @var ConstraintValidator $validator */
95-
$validator = GeneralUtility::makeInstance(ConstraintValidator::class);
96+
$validator = $this->validatorResolver->createValidator(ConstraintValidator::class);
9697
foreach ($configuredValidators as $fieldName => $configuredValidator) {
9798
if (!is_array($configuredValidator)) {
9899
try {
@@ -102,15 +103,13 @@ public function modifyValidatorsBasedOnSettings(
102103
$fieldName,
103104
$request,
104105
);
105-
} catch (\Exception $exception) {
106+
} catch (Exception $exception) {
106107
$this->logger->debug($exception->getMessage());
107108
continue;
108109
}
109110
} else {
110111
/** @var ConjunctionValidator $validatorInstance */
111-
$validatorInstance = $this->validatorResolver->createValidator(
112-
ConjunctionValidator::class
113-
);
112+
$validatorInstance = $this->validatorResolver->createValidator(ConjunctionValidator::class);
114113
foreach ($configuredValidator as $individualConfiguredValidator) {
115114
try {
116115
$individualValidatorInstance = $this->getValidatorByConfiguration(
@@ -119,7 +118,7 @@ public function modifyValidatorsBasedOnSettings(
119118
$fieldName,
120119
$request,
121120
);
122-
} catch (\Exception $exception) {
121+
} catch (Exception $exception) {
123122
$this->logger->debug($exception->getMessage());
124123
continue;
125124
}

Configuration/TCA/Overrides/tt_content.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
$showItems = '
3030
--palette--;;general,
3131
--palette--;;headers,
32-
--div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:plugin,
32+
--div--;core.tabs:plugin,
3333
pi_flexform,
3434
pages;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:pages.ALT.list_formlabel,
3535
recursive,
36-
--div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:appearance,
36+
--div--;core.tabs:appearance,
3737
--palette--;;storefinder-frames,
3838
--palette--;;appearanceLinks,
39-
--div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:categories,
39+
--div--;core.tabs:categories,
4040
categories,
4141
';
4242

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
},
3434
"require": {
3535
"php": "^8.2",
36-
"typo3/cms-core": "^13.3 || 13.4.x-dev || dev-main",
37-
"typo3/cms-backend": "^13.3 || 13.4.x-dev || dev-main",
38-
"typo3/cms-extbase": "^13.3 || 13.4.x-dev || dev-main",
39-
"typo3/cms-fluid": "^13.3 || 13.4.x-dev || dev-main",
40-
"typo3/cms-frontend": "^13.3 || 13.4.x-dev || dev-main",
41-
"typo3/cms-install": "^13.3 || 13.4.x-dev || dev-main",
36+
"typo3/cms-core": "^14.0 || 14.*.*@dev || dev-main",
37+
"typo3/cms-backend": "^14.0 || 14.*.*@dev || dev-main",
38+
"typo3/cms-extbase": "^14.0 || 14.*.*@dev || dev-main",
39+
"typo3/cms-fluid": "^14.0 || 14.*.*@dev || dev-main",
40+
"typo3/cms-frontend": "^14.0 || 14.*.*@dev || dev-main",
41+
"typo3/cms-install": "^14.0 || 14.*.*@dev || dev-main",
4242

4343
"doctrine/annotations": "^2.0.2",
4444
"doctrine/dbal": "^4.1.1",

0 commit comments

Comments
 (0)