diff --git a/README.md b/README.md index 4d35fc0..6b3980b 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ ready-to-use DDEV configuration and basic configuration for deployment with Depl * Composer-based [TYPO3 CMS](https://typo3.org) project template * Ready-to-use [DDEV](https://ddev.readthedocs.io) configuration -* Compatible with TYPO3 11.5 LTS and 12.4 LTS +* Compatible with TYPO3 11.5 LTS, 12.4 LTS and 13.4 LTS * Support of current stable PHP versions, starting from PHP 8.1 ### Optional features diff --git a/config.yaml b/config.yaml index 44b86f1..d929cf2 100644 --- a/config.yaml +++ b/config.yaml @@ -58,6 +58,7 @@ properties: name: TYPO3 version type: select options: + - value: 13.4 - value: 12.4 - value: 11.5 validators: @@ -66,7 +67,9 @@ properties: name: TYPO3 testing framework version type: dynamicSelect options: - - value: '^8.0' # renovate: datasource=packagist depName=typo3/testing-framework + - value: '^9.0' # renovate: datasource=packagist depName=typo3/testing-framework + if: 'packages["typo3_cms"] == "13.4"' + - value: '^8.0' if: 'packages["typo3_cms"] == "12.4"' - value: '^7.0' if: 'packages["typo3_cms"] == "11.5"' @@ -74,8 +77,8 @@ properties: name: TYPO3 console version type: dynamicSelect options: - - value: '^8.0' # renovate: datasource=packagist depName=helhum/typo3-console - if: 'packages["typo3_cms"] == "12.4"' + - value: '^8.2.1' # renovate: datasource=packagist depName=helhum/typo3-console + if: 'packages["typo3_cms"] != "11.5"' - value: '^7.0.3' if: 'packages["typo3_cms"] == "11.5"' - identifier: typo3_console_binary @@ -83,7 +86,7 @@ properties: type: dynamicSelect options: - value: 'typo3' - if: 'packages["typo3_cms"] == "12.4"' + if: 'packages["typo3_cms"] != "11.5"' - value: 'typo3cms' if: 'packages["typo3_cms"] == "11.5"' - identifier: php @@ -93,6 +96,7 @@ properties: - value: '8.3' - value: '8.2' - value: '8.1' + if: 'packages["typo3_cms"] != "13.4"' validators: - type: notEmpty - identifier: editorconfig_cli @@ -113,11 +117,12 @@ properties: - value: 'typo3/cms-indexed-search' - value: 'typo3/cms-linkvalidator' - value: 'typo3/cms-reactions' - if: 'packages["typo3_cms"] == "12.4"' + if: 'packages["typo3_cms"] != "11.5"' - value: 'typo3/cms-sys-note' - value: 'typo3/cms-t3editor' + if: 'packages["typo3_cms"] != "13.4"' - value: 'typo3/cms-webhooks' - if: 'packages["typo3_cms"] == "12.4"' + if: 'packages["typo3_cms"] != "11.5"' - value: 'typo3/cms-workspaces' # Features @@ -127,9 +132,19 @@ properties: - identifier: phpstan name: Should PHPStan be integrated? type: question + options: + - value: '^2.0' # renovate: datasource=packagist depName=phpstan/phpstan + if: 'selected && packages["typo3_cms"] == "13.4"' + - value: '^1.0' + if: 'selected && packages["typo3_cms"] != "13.4"' - identifier: rector name: Should Rector be integrated? type: question + options: + - value: '^3.0' # renovate: datasource=packagist depName=ssch/typo3-rector + if: 'selected && packages["typo3_cms"] == "13.4"' + - value: '^2.0' + if: 'selected && packages["typo3_cms"] != "13.4"' - identifier: deployer name: Do you want a basic Deployer deployment configuration? type: question diff --git a/templates/next-steps.html.twig b/templates/next-steps.html.twig index 0087a73..99c1731 100644 --- a/templates/next-steps.html.twig +++ b/templates/next-steps.html.twig @@ -10,7 +10,7 @@ Run ddev config --auto to create the final DDEV configuration You can now launch your installed project with ddev launch. Follow all installation instructions to finalize the TYPO3 installation. -{% if packages.typo3_cms == "12.4" %} +{% if packages.typo3_cms != "11.5" %} You can also run ddev typo3 setup to complete the installation process. {% endif %} diff --git a/templates/src/composer.json.twig b/templates/src/composer.json.twig index f65b7d1..b0e04ac 100644 --- a/templates/src/composer.json.twig +++ b/templates/src/composer.json.twig @@ -33,7 +33,7 @@ "typo3/cms-install": "^{{ packages.typo3_cms }}", "typo3/cms-lowlevel": "^{{ packages.typo3_cms }}", "typo3/cms-opendocs": "^{{ packages.typo3_cms }}", -{% if packages.typo3_cms != "12.4" %} +{% if packages.typo3_cms == "11.5" %} "typo3/cms-recordlist": "^{{ packages.typo3_cms }}", {% endif %} "typo3/cms-recycler": "^{{ packages.typo3_cms }}", @@ -56,14 +56,14 @@ "helmich/typo3-typoscript-lint": "^3.0", {% if features.phpstan %} "phpstan/extension-installer": "^1.2", - "phpstan/phpstan": "^1.8", + "phpstan/phpstan": "{{ features.phpstan }}", {% endif %} "roave/security-advisories": "dev-latest", {% if features.phpstan %} - "saschaegerer/phpstan-typo3": "^1.8", + "saschaegerer/phpstan-typo3": "{{ features.phpstan }}", {% endif %} {% if features.rector %} - "ssch/typo3-rector": "^2.0", + "ssch/typo3-rector": "{{ features.rector }}", {% endif %} "typo3/coding-standards": "^0.8.0", "typo3/testing-framework": "{{ packages.typo3_testing_framework }}"