From 4cea383eced30a2b424a220f0e4ba33d5d877695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Thu, 24 Apr 2025 16:01:39 -0300 Subject: [PATCH] Fix thecodingmachine/safe deprecations using a fork MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Forces Composer to use a fork of thecodingmachine/safe to fix its PHP 8.4 deprecations. https://github.com/MauricioFauth/thecodingmachine-safe/compare/v1.3.3...v1-php8.4 - Fixes https://github.com/phpmyadmin/phpmyadmin/issues/19404 Signed-off-by: Maurício Meneghini Fauth --- composer.json | 6 ++++++ scripts/create-release.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index beb7e3a38b..e3a9e67271 100644 --- a/composer.json +++ b/composer.json @@ -45,6 +45,11 @@ { "type": "composer", "url": "https://www.phpmyadmin.net" + }, + { + "type": "github", + "url": "https://github.com/MauricioFauth/thecodingmachine-safe.git", + "no-api": true } ], "require": { @@ -114,6 +119,7 @@ "roave/security-advisories": "dev-latest", "symfony/console": "^5.2.3", "tecnickcom/tcpdf": "^6.4.4", + "thecodingmachine/safe": "1.3.3.1", "vimeo/psalm": "^4.30", "web-auth/webauthn-lib": "^3.3.2" }, diff --git a/scripts/create-release.sh b/scripts/create-release.sh index c4b9a5c7e2..2b06ec9161 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -563,7 +563,7 @@ composer update --no-interaction --no-dev # Parse the required versions from composer.json PACKAGES_VERSIONS='' -PACKAGE_LIST='tecnickcom/tcpdf pragmarx/google2fa-qrcode bacon/bacon-qr-code code-lts/u2f-php-server web-auth/webauthn-lib' +PACKAGE_LIST='tecnickcom/tcpdf pragmarx/google2fa-qrcode bacon/bacon-qr-code code-lts/u2f-php-server web-auth/webauthn-lib thecodingmachine/safe' for PACKAGES in $PACKAGE_LIST do