From 7eb051efd8b9b2296cf5105d9042421e8df468ae Mon Sep 17 00:00:00 2001 From: Guido Schmechel Date: Sat, 7 Jun 2025 17:55:17 +0200 Subject: [PATCH 1/2] Fix fetchAllAssociative and correct video online check (#43) --- Classes/Domain/Repository/FileRepository.php | 2 +- Classes/Service/Validator/AbstractVideoValidator.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Classes/Domain/Repository/FileRepository.php b/Classes/Domain/Repository/FileRepository.php index eda4e71..cd5fb97 100644 --- a/Classes/Domain/Repository/FileRepository.php +++ b/Classes/Domain/Repository/FileRepository.php @@ -317,7 +317,7 @@ protected function getPageTreeIds(int $id, int $depth, int $begin): array ) ) ->executeQuery(); - $rows = $result->fetchAssociative(); + $rows = $result->fetchAllAssociative(); $pageIds = []; foreach ($rows as $row) { diff --git a/Classes/Service/Validator/AbstractVideoValidator.php b/Classes/Service/Validator/AbstractVideoValidator.php index 44875f3..94bfa3f 100644 --- a/Classes/Service/Validator/AbstractVideoValidator.php +++ b/Classes/Service/Validator/AbstractVideoValidator.php @@ -18,6 +18,6 @@ public function isVideoOnline($mediaId): bool $this->getOEmbedUrl($mediaId) ); - return is_string($oEmbed) ?? false; + return is_string($oEmbed); } } From ba6cffb35a23747545a122245789f286f100539c Mon Sep 17 00:00:00 2001 From: Guido Schmechel Date: Wed, 24 Dec 2025 14:36:52 +0100 Subject: [PATCH 2/2] [TASK] Add PHP 8.5 support (#44) --- .github/workflows/ci.yml | 9 ++++++++- Build/Scripts/runTests.sh | 5 +++-- README.md | 2 +- composer.json | 4 ++-- ext_emconf.php | 4 ++-- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a3baf8d..4304ca2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,6 +7,8 @@ on: branches: - main - v4 + - php85 + - typo3-v14 pull_request: permissions: contents: read @@ -35,6 +37,7 @@ jobs: - "8.2" - "8.3" - "8.4" + - "8.5" code-quality: name: "Code quality checks" runs-on: ubuntu-22.04 @@ -74,6 +77,7 @@ jobs: - "8.2" - "8.3" - "8.4" + - "8.5" unit-tests: name: "Unit tests" runs-on: ubuntu-22.04 @@ -123,6 +127,9 @@ jobs: - typo3-version: "^13.4" php-version: "8.4" composer-dependencies: highest + - typo3-version: "^13.4" + php-version: "8.5" + composer-dependencies: highest functional-tests: name: "Functional tests" runs-on: ubuntu-22.04 @@ -132,7 +139,7 @@ jobs: # rest matrix jobs be executed anyway. fail-fast: false matrix: - php: [ '8.2', '8.3', '8.4' ] + php: [ '8.2', '8.3', '8.4', '8.5' ] composerInstall: [ 'composerInstallHighest' ] steps: - name: Checkout diff --git a/Build/Scripts/runTests.sh b/Build/Scripts/runTests.sh index f63628a..05d79a0 100755 --- a/Build/Scripts/runTests.sh +++ b/Build/Scripts/runTests.sh @@ -233,7 +233,7 @@ Options: - 12.4: use TYPO3 v12 - 13.4: use TYPO3 v13 - -p <7.4|8.0|8.1|8.2|8.3|8.4> + -p <7.4|8.0|8.1|8.2|8.3|8.5> Specifies the PHP minor version to be used - 7.4: use PHP 7.4 (default) - 8.0: use PHP 8.0 @@ -241,6 +241,7 @@ Options: - 8.2: use PHP 8.2 - 8.3: use PHP 8.3 - 8.4: use PHP 8.4 + - 8.5: use PHP 8.5 -e "" Only with -s docsGenerate|functional|unit @@ -363,7 +364,7 @@ while getopts "a:b:s:d:i:p:e:t:xy:nhu" OPT; do ;; p) PHP_VERSION=${OPTARG} - if ! [[ ${PHP_VERSION} =~ ^(7.4|8.0|8.1|8.2|8.3|8.4)$ ]]; then + if ! [[ ${PHP_VERSION} =~ ^(7.4|8.0|8.1|8.2|8.3|8.4|8.5)$ ]]; then INVALID_OPTIONS+=("-p ${OPTARG}") fi ;; diff --git a/README.md b/README.md index f64d2aa..5e5a4cb 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ you can take care of the corresponding corrections. | Version | TYPO3 | PHP | Support / Development | |---------|-------------|-----------|--------------------------------------| -| 4.x | 13.x | 8.2 - 8.4 | features, bugfixes, security updates | +| 4.x | 13.x | 8.2 - 8.5 | features, bugfixes, security updates | | 3.x | 12.x | 8.1 - 8.4 | bugfixes, security updates | | 2.x | 10.x - 11.x | 7.4 - 8.0 | bugfixes, security updates | diff --git a/composer.json b/composer.json index 6ae0551..6cb9ea5 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "ayacoo/video-validator", "type": "typo3-cms-extension", - "version": "4.1.2", + "version": "4.1.3", "description": "Checks online videos in TYPO3 for availability", "homepage": "https://www.ayacoo.de", "authors": [ @@ -18,7 +18,7 @@ "GPL-2.0-or-later" ], "require": { - "php": ">=8.2 < 8.5", + "php": ">=8.2 < 8.6", "typo3/cms-core": "^13.4" }, "require-dev": { diff --git a/ext_emconf.php b/ext_emconf.php index 44af02f..4cbfa75 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -9,10 +9,10 @@ 'state' => 'stable', 'createDirs' => '', 'clearCacheOnLoad' => 0, - 'version' => '4.1.2', + 'version' => '4.1.3', 'constraints' => [ 'depends' => [ - 'php' => '8.2.0-8.4.99', + 'php' => '8.2.0-8.5.99', 'typo3' => '13.0.0-13.4.99', ], 'conflicts' => [