From 0fec1fcc5f9c71a371ed8f48dd7bb1829a488514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20H=C3=A4u=C3=9Fler?= Date: Sat, 6 Jul 2024 19:38:40 +0200 Subject: [PATCH 1/2] [FEATURE] Add support for TYPO3 v13.2 --- .github/workflows/tests.yaml | 4 ++-- Documentation/Installation/Index.rst | 6 ++++-- Documentation/Introduction/Index.rst | 2 +- README.md | 2 +- composer.json | 14 +++++++------- composer.lock | 20 ++++++++++---------- ext_emconf.php | 2 +- 7 files changed, 26 insertions(+), 24 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 9f965f79..2f584cbb 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -16,11 +16,11 @@ jobs: fail-fast: false matrix: php-version: ["8.1", "8.2", "8.3"] - typo3-version: ["12.4", "13.1"] + typo3-version: ["12.4", "13.2"] dependencies: ["highest", "lowest"] exclude: - php-version: "8.1" - typo3-version: "13.1" + typo3-version: "13.2" steps: - uses: actions/checkout@v4 with: diff --git a/Documentation/Installation/Index.rst b/Documentation/Installation/Index.rst index e825cf2a..635594be 100644 --- a/Documentation/Installation/Index.rst +++ b/Documentation/Installation/Index.rst @@ -12,7 +12,7 @@ Requirements ============ - PHP 8.1 - 8.3 -- TYPO3 12.4 LTS - 13.1 +- TYPO3 12.4 LTS - 13.2 .. _steps: @@ -36,7 +36,9 @@ Version matrix +--------------------+-------------------------+---------------+ | Extension versions | TYPO3 versions | PHP versions | +====================+=========================+===============+ -| **since 2.2.0** | **12.4 LTS - 13.1** | **8.1 - 8.3** | +| **since 2.3.0** | **12.4 LTS - 13.2** | **8.1 - 8.3** | ++--------------------+-------------------------+---------------+ +| 2.2.0 | 12.4 LTS - 13.1 | 8.1 - 8.3 | +--------------------+-------------------------+---------------+ | 2.1.0 | 12.4 LTS - 13.0 | 8.1 - 8.3 | +--------------------+-------------------------+---------------+ diff --git a/Documentation/Introduction/Index.rst b/Documentation/Introduction/Index.rst index c4eed967..1930fc70 100644 --- a/Documentation/Introduction/Index.rst +++ b/Documentation/Introduction/Index.rst @@ -39,7 +39,7 @@ Features - Support for :ref:`custom crawlers ` and :ref:`crawling strategies ` - :ref:`Console commands ` -- Compatible with TYPO3 12.4 LTS and 13.1 (see :ref:`version matrix `) +- Compatible with TYPO3 12.4 LTS and 13.2 (see :ref:`version matrix `) .. _support: diff --git a/README.md b/README.md index 6ba6f7b1..9d56eba5 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ It supports multiple languages and custom crawler implementations. * Multi-language support * Support for custom crawlers * Console command -* Compatible with TYPO3 12.4 LTS and 13.1 +* Compatible with TYPO3 12.4 LTS and 13.2 ## 🔥 Installation diff --git a/composer.json b/composer.json index f893e7b2..15abd73c 100644 --- a/composer.json +++ b/composer.json @@ -31,10 +31,10 @@ "psr/log": "^1.0 || ^2.0 || ^3.0", "symfony/console": "^6.0 || ^7.0", "symfony/dependency-injection": "^6.0 || ^7.0", - "typo3/cms-backend": "~12.4.2 || ~13.1.0", - "typo3/cms-core": "~12.4.2 || ~13.1.0", - "typo3/cms-extbase": "~12.4.2 || ~13.1.0", - "typo3/cms-fluid": "~12.4.2 || ~13.1.0" + "typo3/cms-backend": "~12.4.2 || ~13.2.0", + "typo3/cms-core": "~12.4.2 || ~13.2.0", + "typo3/cms-extbase": "~12.4.2 || ~13.2.0", + "typo3/cms-fluid": "~12.4.2 || ~13.2.0" }, "require-dev": { "codeception/module-asserts": "^3.0", @@ -45,9 +45,9 @@ "eliashaeussler/typo3-codeception-helper": "^1.0", "phpunit/phpcov": "^9.0 || ^10.0", "symfony/config": "^6.0 || ^7.0", - "typo3/cms-install": "~12.4.2 || ~13.1.0", - "typo3/cms-seo": "~12.4.2 || ~13.1.0", - "typo3/cms-tstemplate": "~12.4.2 || ~13.1.0", + "typo3/cms-install": "~12.4.2 || ~13.2.0", + "typo3/cms-seo": "~12.4.2 || ~13.2.0", + "typo3/cms-tstemplate": "~12.4.2 || ~13.2.0", "typo3/testing-framework": "^8.0.9" }, "autoload": { diff --git a/composer.lock b/composer.lock index dcded30a..194edc2d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1e15fd8d934c17cd0bc992ec3cd12b50", + "content-hash": "89638fe6738085875af212825c3507ac", "packages": [ { "name": "bacon/bacon-qr-code", @@ -1006,16 +1006,16 @@ }, { "name": "eliashaeussler/typo3-sitemap-locator", - "version": "0.1.4", + "version": "0.1.5", "source": { "type": "git", "url": "https://github.com/eliashaeussler/typo3-sitemap-locator.git", - "reference": "b94d4b2b97d9e1e21f55408778d0c21137ef9eeb" + "reference": "b4008800394c4a5241a0c35efeec961ff9cc65b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/eliashaeussler/typo3-sitemap-locator/zipball/b94d4b2b97d9e1e21f55408778d0c21137ef9eeb", - "reference": "b94d4b2b97d9e1e21f55408778d0c21137ef9eeb", + "url": "https://api.github.com/repos/eliashaeussler/typo3-sitemap-locator/zipball/b4008800394c4a5241a0c35efeec961ff9cc65b4", + "reference": "b4008800394c4a5241a0c35efeec961ff9cc65b4", "shasum": "" }, "require": { @@ -1025,14 +1025,14 @@ "psr/http-message": "^1.0 || ^2.0", "symfony/console": "^5.4 || ^6.0 || ^7.0", "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0", - "typo3/cms-backend": "~11.5.4 || ~12.4.0 || ~13.1.0", - "typo3/cms-core": "~11.5.4 || ~12.4.0 || ~13.1.0" + "typo3/cms-backend": "~11.5.4 || ~12.4.0 || ~13.2.0", + "typo3/cms-core": "~11.5.4 || ~12.4.0 || ~13.2.0" }, "require-dev": { "phpunit/phpcov": "^9.0 || ^10.0", "phpunit/phpunit": "^10.1 || ^11.0", "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0", - "typo3/cms-seo": "~11.5.4 || ~12.4.0 || ~13.1.0", + "typo3/cms-seo": "~11.5.4 || ~12.4.0 || ~13.2.0", "typo3/testing-framework": "^7.0.2 || ^8.0.9" }, "type": "typo3-cms-extension", @@ -1062,9 +1062,9 @@ "description": "Extension for TYPO3 CMS to locate XML sitemaps as part of a configured site", "support": { "issues": "https://github.com/eliashaeussler/typo3-sitemap-locator/issues", - "source": "https://github.com/eliashaeussler/typo3-sitemap-locator/tree/0.1.4" + "source": "https://github.com/eliashaeussler/typo3-sitemap-locator/tree/0.1.5" }, - "time": "2024-05-04T13:46:21+00:00" + "time": "2024-07-06T17:32:06+00:00" }, { "name": "enshrined/svg-sanitize", diff --git a/ext_emconf.php b/ext_emconf.php index e67b6e91..f22787fa 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -30,7 +30,7 @@ 'author_email' => 'elias@haeussler.dev', 'constraints' => [ 'depends' => [ - 'typo3' => '12.4.2-13.1.99', + 'typo3' => '12.4.2-13.2.99', 'php' => '8.1.0-8.3.99', 'sitemap_locator' => '0.1.0-0.1.99', ], From d260e306e6f6bb86a7fcef7500646acc05bc333b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20H=C3=A4u=C3=9Fler?= Date: Thu, 11 Jul 2024 07:57:30 +0200 Subject: [PATCH 2/2] [BUGFIX] Handle wrong package path calculation for extension development Can be reverted once https://review.typo3.org/c/Packages/TYPO3.CMS/+/85212 is merged and released. --- Tests/Build/Scripts/fix_invalid_package_path.sh | 16 ++++++++++++++++ composer.json | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100755 Tests/Build/Scripts/fix_invalid_package_path.sh diff --git a/Tests/Build/Scripts/fix_invalid_package_path.sh b/Tests/Build/Scripts/fix_invalid_package_path.sh new file mode 100755 index 00000000..b0cc8014 --- /dev/null +++ b/Tests/Build/Scripts/fix_invalid_package_path.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash +# shellcheck disable=SC2155,SC2059 +set -e + +readonly artifactFile=".Build/vendor/typo3/PackageArtifact.php" +readonly tempFile="$(mktemp)" + +CYAN="\e[36m" +YELLOW="\e[43m" +NC="\e[0m" + +printf "${YELLOW}Running script to fix invalid package path in PackageArtifact.${NC}\n" +printf "${CYAN}Please remove this script once https://review.typo3.org/c/Packages/TYPO3.CMS/+/85212 is released.${NC}\n" + +awk '{ gsub(/packagePath";s:2:"\/\/"/, "packagePath\";s:0:\"\""); print }' "$artifactFile" > "$tempFile" \ + && mv "$tempFile" "$artifactFile" diff --git a/composer.json b/composer.json index 15abd73c..341eff1e 100644 --- a/composer.json +++ b/composer.json @@ -88,7 +88,8 @@ "@composer -d Tests/CGL update" ], "post-autoload-dump": [ - "@environment:prepare" + "@environment:prepare", + "Tests/Build/Scripts/fix_invalid_package_path.sh" ], "cgl": "@composer -d Tests/CGL --", "docs": [