From b45bd3ace784a84f61fa396a9fcbbe83c6152e30 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 15 Mar 2021 21:47:29 +0100 Subject: [PATCH 1/4] [prep-release-3.3.4] Update version numbers to 3.3.4-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 6e2598f8c6..2b71c363fc 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 719c222439..65f1b07fd8 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.4-dev'); +@define('PHPBB_VERSION', '3.3.4-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index c65a93d350..c9aef2b7b6 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.3'); +define('PHPBB_VERSION', '3.3.4-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 aae3064c69..57cada98db 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.4-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.4-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 e3752b70e2d3aff0ef7ff3a78d9e322ffceff425 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 15 Mar 2021 21:47:29 +0100 Subject: [PATCH 2/4] [prep-release-3.3.4] Update version numbers to 3.3.4 --- 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 aa19d9c4c1..1c0ebebf08 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.3', + 'phpbb_version' => '3.3.4', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index a208e52be1..b2aa82df21 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.3 -phpbb_version = 3.3.3 +style_version = 3.3.4 +phpbb_version = 3.3.4 # Defining a different template bitfield # template_bitfield = //g= From 95bbebeb2219113edda2b08a325d20a3a81bde39 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 15 Mar 2021 21:47:35 +0100 Subject: [PATCH 3/4] [prep-release-3.3.4] Add migration for 3.3.4-RC1 --- .../phpbb/db/migration/data/v33x/v334rc1.php | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v33x/v334rc1.php diff --git a/phpBB/phpbb/db/migration/data/v33x/v334rc1.php b/phpBB/phpbb/db/migration/data/v33x/v334rc1.php new file mode 100644 index 0000000000..d4bc92cacf --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/v334rc1.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 v334rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.3.4-RC1', '>='); + } + + static public function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\v333', + ]; + } + + public function update_data() + { + return [ + ['config.update', ['version', '3.3.4-RC1']], + ]; + } +} From 6d46c08191102393f7dca9aa34f824d2224a26f8 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 15 Mar 2021 21:48:18 +0100 Subject: [PATCH 4/4] [prep-release-3.3.4] Update changelog for 3.3.4-RC1 --- phpBB/docs/CHANGELOG.html | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index c3b242cca9..11091ca5c5 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog
      +
    • Changes since 3.3.3
    • Changes since 3.3.2
    • Changes since 3.3.1
    • Changes since 3.3.1-RC1
      • @@ -154,6 +155,43 @@
      +

      Changes since 3.3.3

      +

      Bug

      +
        +
      • [PHPBB3-16655] - Suppress "you now also have to pass the CAPTCHA test" message for invisible CAPTCHAs
        • +
      • [PHPBB3-16685] - SQL error in ACP if database name contains a dash
        • +
      • [PHPBB3-16690] - Changing default argument in htmlspecialchars* functions causes test fail
        • +
      • [PHPBB3-16691] - Illegal string offset 'username' on MCP PM report pages
        • +
      • [PHPBB3-16696] - Unsupported operand types in viewforum.php - PHP8
        • +
      • [PHPBB3-16697] - Unable to login after conversion from phpBB2
        • +
      • [PHPBB3-16698] - Check for default char set in includes/acp_main.php checks only for 'UTF-8'
        • +
      • [PHPBB3-16705] - File upload fails with PHP 8 - Error parsing server response
        • +
      • [PHPBB3-16706] - Undefined array key when user is banned
        • +
      • [PHPBB3-16707] - Disable unstable PHP 8.1 builds on Github Actions
        • +
      • [PHPBB3-16719] - PHP notice/warning on installation
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-15392] - Change dirname(__FILE__) to __DIR__ everywhere
        • +
      • [PHPBB3-16589] - Change wording of e-mail templates to decrease word count
        • +
      • [PHPBB3-16620] - Output short array syntax in dev:migration-tips
        • +
      • [PHPBB3-16660] - Remove or Rename "Reset" Button in "Reset Password" Dialogue
        • +
      • [PHPBB3-16681] - Replace action icons with font icons
        • +
      • [PHPBB3-16684] - GitHub Actions should run on newly created tag and release branches
        • +
      • [PHPBB3-16686] - Simplify get_database_size() SQL query for PostgreSQL
        • +
      • [PHPBB3-16689] - Bitly oauth SQL error if identifier is null
        • +
      • [PHPBB3-16709] - Update s9e/text-formatter to latest release
        • +
      • [PHPBB3-16710] - Allow WEBP images in attachments
        • +
      • [PHPBB3-16712] - Implement thumbnails for WEBP images in attachments
        • +
      • [PHPBB3-16724] - Add some template events
        • +
      • [PHPBB3-16725] - Add MCP core event
        • +
      • [PHPBB3-16728] - Add search result template event
        • +
      +

      Task

      +
        +
      • [PHPBB3-16726] - Update composer packages to latest versions
        • +
      +

      Changes since 3.3.2

      Bug