diff --git a/phpBB/common.php b/phpBB/common.php index b622a257a1..5e729a8e9c 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -12,7 +12,7 @@ */ /** -* Minimum Requirement: PHP 7.1.3 +* Minimum Requirement: PHP 7.2.0 */ if (!defined('IN_PHPBB')) diff --git a/phpBB/composer.json b/phpBB/composer.json index b5947836c4..870ea9f975 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -31,6 +31,7 @@ "ext-pdo": "*", "ext-zlib": "*", "bantu/ini-get-wrapper": "~1.0", + "carlos-mg89/oauth": "^0.8.15", "chita/topological_sort": "^3.0", "composer/composer": "^2.0", "composer/installers": "^1.9", @@ -38,7 +39,6 @@ "doctrine/dbal": "~3.3.6", "google/recaptcha": "~1.1", "guzzlehttp/guzzle": "~6.3", - "lusitanian/oauth": "^0.8.1", "marc1706/fast-image-size": "^1.1", "s9e/text-formatter": "^2.0", "symfony/config": "^6.3", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 9bd22e456c..638ef5ca2c 100644 --- a/phpBB/composer.lock +++ b/phpBB/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": "1b3c23af9540af5f573e31c7a9e715c1", + "content-hash": "b44d1db175f1f55f55c4b9326cf02f6f", "packages": [ { "name": "bantu/ini-get-wrapper", @@ -40,6 +40,74 @@ }, "time": "2014-09-15T13:12:35+00:00" }, + { + "name": "carlos-mg89/oauth", + "version": "0.8.15", + "source": { + "type": "git", + "url": "https://github.com/carlos-mg89/PHPoAuthLib.git", + "reference": "c14c44e4f8993009a10d56a41e61c19291824a29" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/carlos-mg89/PHPoAuthLib/zipball/c14c44e4f8993009a10d56a41e61c19291824a29", + "reference": "c14c44e4f8993009a10d56a41e61c19291824a29", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "ext-curl": "*", + "ext-dom": "*", + "ext-json": "*", + "friendsofphp/php-cs-fixer": "^3.0", + "phpunit/phpunit": "^8.5", + "predis/predis": "0.8.*@dev", + "squizlabs/php_codesniffer": "^3.5", + "symfony/finder": "^5.1", + "symfony/http-foundation": "~2.1", + "symfony/var-dumper": "^5.1" + }, + "suggest": { + "ext-openssl": "Allows for usage of secure connections with the stream-based HTTP client.", + "predis/predis": "Allows using the Redis storage backend.", + "symfony/http-foundation": "Allows using the Symfony Session storage backend." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.1-dev" + } + }, + "autoload": { + "psr-4": { + "OAuth\\": "src/OAuth" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Carlos Martínez Gadea", + "email": "carlosmartinezgadea@gmail.com" + } + ], + "description": "PHP 7.2 oAuth 1/2 Library", + "keywords": [ + "Authentication", + "authorization", + "oauth", + "security" + ], + "support": { + "issues": "https://github.com/carlos-mg89/PHPoAuthLib/issues", + "source": "https://github.com/carlos-mg89/PHPoAuthLib/tree/0.8.15" + }, + "time": "2022-07-15T08:38:14+00:00" + }, { "name": "chita/topological_sort", "version": "v3.0.1", @@ -1846,77 +1914,6 @@ ], "time": "2023-09-06T14:56:25+00:00" }, - { - "name": "lusitanian/oauth", - "version": "v0.8.11", - "source": { - "type": "git", - "url": "https://github.com/Lusitanian/PHPoAuthLib.git", - "reference": "fc11a53db4b66da555a6a11fce294f574a8374f9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Lusitanian/PHPoAuthLib/zipball/fc11a53db4b66da555a6a11fce294f574a8374f9", - "reference": "fc11a53db4b66da555a6a11fce294f574a8374f9", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "3.7.*", - "predis/predis": "0.8.*@dev", - "squizlabs/php_codesniffer": "2.*", - "symfony/http-foundation": "~2.1" - }, - "suggest": { - "ext-openssl": "Allows for usage of secure connections with the stream-based HTTP client.", - "predis/predis": "Allows using the Redis storage backend.", - "symfony/http-foundation": "Allows using the Symfony Session storage backend." - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.1-dev" - } - }, - "autoload": { - "psr-0": { - "OAuth": "src", - "OAuth\\Unit": "tests" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "David Desberg", - "email": "david@daviddesberg.com" - }, - { - "name": "Elliot Chance", - "email": "elliotchance@gmail.com" - }, - { - "name": "Pieter Hordijk", - "email": "info@pieterhordijk.com" - } - ], - "description": "PHP 5.3+ oAuth 1/2 Library", - "keywords": [ - "Authentication", - "authorization", - "oauth", - "security" - ], - "support": { - "issues": "https://github.com/Lusitanian/PHPoAuthLib/issues", - "source": "https://github.com/Lusitanian/PHPoAuthLib/tree/master" - }, - "time": "2018-02-14T22:37:14+00:00" - }, { "name": "marc1706/fast-image-size", "version": "v1.1.7", @@ -8992,5 +8989,5 @@ "platform-overrides": { "php": "8.1.0" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" } diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index 966e10020f..04dcad8e28 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -265,7 +265,7 @@ diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index d99d1995db..173300ec25 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -437,11 +437,11 @@ class acp_main // Version check $user->add_lang('install'); - if ($auth->acl_get('a_server') && version_compare(PHP_VERSION, '7.1.3', '<')) + if ($auth->acl_get('a_server') && version_compare(PHP_VERSION, '7.2.0', '<')) { $template->assign_vars(array( 'S_PHP_VERSION_OLD' => true, - 'L_PHP_VERSION_OLD' => sprintf($user->lang['PHP_VERSION_OLD'], PHP_VERSION, '7.1.3', '', ''), + 'L_PHP_VERSION_OLD' => sprintf($user->lang['PHP_VERSION_OLD'], PHP_VERSION, '7.2.0', '', ''), )); } diff --git a/phpBB/install/app.php b/phpBB/install/app.php index 33114eff58..10077fea4c 100644 --- a/phpBB/install/app.php +++ b/phpBB/install/app.php @@ -20,9 +20,9 @@ define('IN_INSTALL', true); $phpbb_root_path = '../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); -if (version_compare(PHP_VERSION, '7.1.3', '<')) +if (version_compare(PHP_VERSION, '7.2.0', '<')) { - die('You are running an unsupported PHP version (' . PHP_VERSION . '). Please upgrade to PHP 7.1.3 or higher before trying to install or update to phpBB 3.3'); + die('You are running an unsupported PHP version (' . PHP_VERSION . '). Please upgrade to PHP 7.2.0 or higher before trying to install or update to phpBB 3.3'); } $startup_new_path = $phpbb_root_path . 'install/update/update/new/install/startup.' . $phpEx; diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 1099ccf694..5b8b38f4cc 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -105,7 +105,7 @@ $lang = array_merge($lang, array( // Server requirements 'PHP_VERSION_REQD' => 'PHP version', - 'PHP_VERSION_REQD_EXPLAIN' => 'phpBB requires PHP version 7.1.3 or higher.', + 'PHP_VERSION_REQD_EXPLAIN' => 'phpBB requires PHP version 7.2.0 or higher.', 'PHP_GETIMAGESIZE_SUPPORT' => 'PHP getimagesize() function is required', 'PHP_GETIMAGESIZE_SUPPORT_EXPLAIN' => 'In order for phpBB to function correctly, the getimagesize function needs to be available.', 'PCRE_UTF_SUPPORT' => 'PCRE UTF-8 support', diff --git a/phpBB/phpbb/install/module/requirements/task/check_server_environment.php b/phpBB/phpbb/install/module/requirements/task/check_server_environment.php index cffebc6ba2..be48cf1967 100644 --- a/phpBB/phpbb/install/module/requirements/task/check_server_environment.php +++ b/phpBB/phpbb/install/module/requirements/task/check_server_environment.php @@ -99,7 +99,7 @@ class check_server_environment extends \phpbb\install\task_base */ protected function check_php_version() { - if (version_compare(PHP_VERSION, '7.1.3', '<')) + if (version_compare(PHP_VERSION, '7.2.0', '<')) { $this->response_helper->add_error_message('PHP_VERSION_REQD', 'PHP_VERSION_REQD_EXPLAIN');