diff --git a/INSTALL.md b/INSTALL.md index aeefd7a432..9c571a2d04 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -27,7 +27,7 @@ PHP modules The following software packages are *required* for this software to run correctly. -- PHP 7.3+ +- PHP 7.4+ - MariaDB 10.3+ - Web server Apache, lighttpd and nginx will all work. CGI mode is recommended and also some variant of 'suexec' (or a diff --git a/composer.json b/composer.json index 2b1f301c7e..fccded3289 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "project", "license": "AGPL-3.0-only", "require": { - "php": "^7.3.0", + "php": "^7.4.0", "ext-bcmath": "*", "ext-ctype": "*", "ext-curl": "*", diff --git a/composer.lock b/composer.lock index 865391b408..2b7cd45dbe 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f7c49732f6b0c37b67e783fc0d5535d2", + "content-hash": "ffd21e90500734effbec6791af16994c", "packages": [ { "name": "alchemy/binary-driver", @@ -6869,7 +6869,7 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": "^7.3.0", + "php": "^7.4.0", "ext-bcmath": "*", "ext-ctype": "*", "ext-curl": "*", @@ -6885,7 +6885,7 @@ }, "platform-dev": [], "platform-overrides": { - "php": "7.3.0" + "php": "7.4.0" }, "plugin-api-version": "2.0.0" } diff --git a/lib/util/framework.php b/lib/util/framework.php index d6c1449dca..237533a517 100644 --- a/lib/util/framework.php +++ b/lib/util/framework.php @@ -34,7 +34,7 @@ define('GNUSOCIAL_ENGINE', 'GNU social'); define('GNUSOCIAL_ENGINE_URL', 'https://gnusocial.rocks/'); define('GNUSOCIAL_ENGINE_REPO_URL', 'https://notabug.org/diogo/gnu-social/'); // Change to https://git.gnu.io/gnu/gnu-social -define('GNUSOCIAL_BASE_VERSION', '2.0.0'); +define('GNUSOCIAL_BASE_VERSION', '2.0.1'); define('GNUSOCIAL_LIFECYCLE', 'beta0'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release' define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE); diff --git a/lib/util/installer.php b/lib/util/installer.php index 6b4270d016..16e248d2f2 100644 --- a/lib/util/installer.php +++ b/lib/util/installer.php @@ -112,8 +112,8 @@ abstract class Installer } } - if (version_compare(PHP_VERSION, '7.3.0', '<')) { - $this->warning('Require PHP version 7.3.0 or greater.'); + if (version_compare(PHP_VERSION, '7.4.0', '<')) { + $this->warning('Require PHP version 7.4.0 or greater.'); $pass = false; } diff --git a/modules/AuthCrypt/AuthCryptModule.php b/modules/AuthCrypt/AuthCryptModule.php index da4c93bc1f..e953c41859 100644 --- a/modules/AuthCrypt/AuthCryptModule.php +++ b/modules/AuthCrypt/AuthCryptModule.php @@ -27,16 +27,6 @@ defined('GNUSOCIAL') || die; -if (version_compare(PHP_VERSION, '7.4.0', '<')) { - function password_algos(): array - { - $algos = [PASSWORD_BCRYPT]; - defined('PASSWORD_ARGON2I') && $algos[] = PASSWORD_ARGON2I; - defined('PASSWORD_ARGON2ID') && $algos[] = PASSWORD_ARGON2ID; - return $algos; - } -} - class AuthCryptModule extends AuthenticationModule { const MODULE_VERSION = '2.0.0'; diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php index 863493b833..1c87427b83 100644 --- a/vendor/composer/InstalledVersions.php +++ b/vendor/composer/InstalledVersions.php @@ -30,7 +30,7 @@ class InstalledVersions 'aliases' => array ( ), - 'reference' => 'cd3a9ec6a9a22fb3b46a293be7223f86b0006f24', + 'reference' => '7d8988d50ce24639daaf48608ce14d91291a519d', 'name' => 'gnusocial/gnusocial', ), 'versions' => @@ -114,7 +114,7 @@ class InstalledVersions 'aliases' => array ( ), - 'reference' => 'cd3a9ec6a9a22fb3b46a293be7223f86b0006f24', + 'reference' => '7d8988d50ce24639daaf48608ce14d91291a519d', ), 'guzzlehttp/psr7' => array ( diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 70e0f7329d..966e291f36 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -6,7 +6,7 @@ 'aliases' => array ( ), - 'reference' => 'cd3a9ec6a9a22fb3b46a293be7223f86b0006f24', + 'reference' => '7d8988d50ce24639daaf48608ce14d91291a519d', 'name' => 'gnusocial/gnusocial', ), 'versions' => @@ -90,7 +90,7 @@ 'aliases' => array ( ), - 'reference' => 'cd3a9ec6a9a22fb3b46a293be7223f86b0006f24', + 'reference' => '7d8988d50ce24639daaf48608ce14d91291a519d', ), 'guzzlehttp/psr7' => array ( diff --git a/vendor/composer/platform_check.php b/vendor/composer/platform_check.php index 92370c5a0c..580fa96095 100644 --- a/vendor/composer/platform_check.php +++ b/vendor/composer/platform_check.php @@ -4,8 +4,8 @@ $issues = array(); -if (!(PHP_VERSION_ID >= 70300)) { - $issues[] = 'Your Composer dependencies require a PHP version ">= 7.3.0". You are running ' . PHP_VERSION . '.'; +if (!(PHP_VERSION_ID >= 70400)) { + $issues[] = 'Your Composer dependencies require a PHP version ">= 7.4.0". You are running ' . PHP_VERSION . '.'; } if ($issues) {