From 6b09dbe16ce0d5ebad7692cda91a299b81ce9d88 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Mon, 14 Dec 2015 22:22:13 +0100 Subject: [PATCH 1/3] [prep-release-3.2.0-a2] Update version to 3.2.0-a2 --- build/build.xml | 2 +- phpBB/includes/constants.php | 2 +- phpBB/install/convertors/convert_phpbb20.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- phpBB/styles/prosilver/style.cfg | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/build.xml b/build/build.xml index c9e746c8f0..86e4dd3948 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 6a0b7d4ccd..b21fdf6b17 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.0-a2-dev'); +@define('PHPBB_VERSION', '3.2.0-a2'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 9949c972d9..282b3d238a 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.0-a1', + 'phpbb_version' => '3.2.0-a2', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 5cf5af6ddc..3e1359d2aa 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -275,7 +275,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.0-a2-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.0-a2'); 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/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 33547c3ce5..21951b7b0d 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.0-a1 -phpbb_version = 3.2.0-a1 +style_version = 3.2.0-a2 +phpbb_version = 3.2.0-a2 # Defining a different template bitfield # template_bitfield = lNg= From 8daeb6962aa0f86798e40ae94c59fac9184155c0 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Mon, 14 Dec 2015 22:39:10 +0100 Subject: [PATCH 2/3] [prep-release-3.2.0-a2] Add migration for 3.2.0-a2 --- phpBB/phpbb/db/migration/data/v320/v320a2.php | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v320/v320a2.php diff --git a/phpBB/phpbb/db/migration/data/v320/v320a2.php b/phpBB/phpbb/db/migration/data/v320/v320a2.php new file mode 100644 index 0000000000..ae53a73210 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v320/v320a2.php @@ -0,0 +1,38 @@ + +* @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\v320; + +class v320a2 extends \phpbb\db\migration\container_aware_migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.2.0-a2', '>='); + } + + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v317rc1', + '\phpbb\db\migration\data\v320\text_reparser', + '\phpbb\db\migration\data\v320\v320a1', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.2.0-a2')), + ); + } +} From 7381e99517d72d7a589f7bcc7b71a2686ca1cc7e Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Mon, 14 Dec 2015 22:41:25 +0100 Subject: [PATCH 3/3] [prep-release-3.2.0-a2] Add changelog for 3.2.0-a2 --- phpBB/docs/CHANGELOG.html | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index ea291f0767..4311ebfe63 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -49,6 +49,7 @@
  1. Changelog
      +
    • Changes since 3.2.0-a1
    • Changes since 3.1.x
    • Changes since 3.1.6
    • Changes since 3.1.5
      • @@ -115,6 +116,41 @@
      +

      Changes since 3.2.0-a1

      Bug

      +
        +
      • [PHPBB3-9791] - invalid [] - chars on search URI
        • +
      • [PHPBB3-13451] - A very long string inside message crashes PHP
        • +
      • [PHPBB3-14273] - Unnecessary core.root_path dependency in files.upload service
        • +
      • [PHPBB3-14293] - Responsive .postbody width not expanding
        • +
      • [PHPBB3-14295] - Icon on left side of "Post awaiting approval" inside messages is missing
        • +
      • [PHPBB3-14311] - Installer error messages not being reported back to client properly
        • +
      • [PHPBB3-14317] - Run lang_migrate_help_lang script on master
        • +
      • [PHPBB3-14320] - Language selector is broken in the installer
        • +
      • [PHPBB3-14325] - Renamed Event Variables Backwards Incompatible
        • +
      • [PHPBB3-14326] - Diffed files are not decoded at update
        • +
      • [PHPBB3-14339] - State support for PHP 7.0 in docs
        • +
      • [PHPBB3-14344] - Improve formatting of errors during install
        • +
      • [PHPBB3-14345] - Check if message description exists in install cli iohandler
        • +
      • [PHPBB3-14349] - Improve error messages and remove output of suppressed messages
        • +
      • [PHPBB3-14350] - Remove duplicate semi-colon from functions_user
        • +
      • [PHPBB3-14358] - Fatal error when running create_schema_files.php (missing composer autoloader)
        • +
      • [PHPBB3-14359] - Wrong service definition for console.command.reparser.reparse
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-12649] - Change sort & display options in footers to dropdown menu
        • +
      • [PHPBB3-14257] - Reparse after update
        • +
      • [PHPBB3-14269] - Use http_exceptions instead of die() in installer controllers
        • +
      • [PHPBB3-14310] - Progress bar in new installer not very clear
        • +
      • [PHPBB3-14340] - Revert the workaround fix for segmentation fault error on phpBB 3.2 PHP 7 tests
        • +
      +

      Task

      +
        +
      • [PHPBB3-14247] - Usage of @ at begining of an unquoted string in a yaml file is deprecated
        • +
      • [PHPBB3-14341] - Update to Symfony 2.8
        • +
      • [PHPBB3-14348] - Add an index.html to the install folder
        • +
      +

      Changes since 3.1.x

      Bug