Skip to content

Commit b723cf1

Browse files
garbastgarbast
committed
Merge branch 'release/14.1.1'
2 parents d3a59c8 + f6d109e commit b723cf1

6 files changed

Lines changed: 76 additions & 14 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 59 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,48 @@ jobs:
3434
strategy:
3535
matrix:
3636
packages:
37+
- php: '8.2'
38+
core: '^13.0'
39+
framework: 'dev-main'
40+
prefer: ''
41+
testpath: 'Tests/Functional'
42+
43+
- php: '8.2'
44+
core: '^13.4'
45+
framework: 'dev-main'
46+
prefer: '--prefer-lowest'
47+
testpath: 'Tests/Functional'
48+
49+
- php: '8.3'
50+
core: '^13.0'
51+
framework: 'dev-main'
52+
prefer: ''
53+
testpath: 'Tests/Functional'
54+
55+
- php: '8.3'
56+
core: '^13.4'
57+
framework: 'dev-main'
58+
prefer: '--prefer-lowest'
59+
testpath: 'Tests/Functional'
60+
61+
- php: '8.4'
62+
core: '^13.0'
63+
framework: 'dev-main'
64+
prefer: ''
65+
testpath: 'Tests/Functional'
66+
67+
- php: '8.4'
68+
core: '^13.4'
69+
framework: 'dev-main'
70+
prefer: '--prefer-lowest'
71+
testpath: 'Tests/Functional'
72+
73+
- php: '8.5'
74+
core: '^13.4'
75+
framework: 'dev-main'
76+
prefer: ''
77+
testpath: 'Tests/Functional'
78+
3779
- php: '8.2'
3880
core: '^14.0'
3981
framework: 'dev-main'
@@ -64,11 +106,23 @@ jobs:
64106
prefer: ''
65107
testpath: 'Tests/Functional'
66108

67-
# - php: '8.4'
68-
# core: '^14.0'
69-
# framework: 'dev-main'
70-
# prefer: '--prefer-lowest'
71-
# testpath: 'Tests/Functional'
109+
# - php: '8.4'
110+
# core: '^14.0'
111+
# framework: 'dev-main'
112+
# prefer: '--prefer-lowest'
113+
# testpath: 'Tests/Functional'
114+
115+
- php: '8.5'
116+
core: '^14.0'
117+
framework: 'dev-main'
118+
prefer: ''
119+
testpath: 'Tests/Functional'
120+
121+
# - php: '8.4'
122+
# core: '^14.0'
123+
# framework: 'dev-main'
124+
# prefer: '--prefer-lowest'
125+
# testpath: 'Tests/Functional'
72126
steps:
73127
- name: Checkout
74128
uses: actions/checkout@v4

‎Build/Scripts/test.sh‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,25 @@ DEBUG_TESTS=false
145145
if [[ $DEBUG_TESTS != true ]]; then
146146
checkResources
147147

148-
TCORE="^14.0"
148+
TCORE="^13.0"
149+
TFRAMEWORK="^9.2.1"
150+
runFunctionalTests "8.2" ${TCORE} ${TFRAMEWORK} ${TPATH} || exit 1
151+
runFunctionalTests "8.2" ${TCORE} ${TFRAMEWORK} ${TPATH} ${LOWEST} || exit 1
152+
runFunctionalTests "8.3" ${TCORE} ${TFRAMEWORK} ${TPATH} || exit 1
153+
runFunctionalTests "8.3" ${TCORE} ${TFRAMEWORK} ${TPATH} ${LOWEST} || exit 1
154+
runFunctionalTests "8.4" ${TCORE} ${TFRAMEWORK} ${TPATH} || exit 1
155+
runFunctionalTests "8.4" ${TCORE} ${TFRAMEWORK} ${TPATH} ${LOWEST} || exit 1
149156

157+
TCORE="^14.0"
158+
TFRAMEWORK="dev-main"
150159
runFunctionalTests "8.2" ${TCORE} ${TFRAMEWORK} ${TPATH} || exit 1
151160
runFunctionalTests "8.2" ${TCORE} ${TFRAMEWORK} ${TPATH} ${LOWEST} || exit 1
152161
runFunctionalTests "8.3" ${TCORE} ${TFRAMEWORK} ${TPATH} || exit 1
153162
runFunctionalTests "8.3" ${TCORE} ${TFRAMEWORK} ${TPATH} ${LOWEST} || exit 1
154163
runFunctionalTests "8.4" ${TCORE} ${TFRAMEWORK} ${TPATH} || exit 1
155164
#runFunctionalTests "8.4" ${TCORE} ${TFRAMEWORK} ${TPATH} ${LOWEST} || exit 1
165+
runFunctionalTests "8.5" ${TCORE} ${TFRAMEWORK} ${TPATH} || exit 1
166+
#runFunctionalTests "8.5" ${TCORE} ${TFRAMEWORK} ${TPATH} ${LOWEST} || exit 1
156167
else
157168
#cleanup
158169
runFunctionalTests "8.2" "^14.0" "dev-main" ${TPATH} ${LOWEST} || exit 1

‎Classes/Adapter/SfRegisterAdapter.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,7 @@ public function isValid(string $value): bool
4848
if ($status['error'] !== '') {
4949
$validCaptcha = false;
5050
$this->addError(
51-
LocalizationUtility::translate(
52-
'error_recaptcha_' . $status['error'],
53-
'Recaptcha'
54-
),
51+
LocalizationUtility::translate('error_recaptcha_' . $status['error'], 'Recaptcha'),
5552
1307421960
5653
);
5754
}

‎Classes/Validation/RecaptchaValidator.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function isValid(mixed $value): void
3434
{
3535
$status = $this->captchaService->validateReCaptcha((string)$value);
3636
if ($status['error'] !== '') {
37-
$errorText = LocalizationUtility::translate('recaptcha.messages:error_recaptcha_' . $status['error']);
37+
$errorText = LocalizationUtility::translate('error_recaptcha_' . $status['error'], 'Recaptcha');
3838

3939
if (empty($errorText)) {
4040
$errorText = htmlspecialchars($status['error']);

‎Documentation/guides.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
interlink-shortcode="evoweb/recaptcha"
1717
/>
1818
<project title="recaptcha"
19-
release="14.1.0"
20-
version="14.1.0"
19+
release="14.1.1"
20+
version="14.1.1"
2121
copyright="since 2015 by evoWeb"
2222
/>
2323
<inventory id="t3tsref" url="https://docs.typo3.org/m/typo3/reference-typoscript/main/en-us/"/>

‎ext_emconf.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
'author_email' => 'typo3@evoweb.de',
1010
'author_company' => 'evoWeb',
1111
'state' => 'stable',
12-
'version' => '14.1.0',
12+
'version' => '14.1.1',
1313
'constraints' => [
1414
'depends' => [
1515
'typo3' => '13.4.0-14.4.99',

0 commit comments

Comments
 (0)