diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6faf18676..a1794cdb5 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -55,7 +55,6 @@ updates: directory: "/Docker/SolrServer" schedule: interval: "daily" - target-branch: "release-11.6.x" commit-message: prefix: "[TASK] 11.6.x-dev " diff --git a/composer.json b/composer.json index 6db84a1c8..55d833dd4 100644 --- a/composer.json +++ b/composer.json @@ -70,6 +70,9 @@ "minimum-stability": "stable", "prefer-stable": true, "config": { + "platform": { + "php": "8.2" + }, "allow-plugins": true, "vendor-dir": ".Build/vendor", "bin-dir": ".Build/bin", @@ -109,7 +112,8 @@ "tests:restore-git": "echo \"Retore composer.json to initial state:\" && git checkout composer.json", "tests:env": [ "if [ -z ${TYPO3_VERSION+x} ]; then >&2 echo \"Can not proceed, because env var TYPO3_VERSION is not set\"; exit 1; else echo \"Setup test environment for TYPO3 ${TYPO3_VERSION}\"; fi", - "if echo $TYPO3_VERSION | grep -q \"dev\"; then $COMPOSER_BINARY config minimum-stability dev; fi" + "if echo $TYPO3_VERSION | grep -q \"dev\"; then $COMPOSER_BINARY config minimum-stability dev; fi", + "@composer config --unset platform" ], "tests:setup": [ "@tests:env",