Skip to content

Commit 743aa69

Browse files
ayacooayacoo
committed
Init v14 version
1 parent cf94f4e commit 743aa69

11 files changed

Lines changed: 179 additions & 107 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
push:
77
branches:
88
- main
9-
- v3
9+
- typo3-v14
1010
pull_request:
1111
permissions:
1212
contents: read
@@ -35,6 +35,7 @@ jobs:
3535
- "8.2"
3636
- "8.3"
3737
- "8.4"
38+
- "8.5"
3839
code-quality:
3940
name: "Code quality checks"
4041
runs-on: ubuntu-22.04
@@ -72,6 +73,7 @@ jobs:
7273
- "8.2"
7374
- "8.3"
7475
- "8.4"
76+
- "8.5"
7577
unit-tests:
7678
name: "Unit tests"
7779
runs-on: ubuntu-22.04
@@ -112,15 +114,18 @@ jobs:
112114
fail-fast: false
113115
matrix:
114116
include:
115-
- typo3-version: "^13.4"
117+
- typo3-version: "^14.0"
116118
php-version: "8.2"
117119
composer-dependencies: highest
118-
- typo3-version: "^13.4"
120+
- typo3-version: "^14.0"
119121
php-version: "8.3"
120122
composer-dependencies: highest
121-
- typo3-version: "^13.4"
123+
- typo3-version: "^14.0"
122124
php-version: "8.4"
123125
composer-dependencies: highest
126+
- typo3-version: "^14.0"
127+
php-version: "8.5"
128+
composer-dependencies: highest
124129
functional-tests:
125130
name: "Functional tests"
126131
runs-on: ubuntu-22.04
@@ -130,29 +135,32 @@ jobs:
130135
# rest matrix jobs be executed anyway.
131136
fail-fast: false
132137
matrix:
133-
php: [ '8.2', '8.3', '8.4' ]
138+
php: [ '8.2', '8.3', '8.4', '8.5' ]
134139
composerInstall: [ 'composerInstallHighest' ]
135140
steps:
136141
- name: Checkout
137142
uses: actions/checkout@v4
138143

139144
- name: Install testing system
140-
run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -s ${{ matrix.composerInstall }}
145+
run: Build/Scripts/runTests.sh -t 14 -p ${{ matrix.php }} -s ${{ matrix.composerInstall }}
141146

142147
- name: Functional Tests with mariadb (min)
143-
run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d mariadb -i 10.4 -s functional
148+
run: Build/Scripts/runTests.sh -t 14 -p ${{ matrix.php }} -d mariadb -i 10.4 -s functional
144149

145150
- name: Functional Tests with mariadb (max)
146-
run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d mariadb -i 10.11 -s functional
151+
run: Build/Scripts/runTests.sh -t 14 -p ${{ matrix.php }} -d mariadb -i 10.11 -s functional
152+
153+
- name: Functional Tests with mysql (min)
154+
run: Build/Scripts/runTests.sh -t 14 -p ${{ matrix.php }} -d mysql -i 8.0 -s functional
147155

148-
- name: Functional Tests with mysql (min/max)
149-
run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d mysql -i 8.0 -s functional
156+
- name: Functional Tests with mysql (max)
157+
run: Build/Scripts/runTests.sh -t 14 -p ${{ matrix.php }} -d mysql -i 8.4 -s functional
150158

151159
- name: Functional Tests with postgres (min)
152-
run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d postgres -i 10 -s functional
160+
run: Build/Scripts/runTests.sh -t 14 -p ${{ matrix.php }} -d postgres -i 10 -s functional
153161

154162
- name: Functional Tests with postgres (max)
155-
run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d postgres -i 16 -s functional
163+
run: Build/Scripts/runTests.sh -t 14 -p ${{ matrix.php }} -d postgres -i 18 -s functional
156164

157165
- name: Functional Tests with sqlite
158-
run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d sqlite -s functional
166+
run: Build/Scripts/runTests.sh -t 14 -p ${{ matrix.php }} -d sqlite -s functional

‎Build/Scripts/runTests.sh‎

Lines changed: 38 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ handleDbmsOptions() {
4545
echo "Use \".Build/Scripts/runTests.sh -h\" to display help and valid options" >&2
4646
exit 1
4747
fi
48-
[ -z "${DBMS_VERSION}" ] && DBMS_VERSION="10.2"
49-
if ! [[ ${DBMS_VERSION} =~ ^(10.2|10.3|10.4|10.5|10.6|10.7|10.8|10.9|10.10|10.11|11.0|11.1)$ ]]; then
48+
[ -z "${DBMS_VERSION}" ] && DBMS_VERSION="10.11"
49+
if ! [[ ${DBMS_VERSION} =~ ^(10.4|10.5|10.6|10.7|10.8|10.9|10.10|10.11|11.0|11.1|11.4|11.8)$ ]]; then
5050
echo "Invalid combination -d ${DBMS} -i ${DBMS_VERSION}" >&2
5151
echo >&2
5252
echo "Use \".Build/Scripts/runTests.sh -h\" to display help and valid options" >&2
@@ -61,8 +61,8 @@ handleDbmsOptions() {
6161
echo "Use \".Build/Scripts/runTests.sh -h\" to display help and valid options" >&2
6262
exit 1
6363
fi
64-
[ -z "${DBMS_VERSION}" ] && DBMS_VERSION="5.5"
65-
if ! [[ ${DBMS_VERSION} =~ ^(5.5|5.6|5.7|8.0)$ ]]; then
64+
[ -z "${DBMS_VERSION}" ] && DBMS_VERSION="8.4"
65+
if ! [[ ${DBMS_VERSION} =~ ^(8.0|8.1|8.2|8.3|8.4|9.5)$ ]]; then
6666
echo "Invalid combination -d ${DBMS} -i ${DBMS_VERSION}" >&2
6767
echo >&2
6868
echo "Use \".Build/Scripts/runTests.sh -h\" to display help and valid options" >&2
@@ -76,8 +76,8 @@ handleDbmsOptions() {
7676
echo "Use \".Build/Scripts/runTests.sh -h\" to display help and valid options" >&2
7777
exit 1
7878
fi
79-
[ -z "${DBMS_VERSION}" ] && DBMS_VERSION="10"
80-
if ! [[ ${DBMS_VERSION} =~ ^(10|11|12|13|14|15|16)$ ]]; then
79+
[ -z "${DBMS_VERSION}" ] && DBMS_VERSION="16"
80+
if ! [[ ${DBMS_VERSION} =~ ^(10|11|12|13|14|15|16|17|18)$ ]]; then
8181
echo "Invalid combination -d ${DBMS} -i ${DBMS_VERSION}" >&2
8282
echo >&2
8383
echo "Use \".Build/Scripts/runTests.sh -h\" to display help and valid options" >&2
@@ -200,47 +200,44 @@ Options:
200200
-i version
201201
Specify a specific database version
202202
With "-d mariadb":
203-
- 10.2 short-term, maintained until 2023-05-25 (default)
204-
- 10.3 short-term, maintained until 2023-05-25
205203
- 10.4 short-term, maintained until 2024-06-18
206204
- 10.5 short-term, maintained until 2025-06-24
207205
- 10.6 long-term, maintained until 2026-06
208206
- 10.7 short-term, no longer maintained
209207
- 10.8 short-term, maintained until 2023-05
210208
- 10.9 short-term, maintained until 2023-08
211209
- 10.10 short-term, maintained until 2023-11
212-
- 10.11 long-term, maintained until 2028-02
210+
- 10.11 long-term, maintained until 2028-02 (default)
213211
- 11.0 development series
214212
- 11.1 short-term development series
213+
- 11.4 long-term, maintained until 2033-01
214+
- 11.8 long-term, maintained until 2033-10
215215
With "-d mysql":
216-
- 5.5 unmaintained since 2018-12 (default)
217-
- 5.6 unmaintained since 2021-02
218-
- 5.7 maintained until 2023-10
219-
- 8.0 maintained until 2026-04
216+
- 8.0 long-term, maintained until 2026-04
217+
- 8.4 long-term, maintained until 2032-30
220218
With "-d postgres":
221-
- 10 unmaintained since 2022-11-10 (default)
219+
- 10 unmaintained since 2022-11-10
222220
- 11 unmaintained since 2023-11-09
223221
- 12 maintained until 2024-11-14
224222
- 13 maintained until 2025-11-13
225223
- 14 maintained until 2026-11-12
226224
- 15 maintained until 2027-11-11
227-
- 16 maintained until 2028-11-09
225+
- 16 maintained until 2028-11-09 (default)
226+
- 17 maintained until 2029-11-08
227+
- 18 maintained until 2029-11-14
228228
229-
-t <11|12|13>
229+
-t <13>
230230
Only with -s composerInstall|composerInstallMin|composerInstallMax
231231
Specifies the TYPO3 CORE Version to be used
232-
- 11.5: use TYPO3 v11 (default)
233-
- 12.4: use TYPO3 v12
234-
- 13.4: use TYPO3 v13
232+
- 13.4: use TYPO3 v13 (default)
233+
- 14.0: use TYPO3 v14
235234
236-
-p <7.4|8.0|8.1|8.2|8.3|8.4>
235+
-p <8.2|8.3|8.4|8.5>
237236
Specifies the PHP minor version to be used
238-
- 7.4: use PHP 7.4 (default)
239-
- 8.0: use PHP 8.0
240-
- 8.1: use PHP 8.1
241237
- 8.2: use PHP 8.2
242-
- 8.3: use PHP 8.3
238+
- 8.3: use PHP 8.3 (default)
243239
- 8.4: use PHP 8.4
240+
- 8.5: use PHP 8.5
244241
245242
-e "<phpunit options>"
246243
Only with -s docsGenerate|functional|unit
@@ -277,24 +274,24 @@ Options:
277274
Show this help.
278275
279276
Examples:
280-
# Run all core unit tests using PHP 7.4
277+
# Run all core unit tests using PHP 8.5
281278
./Build/Scripts/runTests.sh -s unit
282279
283280
# Run all core units tests and enable xdebug (have a PhpStorm listening on port 9003!)
284281
./Build/Scripts/runTests.sh -x -s unit
285282
286-
# Run unit tests in phpunit verbose mode with xdebug on PHP 8.1 and filter for test canRetrieveValueWithGP
287-
./Build/Scripts/runTests.sh -x -p 8.1 -- --filter 'classCanBeRegistered'
283+
# Run unit tests in phpunit verbose mode with xdebug on PHP 8.3 and filter for test canRetrieveValueWithGP
284+
./Build/Scripts/runTests.sh -x -p 8.3 -- --filter 'classCanBeRegistered'
288285
289286
# Run functional tests in phpunit with a filtered test method name in a specified file
290287
# example will currently execute two tests, both of which start with the search term
291288
./Build/Scripts/runTests.sh -s functional -- --filter 'findRecordByImportSource' Tests/Functional/Repository/CategoryRepositoryTest.php
292289
293-
# Run functional tests on postgres with xdebug, php 8.1 and execute a restricted set of tests
294-
./Build/Scripts/runTests.sh -x -p 8.1 -s functional -d postgres -- Tests/Functional/Repository/CategoryRepositoryTest.php
290+
# Run functional tests on postgres with xdebug, php 8.3 and execute a restricted set of tests
291+
./Build/Scripts/runTests.sh -x -p 8.3 -s functional -d postgres -- Tests/Functional/Repository/CategoryRepositoryTest.php
295292
296-
# Run functional tests on postgres 11
297-
./Build/Scripts/runTests.sh -s functional -d postgres -i 11
293+
# Run functional tests on postgres 16
294+
./Build/Scripts/runTests.sh -s functional -d postgres -i 16
298295
EOF
299296
}
300297

@@ -313,17 +310,17 @@ ROOT_DIR="${PWD}"
313310

314311
# Option defaults
315312
TEST_SUITE=""
316-
TYPO3_VERSION="11"
313+
TYPO3_VERSION="14"
317314
DBMS="sqlite"
318315
DBMS_VERSION=""
319-
PHP_VERSION="8.1"
316+
PHP_VERSION="8.3"
320317
PHP_XDEBUG_ON=0
321318
PHP_XDEBUG_PORT=9003
322319
EXTRA_TEST_OPTIONS=""
323320
CGLCHECK_DRY_RUN=0
324321
DATABASE_DRIVER=""
325322
CONTAINER_BIN=""
326-
COMPOSER_ROOT_VERSION="12.4.2"
323+
COMPOSER_ROOT_VERSION="14.0.1"
327324
CONTAINER_INTERACTIVE="-it --init"
328325
HOST_UID=$(id -u)
329326
HOST_PID=$(id -g)
@@ -363,7 +360,7 @@ while getopts "a:b:s:d:i:p:e:t:xy:nhu" OPT; do
363360
;;
364361
p)
365362
PHP_VERSION=${OPTARG}
366-
if ! [[ ${PHP_VERSION} =~ ^(7.4|8.0|8.1|8.2|8.3|8.4)$ ]]; then
363+
if ! [[ ${PHP_VERSION} =~ ^(8.2|8.3|8.4|8.5)$ ]]; then
367364
INVALID_OPTIONS+=("-p ${OPTARG}")
368365
fi
369366
;;
@@ -372,7 +369,7 @@ while getopts "a:b:s:d:i:p:e:t:xy:nhu" OPT; do
372369
;;
373370
t)
374371
TYPO3_VERSION=${OPTARG}
375-
if ! [[ ${TYPO3_VERSION} =~ ^(11|12|13)$ ]]; then
372+
if ! [[ ${TYPO3_VERSION} =~ ^(14)$ ]]; then
376373
INVALID_OPTIONS+=("-t ${OPTARG}")
377374
fi
378375
;;
@@ -445,7 +442,7 @@ mkdir -p .cache
445442
mkdir -p .Build/public/typo3temp/var/tests
446443

447444
IMAGE_PHP="ghcr.io/typo3/core-testing-$(echo "php${PHP_VERSION}" | sed -e 's/\.//'):latest"
448-
IMAGE_ALPINE="docker.io/alpine:3.8"
445+
IMAGE_ALPINE="docker.io/alpine:3.22"
449446
IMAGE_DOCS="ghcr.io/typo3-documentation/render-guides:latest"
450447
IMAGE_MARIADB="docker.io/mariadb:${DBMS_VERSION}"
451448
IMAGE_MYSQL="docker.io/mysql:${DBMS_VERSION}"
@@ -510,17 +507,9 @@ case ${TEST_SUITE} in
510507
cleanComposer
511508
stashComposerFiles
512509
${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name composer-install-highest-${SUFFIX} -e COMPOSER_CACHE_DIR=.cache/composer -e COMPOSER_ROOT_VERSION=${COMPOSER_ROOT_VERSION} ${IMAGE_PHP} /bin/bash -c "
513-
if [ ${TYPO3_VERSION} -eq 11 ]; then
510+
if [ ${TYPO3_VERSION} -eq 14 ]; then
514511
composer require --no-ansi --no-interaction --no-progress --no-install \
515-
typo3/cms-core:^11.5.24 || exit 1
516-
fi
517-
if [ ${TYPO3_VERSION} -eq 12 ]; then
518-
composer require --no-ansi --no-interaction --no-progress --no-install \
519-
typo3/cms-core:^12.4.2 || exit 1
520-
fi
521-
if [ ${TYPO3_VERSION} -eq 13 ]; then
522-
composer require --no-ansi --no-interaction --no-progress --no-install \
523-
typo3/cms-core:^13.4 || exit 1
512+
typo3/cms-core:^14.0 || exit 1
524513
fi
525514
composer update --no-progress --no-interaction || exit 1
526515
composer show || exit 1
@@ -532,17 +521,9 @@ case ${TEST_SUITE} in
532521
cleanComposer
533522
stashComposerFiles
534523
${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name composer-install-lowest-${SUFFIX} -e COMPOSER_CACHE_DIR=.cache/composer -e COMPOSER_ROOT_VERSION=${COMPOSER_ROOT_VERSION} ${IMAGE_PHP} /bin/bash -c "
535-
if [ ${TYPO3_VERSION} -eq 11 ]; then
536-
composer require --no-ansi --no-interaction --no-progress --no-install \
537-
typo3/cms-core:^11.5.24 || exit 1
538-
fi
539-
if [ ${TYPO3_VERSION} -eq 12 ]; then
540-
composer require --no-ansi --no-interaction --no-progress --no-install \
541-
typo3/cms-core:^12.4.2 || exit 1
542-
fi
543-
if [ ${TYPO3_VERSION} -eq 13 ]; then
524+
if [ ${TYPO3_VERSION} -eq 14 ]; then
544525
composer require --no-ansi --no-interaction --no-progress --no-install \
545-
typo3/cms-core:^13.4 || exit 1
526+
typo3/cms-core:^14.0 || exit 1
546527
fi
547528
composer update --no-ansi --no-interaction --no-progress --with-dependencies --prefer-lowest || exit 1
548529
composer show || exit 1

‎Classes/EventListener/ModifyIconForResourcePropertiesListener.php‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Ayacoo\AyacooSoundcloud\EventListener;
6+
7+
use TYPO3\CMS\Core\Imaging\Event\ModifyIconForResourcePropertiesEvent;
8+
use TYPO3\CMS\Core\Resource\File;
9+
10+
/**
11+
* Adjusts the icon for resources with mime type "audio/soundcloud".
12+
*/
13+
final class ModifyIconForResourcePropertiesListener
14+
{
15+
public function __invoke(ModifyIconForResourcePropertiesEvent $event): void
16+
{
17+
$resource = $event->getResource();
18+
19+
if (!$resource instanceof File) {
20+
return;
21+
}
22+
23+
if ($resource->getMimeType() === 'audio/soundcloud') {
24+
$event->setIconIdentifier('mimetypes-media-image-soundcloud');
25+
}
26+
}
27+
}

‎Configuration/Services.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,9 @@ services:
1616
command: 'soundcloud:updateMetadata'
1717
description: 'Updates the Soundcloud metadata'
1818
schedulable: true
19+
20+
Ayacoo\AyacooSoundcloud\EventListener\ModifyIconForResourcePropertiesListener:
21+
tags:
22+
- name: 'event.listener'
23+
identifier: 'ayacoo-soundcloud/modify-icon-for-resource'
24+
event: 'TYPO3\CMS\Core\Imaging\Event\ModifyIconForResourcePropertiesEvent'

‎Configuration/TCA/Overrides/sys_file_metadata.php‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?php
2+
3+
use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
4+
5+
if (!defined('TYPO3')) {
6+
die('Access denied.');
7+
}
8+
9+
$additionalColumns = [
10+
'soundcloud_thumbnail_url' => [
11+
'exclude' => true,
12+
'label' => 'LLL:EXT:ayacoo_soundcloud/Resources/Private/Language/locallang_db.xlf:sys_file_metadata.soundcloud_thumbnail_url',
13+
'config' => [
14+
'type' => 'link',
15+
'allowedTypes' => ['url'],
16+
'readOnly' => true,
17+
'size' => 40,
18+
],
19+
],
20+
'soundcloud_html' => [
21+
'exclude' => true,
22+
'label' => 'LLL:EXT:ayacoo_soundcloud/Resources/Private/Language/locallang_db.xlf:sys_file_metadata.soundcloud_html',
23+
'config' => [
24+
'type' => 'text',
25+
'dbType' => 'text',
26+
'cols' => 40,
27+
'rows' => 4,
28+
'readOnly' => true,
29+
],
30+
],
31+
'soundcloud_author_url' => [
32+
'exclude' => true,
33+
'label' => 'LLL:EXT:ayacoo_soundcloud/Resources/Private/Language/locallang_db.xlf:sys_file_metadata.soundcloud_author_url',
34+
'config' => [
35+
'type' => 'link',
36+
'allowedTypes' => ['url'],
37+
'default' => '',
38+
'readOnly' => true,
39+
'size' => 40,
40+
],
41+
],
42+
];
43+
44+
ExtensionManagementUtility::addTCAcolumns('sys_file_metadata', $additionalColumns);
45+
ExtensionManagementUtility::addToAllTCAtypes(
46+
'sys_file_metadata',
47+
'--div--;LLL:EXT:ayacoo_soundcloud/Resources/Private/Language/locallang_db.xlf:tab.soundcloud, soundcloud_thumbnail_url, soundcloud_html, soundcloud_author_url'
48+
);

0 commit comments

Comments
 (0)