From ad1f1ec1cdeaa076dac20341883d409c951f1a01 Mon Sep 17 00:00:00 2001 From: Christine Zoglmeier Date: Thu, 19 Dec 2024 14:27:35 +0100 Subject: [PATCH] [META] Update composer dependencies and php version --- .project/docker/foreign-php/Dockerfile | 2 +- .project/docker/local-php/Dockerfile | 2 +- Build/foreign/composer.json | 83 ++++++++++++------------ Build/local/composer.json | 88 ++++++++++++-------------- 4 files changed, 84 insertions(+), 91 deletions(-) diff --git a/.project/docker/foreign-php/Dockerfile b/.project/docker/foreign-php/Dockerfile index 8749da9f5..9a60c3b36 100644 --- a/.project/docker/foreign-php/Dockerfile +++ b/.project/docker/foreign-php/Dockerfile @@ -1,4 +1,4 @@ -FROM in2code/php-dev:8.1-fpm +FROM in2code/php-dev:8.2-fpm ARG USER_ID=1000 ARG GROUP_ID=1000 diff --git a/.project/docker/local-php/Dockerfile b/.project/docker/local-php/Dockerfile index cc4577832..d6486fc9e 100644 --- a/.project/docker/local-php/Dockerfile +++ b/.project/docker/local-php/Dockerfile @@ -1,4 +1,4 @@ -FROM in2code/php-dev:8.1-fpm +FROM in2code/php-dev:8.2-fpm ARG USER_ID=1000 ARG GROUP_ID=1000 diff --git a/Build/foreign/composer.json b/Build/foreign/composer.json index 0ddfcb49c..8a40a7c00 100644 --- a/Build/foreign/composer.json +++ b/Build/foreign/composer.json @@ -16,49 +16,49 @@ } ], "require": { - "php": "^7.4 || ^8.1", + "php": ">= 8.2.0 <= 8.4.99", "ext-json": "*", "ext-pdo": "*", "ext-zip": "*", - "georgringer/news": "^11.2", - "helhum/typo3-console": "^8.0", + "georgringer/news": "^12.2", + "helhum/typo3-console": "^8.2", "in2code/in2publish_core": "@dev", - "typo3/cms-about": "^12.4", - "typo3/cms-adminpanel": "^12.4", - "typo3/cms-backend": "^12.4", - "typo3/cms-belog": "^12.4", - "typo3/cms-beuser": "^12.4", - "typo3/cms-core": "^12.4", - "typo3/cms-dashboard": "^12.4", - "typo3/cms-extbase": "^12.4", - "typo3/cms-extensionmanager": "^12.4", - "typo3/cms-felogin": "^12.4", - "typo3/cms-filelist": "^12.4", - "typo3/cms-fluid": "^12.4", - "typo3/cms-fluid-styled-content": "^12.4", - "typo3/cms-form": "^12.4", - "typo3/cms-frontend": "^12.4", - "typo3/cms-impexp": "^12.4", - "typo3/cms-indexed-search": "^12.4", - "typo3/cms-info": "^12.4", - "typo3/cms-install": "^12.4", - "typo3/cms-linkvalidator": "^12.4", - "typo3/cms-lowlevel": "^12.4", - "typo3/cms-opendocs": "^12.4", - "typo3/cms-recordlist": "^12.4", - "typo3/cms-recycler": "^12.4", - "typo3/cms-redirects": "^12.4", - "typo3/cms-reports": "^12.4", - "typo3/cms-rte-ckeditor": "^12.4", - "typo3/cms-scheduler": "^12.4", - "typo3/cms-seo": "^12.4", - "typo3/cms-setup": "^12.4", - "typo3/cms-styleguide": "^12.0", - "typo3/cms-sys-note": "^12.4", - "typo3/cms-t3editor": "^12.4", - "typo3/cms-tstemplate": "^12.4", - "typo3/cms-viewpage": "^12.4", - "typo3/cms-workspaces": "^12.4" + "typo3/cms-about": "^13.4", + "typo3/cms-adminpanel": "^13.4", + "typo3/cms-backend": "^13.4", + "typo3/cms-belog": "^13.4", + "typo3/cms-beuser": "^13.4", + "typo3/cms-core": "^13.4", + "typo3/cms-dashboard": "^13.4", + "typo3/cms-extbase": "^13.4", + "typo3/cms-extensionmanager": "^13.4", + "typo3/cms-felogin": "^13.4", + "typo3/cms-filelist": "^13.4", + "typo3/cms-fluid": "^13.4", + "typo3/cms-fluid-styled-content": "^13.4", + "typo3/cms-form": "^13.4", + "typo3/cms-frontend": "^13.4", + "typo3/cms-impexp": "^13.4", + "typo3/cms-indexed-search": "^13.4", + "typo3/cms-info": "^13.4", + "typo3/cms-install": "^13.4", + "typo3/cms-linkvalidator": "^13.4", + "typo3/cms-lowlevel": "^13.4", + "typo3/cms-opendocs": "^13.4", + "typo3/cms-recordlist": "^13.4", + "typo3/cms-recycler": "^13.4", + "typo3/cms-redirects": "^13.4", + "typo3/cms-reports": "^13.4", + "typo3/cms-rte-ckeditor": "^13.4", + "typo3/cms-scheduler": "^13.4", + "typo3/cms-seo": "^13.4", + "typo3/cms-setup": "^13.4", + "typo3/cms-styleguide": "^13.4", + "typo3/cms-sys-note": "^13.4", + "typo3/cms-t3editor": "^13.4", + "typo3/cms-tstemplate": "^13.4", + "typo3/cms-viewpage": "^13.4", + "typo3/cms-workspaces": "^13.4" }, "config": { "sort-packages": true, @@ -77,9 +77,6 @@ } }, "require-dev": { - "typo3/testing-framework": "^8.0", - "co-stack/mysql-loader": "@dev", - "co-stack/process-manager": "^3.1", - "co-stack/stack-test": "@dev" + "typo3/testing-framework": "^9.1" } } diff --git a/Build/local/composer.json b/Build/local/composer.json index f3d18b801..fa2545744 100644 --- a/Build/local/composer.json +++ b/Build/local/composer.json @@ -16,50 +16,50 @@ } ], "require": { - "php": "^7.4 || ^8.1", + "php": ">= 8.2.0 <= 8.4.99", "ext-json": "*", "ext-pdo": "*", "ext-ssh2": "*", "ext-zip": "*", - "georgringer/news": "^11.2", - "helhum/typo3-console": "^8.0", + "georgringer/news": "^12.2", + "helhum/typo3-console": "^8.2", "in2code/in2publish_core": "@dev", - "typo3/cms-about": "^12.4", - "typo3/cms-adminpanel": "^12.4", - "typo3/cms-backend": "^12.4", - "typo3/cms-belog": "^12.4", - "typo3/cms-beuser": "^12.4", - "typo3/cms-core": "^12.4", - "typo3/cms-dashboard": "^12.4", - "typo3/cms-extbase": "^12.4", - "typo3/cms-extensionmanager": "^12.4", - "typo3/cms-felogin": "^12.4", - "typo3/cms-filelist": "^12.4", - "typo3/cms-fluid": "^12.4", - "typo3/cms-fluid-styled-content": "^12.4", - "typo3/cms-form": "^12.4", - "typo3/cms-frontend": "^12.4", - "typo3/cms-impexp": "^12.4", - "typo3/cms-indexed-search": "^12.4", - "typo3/cms-info": "^12.4", - "typo3/cms-install": "^12.4", - "typo3/cms-linkvalidator": "^12.4", - "typo3/cms-lowlevel": "^12.4", - "typo3/cms-opendocs": "^12.4", - "typo3/cms-recordlist": "^12.4", - "typo3/cms-recycler": "^12.4", - "typo3/cms-redirects": "^12.4", - "typo3/cms-reports": "^12.4", - "typo3/cms-rte-ckeditor": "^12.4", - "typo3/cms-scheduler": "^12.4", - "typo3/cms-seo": "^12.4", - "typo3/cms-setup": "^12.4", - "typo3/cms-styleguide": "^12.0", - "typo3/cms-sys-note": "^12.4", - "typo3/cms-t3editor": "^12.4", - "typo3/cms-tstemplate": "^12.4", - "typo3/cms-viewpage": "^12.4", - "typo3/cms-workspaces": "^12.4" + "typo3/cms-about": "^13.4", + "typo3/cms-adminpanel": "^13.4", + "typo3/cms-backend": "^13.4", + "typo3/cms-belog": "^13.4", + "typo3/cms-beuser": "^13.4", + "typo3/cms-core": "^13.4", + "typo3/cms-dashboard": "^13.4", + "typo3/cms-extbase": "^13.4", + "typo3/cms-extensionmanager": "^13.4", + "typo3/cms-felogin": "^13.4", + "typo3/cms-filelist": "^13.4", + "typo3/cms-fluid": "^13.4", + "typo3/cms-fluid-styled-content": "^13.4", + "typo3/cms-form": "^13.4", + "typo3/cms-frontend": "^13.4", + "typo3/cms-impexp": "^13.4", + "typo3/cms-indexed-search": "^13.4", + "typo3/cms-info": "^13.4", + "typo3/cms-install": "^13.4", + "typo3/cms-linkvalidator": "^13.4", + "typo3/cms-lowlevel": "^13.4", + "typo3/cms-opendocs": "^13.4", + "typo3/cms-recordlist": "^13.4", + "typo3/cms-recycler": "^13.4", + "typo3/cms-redirects": "^13.4", + "typo3/cms-reports": "^13.4", + "typo3/cms-rte-ckeditor": "^13.4", + "typo3/cms-scheduler": "^13.4", + "typo3/cms-seo": "^13.4", + "typo3/cms-setup": "^13.4", + "typo3/cms-styleguide": "^13.4", + "typo3/cms-sys-note": "^13.4", + "typo3/cms-t3editor": "^13.4", + "typo3/cms-tstemplate": "^13.4", + "typo3/cms-viewpage": "^13.4", + "typo3/cms-workspaces": "^13.4" }, "config": { "sort-packages": true, @@ -77,16 +77,12 @@ "web-dir": "public" } }, - "require-dev": { - "typo3/testing-framework": "^8.0", - "co-stack/mysql-loader": "@dev", - "co-stack/process-manager": "^3.1", - "co-stack/stack-test": "@dev", - "mikey179/vfsstream": "^v1.6" - }, "autoload-dev": { "psr-4": { "In2code\\In2publishCore\\Tests\\": "/app/Tests/" } + }, + "require-dev": { + "typo3/testing-framework": "^9.1" } }