From 91a3237fb281ab87ee9c5961d266ba7fb830e87d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Mon, 3 Oct 2022 21:11:52 -0300 Subject: [PATCH] Remove Sodium polyfill MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removes the paragonie/sodium_compat package. This polyfill is not required as the Sodium extension is bundled in PHP 7.2+. Signed-off-by: Maurício Meneghini Fauth --- .github/workflows/tests.yml | 2 +- composer.json | 3 +-- scripts/create-release.sh | 22 ---------------------- 3 files changed, 2 insertions(+), 25 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 693461ef7a..c2551123b3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -41,7 +41,7 @@ jobs: printf "set -exu && \ export V='%s' && \ apk add --update --no-cache \ - php\$V-cli php\$V-mysqli php\$V-session php\$V-mbstring php\$V-ctype \ + php\$V-cli php\$V-mysqli php\$V-session php\$V-mbstring php\$V-ctype php\$V-sodium \ php\$V-iconv php\$V-xml php\$V-tokenizer php\$V-xmlwriter php\$V-simplexml \ php\$V-dom php\$V-json php\$V-bz2 php\$V-curl php\$V-gd php\$V-zip \ musl-locales musl-locales-lang \ diff --git a/composer.json b/composer.json index 95e6de0090..7b96f5c031 100644 --- a/composer.json +++ b/composer.json @@ -54,11 +54,11 @@ "ext-mysqli": "*", "ext-openssl": "*", "ext-pcre": "*", + "ext-sodium": "*", "ext-xml": "*", "composer/ca-bundle": "^1.2", "google/recaptcha": "^1.1", "nikic/fast-route": "^1.3", - "paragonie/sodium_compat": "^1.17", "phpmyadmin/motranslator": "^5.0", "phpmyadmin/shapefile": "^3.0.1", "phpmyadmin/sql-parser": "^5.5", @@ -89,7 +89,6 @@ "ext-zip": "For zip import and export", "ext-gd2": "For image transformations", "ext-mbstring": "For best performance", - "ext-sodium": "Better encryption performance", "tecnickcom/tcpdf": "For PDF support", "pragmarx/google2fa-qrcode": "^2.1 - For 2FA authentication", "bacon/bacon-qr-code": "^2.0 - For 2FA authentication", diff --git a/scripts/create-release.sh b/scripts/create-release.sh index ebf869567b..252fd5edd6 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -201,28 +201,6 @@ cleanup_composer_vendors() { vendor/paragonie/constant_time_encoding/psalm.xml \ vendor/paragonie/constant_time_encoding/phpunit.xml.dist \ vendor/paragonie/constant_time_encoding/.travis.yml \ - vendor/paragonie/random_compat/other/build_phar.php \ - vendor/paragonie/random_compat/other \ - vendor/paragonie/random_compat/build-phar.sh \ - vendor/paragonie/random_compat/dist/random_compat.phar.pubkey \ - vendor/paragonie/random_compat/dist/random_compat.phar.pubkey.asc \ - vendor/paragonie/random_compat/dist \ - vendor/paragonie/random_compat/psalm-autoload.php \ - vendor/paragonie/random_compat/psalm.xml \ - vendor/paragonie/sodium_compat/.github/ \ - vendor/paragonie/sodium_compat/dist/ \ - vendor/paragonie/sodium_compat/phpunit.xml.dist \ - vendor/paragonie/sodium_compat/.gitignore \ - vendor/paragonie/sodium_compat/psalm-above-3.xml \ - vendor/paragonie/sodium_compat/psalm-below-3.xml \ - vendor/paragonie/sodium_compat/build-phar.sh \ - vendor/paragonie/sodium_compat/appveyor.yml \ - vendor/paragonie/sodium_compat/autoload-phpunit.php \ - vendor/paragonie/sodium_compat/autoload-pedantic.php \ - vendor/paragonie/sodium_compat/autoload-fast.php \ - vendor/paragonie/sodium_compat/composer-php52.json \ - vendor/paragonie/sodium_compat/src/PHP52/SplFixedArray.php \ - vendor/paragonie/sodium_compat/src/PHP52 \ vendor/pragmarx/google2fa/phpstan.neon \ vendor/pragmarx/google2fa-qrcode/.scrutinizer.yml \ vendor/pragmarx/google2fa-qrcode/.travis.yml \