From 8cfe6a900c8e83ee27a01ff1ecb5b84ac328a681 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 25 Dec 2019 17:52:25 +0100 Subject: [prep-release-3.2.9] Update version number to 3.2.9-RC1 --- build/build.xml | 6 +++--- phpBB/includes/constants.php | 2 +- phpBB/install/phpbbcli.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/build.xml b/build/build.xml index 1f6535875c..e81bc98fe2 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 a2e7d92f7d..12df965bd9 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.2.9-dev'); +@define('PHPBB_VERSION', '3.2.9-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index ddf17fa5f6..dbc8a17f8c 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.2.8'); +define('PHPBB_VERSION', '3.2.9-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 d614579f3d..180a6fdbf2 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -279,7 +279,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.2.9-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.9-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'); -- cgit v1.2.1 From 6c85564cc16397c58d2313fd7a2b7d42b9a36852 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 25 Dec 2019 17:53:09 +0100 Subject: [prep-release-3.2.9] Update version numbers to 3.2.9 --- 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 654f705967..ff5ec29019 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.2.8', + 'phpbb_version' => '3.2.9', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 8e3ba24aaa..697bcee97d 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.2.8 -phpbb_version = 3.2.8 +style_version = 3.2.9 +phpbb_version = 3.2.9 # Defining a different template bitfield # template_bitfield = //g= -- cgit v1.2.1 From e31da34324bb18cefcc47ee6d2faaf850aa4761a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 25 Dec 2019 17:55:06 +0100 Subject: [prep-release-3.2.9] Add migration for 3.2.9-RC1 --- phpBB/phpbb/db/migration/data/v32x/v329rc1.php | 36 ++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v32x/v329rc1.php diff --git a/phpBB/phpbb/db/migration/data/v32x/v329rc1.php b/phpBB/phpbb/db/migration/data/v32x/v329rc1.php new file mode 100644 index 0000000000..271bf62859 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v32x/v329rc1.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\v32x; + +class v329rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return phpbb_version_compare($this->config['version'], '3.2.9-RC1', '>='); + } + + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v32x\v328', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.2.9-RC1')), + ); + } +} -- cgit v1.2.1 From 3e4f18bed27eb8a05c18bf55e6b6084bf115e549 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 25 Dec 2019 17:56:09 +0100 Subject: [prep-release-3.2.9] Update composer dependencies to latest --- phpBB/composer.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 6eb63d1782..735de476c1 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -2483,33 +2483,33 @@ }, { "name": "phpspec/prophecy", - "version": "1.9.0", + "version": "1.10.1", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203" + "reference": "cbe1df668b3fe136bcc909126a0f529a78d4cbbc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/f6811d96d97bdf400077a0cc100ae56aa32b9203", - "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/cbe1df668b3fe136bcc909126a0f529a78d4cbbc", + "reference": "cbe1df668b3fe136bcc909126a0f529a78d4cbbc", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0", - "sebastian/comparator": "^1.1|^2.0|^3.0", + "sebastian/comparator": "^1.2.3|^2.0|^3.0", "sebastian/recursion-context": "^1.0|^2.0|^3.0" }, "require-dev": { - "phpspec/phpspec": "^2.5|^3.2", + "phpspec/phpspec": "^2.5 || ^3.2", "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.8.x-dev" + "dev-master": "1.10.x-dev" } }, "autoload": { @@ -2542,7 +2542,7 @@ "spy", "stub" ], - "time": "2019-10-03T11:07:50+00:00" + "time": "2019-12-22T21:05:45+00:00" }, { "name": "phpunit/dbunit", -- cgit v1.2.1 From 7d90f84306870f9d8fb57426bced1c652fc02c98 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 25 Dec 2019 17:57:31 +0100 Subject: [prep-release-3.2.9] Add changelog for 3.2.9-RC1 --- phpBB/docs/CHANGELOG.html | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 06cdb37b56..33faa961a1 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog
      +
    • Changes since 3.2.8
    • Changes since 3.2.8-RC1
    • Changes since 3.2.7
    • Changes since 3.2.6
      • @@ -140,6 +141,61 @@
      +

      Changes since 3.2.8

      +

      Bug

      +
        +
      • [PHPBB3-14815] - The facebook page link is not displayed properly in memberlist.php
        • +
      • [PHPBB3-15643] - $phpbb_filesystem->resolve_path() may trigger open_basedir restriction
        • +
      • [PHPBB3-15902] - Out of range error with Sphinx search
        • +
      • [PHPBB3-16056] - JPEG dimensions undetectable for some kind of jpeg files
        • +
      • [PHPBB3-16076] - Limit attachment size by extension group
        • +
      • [PHPBB3-16141] - plupload chunk_size calculation incorrect when one or more settings are 'unlimited'
        • +
      • [PHPBB3-16150] - Post title link urls not reliable when shared
        • +
      • [PHPBB3-16156] - Bots see both register and logout links in the navbar
        • +
      • [PHPBB3-16157] - Incorrect FORM_INVALID error message while sending email form
        • +
      • [PHPBB3-16181] - OAuth provider id needs to be quoted
        • +
      • [PHPBB3-16184] - Mark read button only works once
        • +
      • [PHPBB3-16199] - Guest posting CAPTCHA is being generated with no guest posting auth
        • +
      • [PHPBB3-16209] - Nginx example configuration file blocks an image in the ACP
        • +
      • [PHPBB3-16210] - Terms of use should not be skippable
        • +
      • [PHPBB3-16211] - COPPA should not be skippable
        • +
      • [PHPBB3-16216] - Disable xdebug in travis builds
        • +
      • [PHPBB3-16217] - Enable opcache in travis CI builds
        • +
      • [PHPBB3-16228] - BBCode definitions with an optional attribute and a non-TEXT content are not merged correctly
        • +
      • [PHPBB3-16242] - Redirect loop when install folder doesn't exist
        • +
      • [PHPBB3-16252] - Ignore non-BBCodes when looking for unauthorized markup
        • +
      • [PHPBB3-16257] - Typo in Email Settings section
        • +
      • [PHPBB3-16258] - Sample Sphinx configuration file causes delta index to only include the most recent post
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-16084] - Pointless radio button for database backup in 3.2.7
        • +
      • [PHPBB3-16139] - Add core.viewtopic_modify_quick_reply_template_vars
        • +
      • [PHPBB3-16140] - Add new event to UCP Edit Profile Page
        • +
      • [PHPBB3-16143] - Add core events for move topics
        • +
      • [PHPBB3-16144] - NO_STYLE_DATA - Provide extra fallback to board's default style for $user.
        • +
      • [PHPBB3-16146] - Add core event for after move the forum
        • +
      • [PHPBB3-16148] - Add template events to acp_groups.html
        • +
      • [PHPBB3-16151] - Enable Emojis and rich text in forum name
        • +
      • [PHPBB3-16153] - Enable Emojis and rich text in topic title
        • +
      • [PHPBB3-16159] - Wrap post times in html time tag
        • +
      • [PHPBB3-16174] - Event for disabling cookie creation
        • +
      • [PHPBB3-16182] - Add core.generate_smilies_modify_rowset
        • +
      • [PHPBB3-16183] - Add core.generate_smilies_count_sql_before
        • +
      • [PHPBB3-16203] - Enable Emojis and rich text in sent Emails
        • +
      • [PHPBB3-16247] - Quote PM has no identifier
        • +
      • [PHPBB3-16251] - Shortened link text shouldn't override custom plugins
        • +
      +

      Task

      +
        +
      • [PHPBB3-15422] - Remove the unnecessary helpline function and help_line variable
        • +
      • [PHPBB3-16147] - Updated tokens legend in BBCodes ACP
        • +
      • [PHPBB3-16160] - Add script for generating package json file
        • +
      • [PHPBB3-16172] - Add "Rank:" or "Group rank:" in the memberlist
        • +
      • [PHPBB3-16224] - Update composer dependencies
        • +
      • [PHPBB3-16246] - Prettify and update README Automated Testing section
        • +
      +

      Changes since 3.2.8-RC1

      Bug

        -- cgit v1.2.1 From 790e77de019099b977593fa7f78ac82b3bda7365 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 26 Dec 2019 11:32:36 +0100 Subject: [3.2.x] Update version numbers to 3.2.10-dev --- build/build.xml | 6 +++--- phpBB/includes/constants.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/build.xml b/build/build.xml index e81bc98fe2..bde233ef5c 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 12df965bd9..1c77366380 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.2.9-RC1'); +@define('PHPBB_VERSION', '3.2.10-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 180a6fdbf2..a00e2947bd 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -279,7 +279,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.2.9-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.10-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'); -- cgit v1.2.1