From e805a47a982ef253aedfc0b33fff3ef4316cee8a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 12 Jan 2023 20:48:25 +0100 Subject: [PATCH 1/4] [prep-release-3.3.10] Update version numbers to 3.3.10-RC1 --- build/build.xml | 2 +- phpBB/includes/constants.php | 2 +- phpBB/install/phpbbcli.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/build.xml b/build/build.xml index 9942f10d05..ebe52d47e0 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,7 +2,7 @@ - + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 7c71cfeb39..3ceca77e4f 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -@define('PHPBB_VERSION', '3.3.10-dev'); +@define('PHPBB_VERSION', '3.3.10-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 95b8f127f8..5e0613ca1c 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli') define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '3.3.9'); +define('PHPBB_VERSION', '3.3.10-RC1'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 4e931584ba..2bd0f94a60 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -316,7 +316,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_lock INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.10-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.10-RC1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); From be053c338178290b8db067d077043192f3f9c4f6 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 12 Jan 2023 20:49:14 +0100 Subject: [PATCH 2/4] [prep-release-3.3.10] Update version numbers to 3.3.10 --- phpBB/install/convertors/convert_phpbb20.php | 2 +- phpBB/styles/prosilver/style.cfg | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 2d807496b5..0816fa72d5 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -38,7 +38,7 @@ $dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms); $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.3', - 'phpbb_version' => '3.3.9', + 'phpbb_version' => '3.3.10', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 49a9c498f5..8f66de1121 100644 --- a/phpBB/styles/prosilver/style.cfg +++ b/phpBB/styles/prosilver/style.cfg @@ -21,8 +21,8 @@ # General Information about this style name = prosilver copyright = © phpBB Limited, 2007 -style_version = 3.3.9 -phpbb_version = 3.3.9 +style_version = 3.3.10 +phpbb_version = 3.3.10 # Defining a different template bitfield # template_bitfield = //g= From aff7fab65fd37892b9de90360a4815e451c675b3 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 12 Jan 2023 20:49:15 +0100 Subject: [PATCH 3/4] [prep-release-3.3.10] Add migration for 3.3.10-RC1 --- .../phpbb/db/migration/data/v33x/v3310rc1.php | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v33x/v3310rc1.php diff --git a/phpBB/phpbb/db/migration/data/v33x/v3310rc1.php b/phpBB/phpbb/db/migration/data/v33x/v3310rc1.php new file mode 100644 index 0000000000..cf9ec83cb9 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/v3310rc1.php @@ -0,0 +1,36 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v33x; + +class v3310rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.3.10-RC1', '>='); + } + + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\v339', + ]; + } + + public function update_data() + { + return [ + ['config.update', ['version', '3.3.10-RC1']], + ]; + } +} From 6d8468c91a8c918b8751d09ee993011539de70b6 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 12 Jan 2023 20:51:14 +0100 Subject: [PATCH 4/4] [prep-release-3.3.10] Update changelog for 3.3.10-RC1 --- phpBB/docs/CHANGELOG.html | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index ab65c70d1f..69847603dc 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog