From 9ddb1bdddb05e494e7f8f89574c569af3284b7dc Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 21 Dec 2019 10:45:23 +0100 Subject: [PATCH 1/5] [prep-release-3.3.0-RC1] Update version numbers to 3.3.0-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 d016ba51ed..5ac13bcd5f 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 493399bd71..13be04140b 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.0-RC1-dev'); +@define('PHPBB_VERSION', '3.3.0-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 6ac261aa13..9a9d320b30 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.0-b2'); +define('PHPBB_VERSION', '3.3.0-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 8e7b26d60c..1f184071df 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -278,7 +278,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0 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.0-RC1-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.0-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 84f01ed0dab5a45ea945361ac3283f8928a4a57f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 21 Dec 2019 10:46:12 +0100 Subject: [PATCH 2/5] [prep-release-3.3.0-RC1] Update version numbers to 3.3.0-RC1 --- 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 cefb33fe3c..f9b7e8010e 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.0-b2', + 'phpbb_version' => '3.3.0-RC1', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 9b9a02c1fb..7cc7ba4922 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.0-b2 -phpbb_version = 3.3.0-b2 +style_version = 3.3.0-RC1 +phpbb_version = 3.3.0-RC1 # Defining a different template bitfield # template_bitfield = //g= From a0251ec1d97787f750917029e042e04f97863bc1 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 21 Dec 2019 10:48:37 +0100 Subject: [PATCH 3/5] [prep-release-3.3.0-RC1] Add migration for 3.3.0-RC1 --- .../phpbb/db/migration/data/v330/v330rc1.php | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v330/v330rc1.php diff --git a/phpBB/phpbb/db/migration/data/v330/v330rc1.php b/phpBB/phpbb/db/migration/data/v330/v330rc1.php new file mode 100644 index 0000000000..52193750cc --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v330/v330rc1.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\v330; + +class v330rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.3.0-RC1', '>='); + } + + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v330\v330b2', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.3.0-RC1')), + ); + } +} From 4051bf2466022cdd0b79328affac69f51eb9416c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 21 Dec 2019 10:51:05 +0100 Subject: [PATCH 4/5] [prep-release-3.3.0-RC1] Update changelog for 3.3.0-RC1 --- phpBB/docs/CHANGELOG.html | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index d229b91bd6..8eb9639db3 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog
      +
    • Changes since 3.3.0-b2
    • Changes since 3.3.0-b1
    • Changes since 3.2.x
    • Changes since 3.2.8-RC1
      • @@ -142,6 +143,36 @@
      +

      Changes since 3.3.0-b2

      +

      Bug

      +
        +
      • [PHPBB3-16056] - JPEG dimensions undetectable for some kind of jpeg files
        • +
      • [PHPBB3-16211] - COPPA should not be skippable
        • +
      • [PHPBB3-16226] - Cron Tasks are not running on some Apache Server
        • +
      • [PHPBB3-16227] - If click login or acp login add errors
        • +
      • [PHPBB3-16228] - BBCode definitions with an optional attribute and a non-TEXT content are not merged correctly
        • +
      • [PHPBB3-16235] - Ignore patterns in ext-sniff.sh are not processed
        • +
      • [PHPBB3-16242] - Redirect loop when install folder doesn't exist
        • +
      • [PHPBB3-16255] - PHP 7.4 Deprecation warning on curly braces offsets
        • +
      • [PHPBB3-16258] - Sample Sphinx configuration file causes delta index to only include the most recent post
        • +
      +

      Improvement

      + +

      Task

      +
        +
      • [PHPBB3-16224] - Update composer dependencies
        • +
      • [PHPBB3-16241] - Color Palette Syntax Breaks Backwards Compatibility
        • +
      • [PHPBB3-16246] - Prettify and update README Automated Testing section
        • +
      +

      Changes since 3.3.0-b1

      Bug

        From a83b8e779238b734575dd4a96a67ed1aabc704c1 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 21 Dec 2019 22:21:43 +0100 Subject: [PATCH 5/5] [3.3.x] Update version numbers to 3.3.0-RC2-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 5ac13bcd5f..b7e5e3e194 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 13be04140b..e3dbdc4adb 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.0-RC1'); +@define('PHPBB_VERSION', '3.3.0-RC2-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 1f184071df..838ea6d30e 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -278,7 +278,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0 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.0-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.0-RC2-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');