Skip to content

Commit 17b92ab

Browse files
authored
Merge branch 'main' into main
2 parents 422a9bd + 1a7d311 commit 17b92ab

File tree

5 files changed

+39
-3
lines changed

5 files changed

+39
-3
lines changed

.github/workflows/ter-release.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: TER release
2+
3+
on:
4+
push:
5+
tags:
6+
- '*'
7+
8+
jobs:
9+
ter-release:
10+
name: TER release
11+
runs-on: ubuntu-latest
12+
env:
13+
TYPO3_EXTENSION_KEY: 'pw_comments'
14+
REPOSITORY_URL: 'https://github.com/teamneusta/pw_comments'
15+
TYPO3_API_TOKEN: ${{ secrets.TYPO3_TER_TOKEN }}
16+
TYPO3_API_USERNAME: ${{ secrets.TYPO3_TER_USERNAME }}
17+
TYPO3_API_PASSWORD: ${{ secrets.TYPO3_TER_PASSWORD }}
18+
19+
steps:
20+
- name: Get the version
21+
id: get_version
22+
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
23+
24+
- name: Setup PHP
25+
uses: shivammathur/setup-php@v2
26+
with:
27+
php-version: '8.1'
28+
extensions: intl, mbstring, xml, soap, zip, curl
29+
30+
- name: Install EXT:tailor
31+
run: composer global require typo3/tailor --prefer-dist --no-progress --no-suggest
32+
33+
- name: Upload EXT:${{ env.EXTENSION_KEY }} as ${{ steps.get_version.outputs.VERSION }} to TER
34+
run: php ~/.composer/vendor/bin/tailor ter:publish ${{ steps.get_version.outputs.VERSION }} --artefact=${{ env.REPOSITORY_URL }}/archive/${{ steps.get_version.outputs.VERSION }}.zip --comment="New release of version ${{ steps.get_version.outputs.VERSION }} - see details, changelog and documentation on ${{ env.REPOSITORY_URL }}"

Classes/Domain/Validator/CommentValidator.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ class CommentValidator extends AbstractValidator
3636
*/
3737
public function isValid(mixed $comment): void
3838
{
39+
// @todo: pass request with TYPO3 v13. See https://github.com/teamneusta/pw_comments/issues/19
3940
$this->settings = Settings::getRenderedExtensionSettings();
4041

4142
$errorNumber = null;

Classes/Utility/Settings.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ public static function renderConfigurationArray(array $settings, $makeSettingsRe
3636
/** @var ContentObjectRenderer|null $contentObject */
3737
$contentObject = self::getConfigurationManagerInterface()->getContentObject();
3838
if ($contentObject === null) {
39-
return [];
39+
// This is a workaround until custom validators contain the current request to pass on to the current method
40+
return $makeSettingsRenderable ? self::makeConfigurationArrayRenderable($settings) : $settings;
4041
}
4142

4243
if ($makeSettingsRenderable === true) {

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"keywords": ["TYPO3", "extension", "comment", "voting"],
66
"homepage": "https://team-neusta.de/",
77
"license": "GPL-2.0+",
8-
"version": "6.0.1",
8+
"version": "6.0.2",
99
"authors": [
1010
{
1111
"name": "Armin Vieweg",

ext_emconf.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
'author_email' => 'm.olabi@neusta.de',
1818
'author_company' => '',
1919
'state' => 'stable',
20-
'version' => '6.0.1',
20+
'version' => '6.0.2',
2121
'constraints' => [
2222
'depends' => [
2323
'typo3' => '12.4.0-12.99.99'

0 commit comments

Comments
 (0)