From 25c57cc4571fc8b052da052dcb66f21941407152 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 28 Feb 2018 21:30:24 +0100 Subject: [PATCH 1/7] [prep-release-3.2.3] Update version numbers for 3.2.3-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 1491b95b48..f85bebe70e 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 7eeb36595d..d94d418450 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.3-dev'); +@define('PHPBB_VERSION', '3.2.3-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 17b8444aa5..611e4ec53b 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.2-RC1'); +define('PHPBB_VERSION', '3.2.3-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 4dfe5e94aa..e7eedfb46c 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -280,7 +280,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.3-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.3-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 4bde2511b82ffbef6ee3389d3c68e200b3715140 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 28 Feb 2018 21:31:05 +0100 Subject: [PATCH 2/7] [prep-release-3.2.3] Update versions for 3.2.3 --- 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 a453e5f7ff..7dfb73be7e 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.2', + 'phpbb_version' => '3.2.3', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 00d07fee6c..ac2359dd99 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.2 -phpbb_version = 3.2.2 +style_version = 3.2.3 +phpbb_version = 3.2.3 # Defining a different template bitfield # template_bitfield = //g= From 747ed95678a0063d3197eed49e6d3e2e78dde385 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 28 Feb 2018 21:32:52 +0100 Subject: [PATCH 3/7] [prep-release-3.2.3] Add migration for 3.2.3-RC1 --- .../phpbb/db/migration/data/v32x/v323rc1.php | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v32x/v323rc1.php diff --git a/phpBB/phpbb/db/migration/data/v32x/v323rc1.php b/phpBB/phpbb/db/migration/data/v32x/v323rc1.php new file mode 100644 index 0000000000..0ff20d5074 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v32x/v323rc1.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 v323rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return phpbb_version_compare($this->config['version'], '3.2.3-RC1', '>='); + } + + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v32x\enable_accurate_pm_button', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.2.3-RC1')), + ); + } +} From 1c30a9778ddc808d188492466da5a08a10a00240 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 28 Feb 2018 21:35:00 +0100 Subject: [PATCH 4/7] [prep-release-3.2.3] Update changelog for 3.2.3-RC1 --- phpBB/docs/CHANGELOG.html | 56 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 13272e154c..9b254d8c29 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog
      +
    • Changes since 3.2.2
    • Changes since 3.2.1
    • Changes since 3.2.0
    • Changes since 3.2.0-RC1
      • @@ -128,6 +129,61 @@
      +

      Changes since 3.2.2

      +

      Bug

      +
        +
      • [PHPBB3-14936] - Missing language variable INST_ERR_DB
        • +
      • [PHPBB3-15491] - Outdated linkes in installer support page
        • +
      • [PHPBB3-15492] - Permissions role combobox does not work in RTL
        • +
      • [PHPBB3-15500] - Docs outdated for new PHP 5.4.7 requirement
        • +
      • [PHPBB3-15502] - Errors in migrations in 3.2.2 release
        • +
      • [PHPBB3-15506] - Previewing new post empties attachment list of all but first attachment
        • +
      • [PHPBB3-15512] - Avoid reparsing non-existent polls
        • +
      • [PHPBB3-15513] - Signature edit in acp gives error
        • +
      • [PHPBB3-15520] - DbDriver->sql_build_query cant cope with sub-selects
        • +
      • [PHPBB3-15522] - Allow multiple color palettes per page
        • +
      • [PHPBB3-15523] - AdBlocker may cause JS error when using CookieConsent
        • +
      • [PHPBB3-15525] - composer.json License is Invalid/Deprecated
        • +
      • [PHPBB3-15526] - Cast bbcode ID to integer
        • +
      • [PHPBB3-15527] - Cannot interpret the BBCode definition
        • +
      • [PHPBB3-15532] - Update pull request template
        • +
      • [PHPBB3-15533] - Typo in viewtopic_topic_tools.html
        • +
      • [PHPBB3-15558] - phpbb\report\report_handler_post.php
        • +
      • [PHPBB3-15559] - phpbb\report\report_handler_pm.php:56
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-12579] - Add BUTTON_ language strings for post & PM buttons
        • +
      • [PHPBB3-15495] - Use transactions for queries in move_forum
        • +
      • [PHPBB3-15499] - Drop HHVM support
        • +
      • [PHPBB3-15510] - Link Orphan attachments in ACP>General to Orphaned attachments page
        • +
      • [PHPBB3-15514] - Improve accessibility by adding vital info from explanation to a title
        • +
      • [PHPBB3-15518] - Do not attempt to accurately determine whether posters can read private messages in viewtopic
        • +
      • [PHPBB3-15528] - Display the version of the installed styles in acp
        • +
      • [PHPBB3-15529] - Color groups in ACP
        • +
      • [PHPBB3-15531] - Log malformed BBCodes
        • +
      • [PHPBB3-15534] - Outdated ACP extensions database link for phpBB 3.2
        • +
      • [PHPBB3-15535] - Add S_FIRST_POST to postrow on viewtopic
        • +
      • [PHPBB3-15537] - Add events core.search_(native|mysql|postgres|sphinx)_index_before
        • +
      • [PHPBB3-15547] - Add file object to event core.avatar_driver_upload_move_file_before
        • +
      • [PHPBB3-15561] - Add core events for adding columns to MySQL and Postgres search backends
        • +
      • [PHPBB3-15568] - Update depencies to latest versions
        • +
      • [PHPBB3-15569] - Adjust update instructions to suggest file replacement method
        • +
      +

      New Feature

      +
        +
      • [PHPBB3-15398] - Add event to oauth login after ID check
        • +
      +

      Security Issue

      +
        +
      • [PHPBB3-15570] - Extension version check is restricted to TLS 1.0
        • +
      +

      Task

      + +

      Changes since 3.2.1

      Security Issue

        From d7db5d366b9a326237efc7576d7db3215a51bc81 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 19 Mar 2018 16:42:53 -0700 Subject: [PATCH 5/7] [ticket/15595] Fix module exists tool when parent is false PHPBB3-15595 --- phpBB/phpbb/db/migration/tool/module.php | 9 +- tests/dbal/migrator_tool_module_test.php | 161 ++++++++++++++++++++++- 2 files changed, 164 insertions(+), 6 deletions(-) diff --git a/phpBB/phpbb/db/migration/tool/module.php b/phpBB/phpbb/db/migration/tool/module.php index 7d2720c861..e24c78e228 100644 --- a/phpBB/phpbb/db/migration/tool/module.php +++ b/phpBB/phpbb/db/migration/tool/module.php @@ -86,7 +86,8 @@ class module implements \phpbb\db\migration\tool\tool_interface * check for to see if it exists * @param bool $lazy Checks lazily if the module exists. Returns true if it exists in at * least one given parent. - * @return bool true if module exists in *all* given parents, false if not + * @return bool true if module exists in *all* given parents, false if not in any given parent; + * true if ignoring parent check and module exists class wide, false if not found at all. */ public function exists($class, $parent, $module, $lazy = false) { @@ -110,6 +111,10 @@ class module implements \phpbb\db\migration\tool\tool_interface $parent_sqls[] = 'AND parent_id = ' . (int) $parent_id; } } + else + { + $parent_sqls[] = ''; + } foreach ($parent_sqls as $parent_sql) { @@ -126,7 +131,7 @@ class module implements \phpbb\db\migration\tool\tool_interface { return false; } - else if ($lazy && $module_id) + if ($lazy && $module_id) { return true; } diff --git a/tests/dbal/migrator_tool_module_test.php b/tests/dbal/migrator_tool_module_test.php index c625b93ded..0f3febb24d 100644 --- a/tests/dbal/migrator_tool_module_test.php +++ b/tests/dbal/migrator_tool_module_test.php @@ -52,11 +52,39 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case array( '', 'ACP_CAT', + false, true, ), array( 0, 'ACP_CAT', + false, + true, + ), + array( + false, + 'ACP_CAT', + false, + true, + ), + + // Test the existing category lazily + array( + '', + 'ACP_CAT', + true, + true, + ), + array( + 0, + 'ACP_CAT', + true, + true, + ), + array( + false, + 'ACP_CAT', + true, true, ), @@ -65,15 +93,38 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case '', 'ACP_MODULE', false, + false, ), array( false, 'ACP_MODULE', + false, true, ), array( 'ACP_CAT', 'ACP_MODULE', + false, + true, + ), + + // Test the existing module lazily + array( + '', + 'ACP_MODULE', + true, + false, + ), + array( + false, + 'ACP_MODULE', + true, + true, + ), + array( + 'ACP_CAT', + 'ACP_MODULE', + true, true, ), @@ -82,11 +133,39 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case '', 'ACP_NON_EXISTANT_CAT', false, + false, + ), + array( + false, + 'ACP_NON_EXISTANT_CAT', + false, + false, ), array( 'ACP_CAT', 'ACP_NON_EXISTANT_MODULE', false, + false, + ), + + // Test for non-existant modules lazily + array( + '', + 'ACP_NON_EXISTANT_CAT', + true, + false, + ), + array( + false, + 'ACP_NON_EXISTANT_CAT', + true, + false, + ), + array( + 'ACP_CAT', + 'ACP_NON_EXISTANT_MODULE', + true, + false, ), ); } @@ -94,9 +173,9 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case /** * @dataProvider exists_data_acp */ - public function test_exists_acp($parent, $module, $expected) + public function test_exists_acp($parent, $module, $lazy, $expected) { - $this->assertEquals($expected, $this->tool->exists('acp', $parent, $module)); + $this->assertEquals($expected, $this->tool->exists('acp', $parent, $module, $lazy)); } public function exists_data_ucp() @@ -106,11 +185,39 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case array( '', 'UCP_MAIN_CAT', + false, true, ), array( 0, 'UCP_MAIN_CAT', + false, + true, + ), + array( + false, + 'UCP_MAIN_CAT', + false, + true, + ), + + // Test the existing category lazily + array( + '', + 'UCP_MAIN_CAT', + true, + true, + ), + array( + 0, + 'UCP_MAIN_CAT', + true, + true, + ), + array( + false, + 'UCP_MAIN_CAT', + true, true, ), @@ -119,21 +226,51 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case '', 'UCP_SUBCATEGORY', false, + false, ), array( false, 'UCP_SUBCATEGORY', + false, + true, + ), + array( + 'UCP_MAIN_CAT', + 'UCP_SUBCATEGORY', + false, + true, + ), + array( + 'UCP_SUBCATEGORY', + 'UCP_MODULE', + false, + true, + ), + + // Test the existing module lazily + array( + '', + 'UCP_SUBCATEGORY', + true, + false, + ), + array( + false, + 'UCP_SUBCATEGORY', + true, true, ), array( 'UCP_MAIN_CAT', 'UCP_SUBCATEGORY', true, + true, ), array( 'UCP_SUBCATEGORY', 'UCP_MODULE', true, + true, ), // Test for non-existant modules @@ -141,11 +278,27 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case '', 'UCP_NON_EXISTANT_CAT', false, + false, ), array( 'UCP_MAIN_CAT', 'UCP_NON_EXISTANT_MODULE', false, + false, + ), + + // Test for non-existant modules lazily + array( + '', + 'UCP_NON_EXISTANT_CAT', + true, + false, + ), + array( + 'UCP_MAIN_CAT', + 'UCP_NON_EXISTANT_MODULE', + true, + false, ), ); } @@ -153,9 +306,9 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case /** * @dataProvider exists_data_ucp */ - public function test_exists_ucp($parent, $module, $expected) + public function test_exists_ucp($parent, $module, $lazy, $expected) { - $this->assertEquals($expected, $this->tool->exists('ucp', $parent, $module)); + $this->assertEquals($expected, $this->tool->exists('ucp', $parent, $module, $lazy)); } public function test_add() From 929bd2ac3c3abbec6c75100834725770f5eb0b44 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 26 Mar 2018 20:29:17 +0200 Subject: [PATCH 6/7] [prep-release-3.2.3] Update changelog after merging PR --- phpBB/docs/CHANGELOG.html | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 9b254d8c29..eee4f3efcc 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -150,6 +150,7 @@
      • [PHPBB3-15533] - Typo in viewtopic_topic_tools.html
      • [PHPBB3-15558] - phpbb\report\report_handler_post.php
      • [PHPBB3-15559] - phpbb\report\report_handler_pm.php:56
        • +
      • [PHPBB3-15595] - Migration Module Exists Tool Broken

      Improvement

        From 22a251916c7d786f81d8feed7988c8860edb64eb Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 26 Mar 2018 21:18:16 +0200 Subject: [PATCH 7/7] [3.2.x] Update version numbers to 3.2.4-dev --- build/build.xml | 2 +- phpBB/includes/constants.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/build.xml b/build/build.xml index f85bebe70e..5e7c672195 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 d94d418450..29ca6959c8 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.3-RC1'); +@define('PHPBB_VERSION', '3.2.4-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index e7eedfb46c..21f26b5f08 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -280,7 +280,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.3-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.4-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');