From 88b79aba00baff8babe2aad84c9d66e48eb6da5b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 19 Jan 2022 22:09:29 +0100 Subject: [PATCH 1/4] [prep-release-3.3.6] Update version numbers to 3.3.6 --- 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 6c01217886..a380431f87 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.5', + 'phpbb_version' => '3.3.6', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 32c9f0b8bd..319ba4431b 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.5 -phpbb_version = 3.3.5 +style_version = 3.3.6 +phpbb_version = 3.3.6 # Defining a different template bitfield # template_bitfield = //g= From c93381ff046de3352e4bceb7c5e5d161fa2635be Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 19 Jan 2022 22:09:33 +0100 Subject: [PATCH 2/4] [prep-release-3.3.6] Add migration for 3.3.6-RC1 --- build/build.xml | 2 +- phpBB/includes/constants.php | 2 +- phpBB/install/phpbbcli.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- .../phpbb/db/migration/data/v33x/v336rc1.php | 36 +++++++++++++++++++ 5 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 phpBB/phpbb/db/migration/data/v33x/v336rc1.php diff --git a/build/build.xml b/build/build.xml index db9b5f1d12..5ee64f8823 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 36b46c2b76..c4ab50bef6 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.6-dev'); +@define('PHPBB_VERSION', '3.3.6-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index ac3a7cf9bd..a5ff644cc9 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.5'); +define('PHPBB_VERSION', '3.3.6-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 15e839c4f2..5fb7c1d724 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.6-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.6-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'); diff --git a/phpBB/phpbb/db/migration/data/v33x/v336rc1.php b/phpBB/phpbb/db/migration/data/v33x/v336rc1.php new file mode 100644 index 0000000000..e3b8a9dd95 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/v336rc1.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 v336rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.3.6-RC1', '>='); + } + + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\remove_orphaned_roles', + ]; + } + + public function update_data() + { + return [ + ['config.update', ['version', '3.3.6-RC1']], + ]; + } +} From 9bf6e7f32e70c2a8f1e54b7066e82c5c4ef42b2b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 19 Jan 2022 22:11:25 +0100 Subject: [PATCH 3/4] [prep-release-3.3.6] Update changelog for 3.3.6-RC1 --- phpBB/docs/CHANGELOG.html | 43 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 5df3f977e4..2b3b52f69c 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog
      +
    • Changes since 3.3.5
    • Changes since 3.3.5-RC1
    • Changes since 3.3.4
    • Changes since 3.3.4-RC1
      • @@ -158,6 +159,48 @@
      +

      Changes since 3.3.5

      +

      Bug

      +
        +
      • [PHPBB3-16881] - Fix ACP Statistic Table
        • +
      • [PHPBB3-16883] - Check if var is array before using count in installer diff
        • +
      • [PHPBB3-16887] - Update required PHP version
        • +
      • [PHPBB3-16889] - Postgres on windows builds keep failing
        • +
      • [PHPBB3-16892] - Duplicate entry for jav files in extension guesser
        • +
      • [PHPBB3-16895] - 'Permission' migration tool incorrectly handles role removal
        • +
      • [PHPBB3-16897] - sqlite3 drivers generates warnings when executing an explain query plan that fails
        • +
      • [PHPBB3-16900] - Invalid email subject header on long topic titles
        • +
      • [PHPBB3-16904] - Regression for topic selection in MCP in 3.3.5
        • +
      • [PHPBB3-16908] - PHP warning on non-existent post id requests
        • +
      • [PHPBB3-16910] - PHP warning if trying to attach orphaned files to non existent posts
        • +
      • [PHPBB3-16914] - Missing id in memberlist email template
        • +
      • [PHPBB3-16924] - Double escaping of config values inserted with db config
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-13508] - Support using INCLUDEJS and INCLUDECSS in twig template format
        • +
      • [PHPBB3-16828] - Add hook event before find_users_for_notification() execute
        • +
      • [PHPBB3-16859] - Language selection option is displayed on register if only 1 language is installed
        • +
      • [PHPBB3-16885] - Add filters to Twig - INT and FLOAT
        • +
      • [PHPBB3-16888] - Add the list of allowed attachment types using accept attribute
        • +
      • [PHPBB3-16896] - Improve .gitignore visibility
        • +
      • [PHPBB3-16898] - Do not restrict the debug error handler to the development environment
        • +
      • [PHPBB3-16899] - Add SVG and WEBP image type to ranks, smilies and topic icons
        • +
      • [PHPBB3-16902] - Improve search results count for MySQL
        • +
      • [PHPBB3-16909] - Add PHP 8.2 builds to test matrix
        • +
      • [PHPBB3-16912] - Improve mail encoding to better match RFC 2047
        • +
      • [PHPBB3-16921] - Increase PHP requirements in the DOCS
        • +
      • [PHPBB3-16930] - Remove redundant topic ID from last post URL
        • +
      • [PHPBB3-16933] - Inconsistent handling of hyphen by phpBB Native search backend
        • +
      • [PHPBB3-16939] - Wait for postgres service to start in GitHub Actions windows builds
        • +
      • [PHPBB3-16940] - Optimize phpBB Native Search
        • +
      +

      Task

      +
        +
      • [PHPBB3-16927] - Update plupload to latest version
        • +
      • [PHPBB3-16928] - Update composer and composer dependencies to latest versions
        • +
      +

      Changes since 3.3.5-RC1

      Bug

        From 6caf2f83ad89c9ffec40dd3fedec8c19e044dc09 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 21 Jan 2022 22:15:12 +0100 Subject: [PATCH 4/4] [3.3.x] Update versions to 3.3.7-dev --- build/build.xml | 4 ++-- phpBB/includes/constants.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/build.xml b/build/build.xml index 5ee64f8823..3282d7c637 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - + - + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index c4ab50bef6..01132793ea 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.6-RC1'); +@define('PHPBB_VERSION', '3.3.7-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 5fb7c1d724..0d9942016a 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.6-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.7-dev'); 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');