From e8f5e62c447dd78842a0af10ab8d0208ce97dd5f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 8 Jun 2020 17:23:03 +0200 Subject: [PATCH 1/6] [prep-release-3.3.1] Update version numbers to 3.3.1-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 82e8b952a8..5630a679b5 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 0531cd44ca..3e3c42ceac 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.1-dev'); +@define('PHPBB_VERSION', '3.3.1-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index b865060e04..e5bbdc955b 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'); +define('PHPBB_VERSION', '3.3.1-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 2f1a84cd7b..9783b8487b 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.1-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.1-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 a91b1d2f26f12071ef42b22acbb5363adff7d0e0 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 8 Jun 2020 17:23:47 +0200 Subject: [PATCH 2/6] [prep-release-3.3.1] Update version numbers to 3.3.1 --- 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 6da6e2eb22..994ef9b1a3 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', + 'phpbb_version' => '3.3.1', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 0c7eba6700..8dd4bd0d0d 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 -phpbb_version = 3.3.0 +style_version = 3.3.1 +phpbb_version = 3.3.1 # Defining a different template bitfield # template_bitfield = //g= From 0951e204c9aadf9027dabeab25dbeae20d879a7d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 8 Jun 2020 17:27:04 +0200 Subject: [PATCH 3/6] [prep-release-3.3.1] Patch version update of symfony dependencies --- phpBB/composer.lock | 261 ++++++++++++++++++++++++++++---------------- 1 file changed, 166 insertions(+), 95 deletions(-) diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 77e318463e..3d34acca54 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -85,16 +85,16 @@ }, { "name": "guzzlehttp/guzzle", - "version": "6.5.3", + "version": "6.5.5", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e" + "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/aab4ebd862aa7d04f01a4b51849d657db56d882e", - "reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e", + "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e", "shasum": "" }, "require": { @@ -102,7 +102,7 @@ "guzzlehttp/promises": "^1.0", "guzzlehttp/psr7": "^1.6.1", "php": ">=5.5", - "symfony/polyfill-intl-idn": "^1.11" + "symfony/polyfill-intl-idn": "^1.17.0" }, "require-dev": { "ext-curl": "*", @@ -148,7 +148,7 @@ "rest", "web service" ], - "time": "2020-04-18T10:38:46+00:00" + "time": "2020-06-16T21:01:06+00:00" }, { "name": "guzzlehttp/promises", @@ -847,17 +847,57 @@ "time": "2020-01-08T02:46:22+00:00" }, { - "name": "s9e/text-formatter", - "version": "2.6.0", + "name": "s9e/sweetdom", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/s9e/TextFormatter.git", - "reference": "9cb0710514fe8eb7e4c662483b6bb2ad028e046b" + "url": "https://github.com/s9e/SweetDOM.git", + "reference": "f3a58c723fbe04d92ebcef5c8c7913bb364f58cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/9cb0710514fe8eb7e4c662483b6bb2ad028e046b", - "reference": "9cb0710514fe8eb7e4c662483b6bb2ad028e046b", + "url": "https://api.github.com/repos/s9e/SweetDOM/zipball/f3a58c723fbe04d92ebcef5c8c7913bb364f58cd", + "reference": "f3a58c723fbe04d92ebcef5c8c7913bb364f58cd", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "php": ">=7.1" + }, + "require-dev": { + "phpunit/phpunit": "*" + }, + "type": "library", + "autoload": { + "psr-4": { + "s9e\\SweetDOM\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Syntactic sugar for the DOM API with a focus on XSLT 1.0 template manipulation.", + "homepage": "https://github.com/s9e/SweetDOM/", + "keywords": [ + "dom", + "xsl", + "xslt" + ], + "time": "2020-05-25T15:01:02+00:00" + }, + { + "name": "s9e/text-formatter", + "version": "2.7.1", + "source": { + "type": "git", + "url": "https://github.com/s9e/TextFormatter.git", + "reference": "16a1c759307da654bedd7b649bef6930384e9561" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/16a1c759307da654bedd7b649bef6930384e9561", + "reference": "16a1c759307da654bedd7b649bef6930384e9561", "shasum": "" }, "require": { @@ -865,7 +905,8 @@ "ext-filter": "*", "lib-pcre": ">=8.13", "php": ">=7.1", - "s9e/regexp-builder": "^1.4" + "s9e/regexp-builder": "^1.4", + "s9e/sweetdom": "^1.0" }, "require-dev": { "matthiasmullie/minify": "*", @@ -883,7 +924,7 @@ }, "type": "library", "extra": { - "version": "2.6.0" + "version": "2.7.1" }, "autoload": { "psr-4": { @@ -913,20 +954,20 @@ "parser", "shortcodes" ], - "time": "2020-05-17T14:01:20+00:00" + "time": "2020-06-06T14:59:45+00:00" }, { "name": "symfony/config", - "version": "v3.4.40", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "3634991bea549e73c45a964c38f30ceeae6ed877" + "reference": "cd61db31cbd19cbe4ba9f6968f13c9076e1372ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/3634991bea549e73c45a964c38f30ceeae6ed877", - "reference": "3634991bea549e73c45a964c38f30ceeae6ed877", + "url": "https://api.github.com/repos/symfony/config/zipball/cd61db31cbd19cbe4ba9f6968f13c9076e1372ab", + "reference": "cd61db31cbd19cbe4ba9f6968f13c9076e1372ab", "shasum": "" }, "require": { @@ -991,20 +1032,20 @@ "type": "tidelift" } ], - "time": "2020-04-12T14:33:46+00:00" + "time": "2020-05-22T10:56:48+00:00" }, { "name": "symfony/console", - "version": "v3.4.40", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "bf60d5e606cd595391c5f82bf6b570d9573fa120" + "reference": "bfe29ead7e7b1cc9ce74c6a40d06ad1f96fced13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/bf60d5e606cd595391c5f82bf6b570d9573fa120", - "reference": "bf60d5e606cd595391c5f82bf6b570d9573fa120", + "url": "https://api.github.com/repos/symfony/console/zipball/bfe29ead7e7b1cc9ce74c6a40d06ad1f96fced13", + "reference": "bfe29ead7e7b1cc9ce74c6a40d06ad1f96fced13", "shasum": "" }, "require": { @@ -1077,20 +1118,20 @@ "type": "tidelift" } ], - "time": "2020-03-27T17:07:22+00:00" + "time": "2020-05-30T18:58:05+00:00" }, { "name": "symfony/debug", - "version": "v3.4.40", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "ce9f3b5e8e1c50f849fded59b3a1b6bc3562ec29" + "reference": "518c6a00d0872da30bd06aee3ea59a0a5cf54d6d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/ce9f3b5e8e1c50f849fded59b3a1b6bc3562ec29", - "reference": "ce9f3b5e8e1c50f849fded59b3a1b6bc3562ec29", + "url": "https://api.github.com/repos/symfony/debug/zipball/518c6a00d0872da30bd06aee3ea59a0a5cf54d6d", + "reference": "518c6a00d0872da30bd06aee3ea59a0a5cf54d6d", "shasum": "" }, "require": { @@ -1147,20 +1188,20 @@ "type": "tidelift" } ], - "time": "2020-03-23T10:22:40+00:00" + "time": "2020-05-22T18:25:20+00:00" }, { "name": "symfony/dependency-injection", - "version": "v3.4.40", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "d10ff5503b0b27711087eef4ac7835a752fe42fd" + "reference": "e39380b7104b0ec538a075ae919f00c7e5267bac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/d10ff5503b0b27711087eef4ac7835a752fe42fd", - "reference": "d10ff5503b0b27711087eef4ac7835a752fe42fd", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/e39380b7104b0ec538a075ae919f00c7e5267bac", + "reference": "e39380b7104b0ec538a075ae919f00c7e5267bac", "shasum": "" }, "require": { @@ -1232,20 +1273,20 @@ "type": "tidelift" } ], - "time": "2020-04-13T09:33:40+00:00" + "time": "2020-05-30T21:06:01+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.4.40", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "9d4e22943b73acc1ba50595b7de1a01fe9dbad48" + "reference": "14d978f8e8555f2de719c00eb65376be7d2e9081" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9d4e22943b73acc1ba50595b7de1a01fe9dbad48", - "reference": "9d4e22943b73acc1ba50595b7de1a01fe9dbad48", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/14d978f8e8555f2de719c00eb65376be7d2e9081", + "reference": "14d978f8e8555f2de719c00eb65376be7d2e9081", "shasum": "" }, "require": { @@ -1309,20 +1350,20 @@ "type": "tidelift" } ], - "time": "2020-03-15T09:38:08+00:00" + "time": "2020-05-05T15:06:23+00:00" }, { "name": "symfony/filesystem", - "version": "v3.4.40", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "78a93e5606a19d0fb490afc3c4a9b7ecd86e1515" + "reference": "0f625d0cb1e59c8c4ba61abb170125175218ff10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/78a93e5606a19d0fb490afc3c4a9b7ecd86e1515", - "reference": "78a93e5606a19d0fb490afc3c4a9b7ecd86e1515", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/0f625d0cb1e59c8c4ba61abb170125175218ff10", + "reference": "0f625d0cb1e59c8c4ba61abb170125175218ff10", "shasum": "" }, "require": { @@ -1373,11 +1414,11 @@ "type": "tidelift" } ], - "time": "2020-04-12T16:54:01+00:00" + "time": "2020-05-30T17:48:24+00:00" }, { "name": "symfony/finder", - "version": "v3.4.40", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -1422,20 +1463,34 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-02-14T07:34:21+00:00" }, { "name": "symfony/http-foundation", - "version": "v3.4.40", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "eded33daef1147be7ff1249706be9a49fe2c7a44" + "reference": "fbd216d2304b1a3fe38d6392b04729c8dd356359" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/eded33daef1147be7ff1249706be9a49fe2c7a44", - "reference": "eded33daef1147be7ff1249706be9a49fe2c7a44", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/fbd216d2304b1a3fe38d6392b04729c8dd356359", + "reference": "fbd216d2304b1a3fe38d6392b04729c8dd356359", "shasum": "" }, "require": { @@ -1490,20 +1545,20 @@ "type": "tidelift" } ], - "time": "2020-04-18T20:23:17+00:00" + "time": "2020-05-16T13:15:54+00:00" }, { "name": "symfony/http-kernel", - "version": "v3.4.40", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "139d477cc926de9ca03c3d59b51ab6e22450c6df" + "reference": "6464a0475496040fe1f48428488d53e485be77a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/139d477cc926de9ca03c3d59b51ab6e22450c6df", - "reference": "139d477cc926de9ca03c3d59b51ab6e22450c6df", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6464a0475496040fe1f48428488d53e485be77a0", + "reference": "6464a0475496040fe1f48428488d53e485be77a0", "shasum": "" }, "require": { @@ -1594,7 +1649,7 @@ "type": "tidelift" } ], - "time": "2020-04-28T17:41:38+00:00" + "time": "2020-06-12T10:57:07+00:00" }, { "name": "symfony/polyfill-ctype", @@ -2097,16 +2152,16 @@ }, { "name": "symfony/process", - "version": "v3.4.40", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "f5104c9dcbc2cfad45d01d5150c1da9836967271" + "reference": "8a895f0c92a7c4b10db95139bcff71bdf66d4d21" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/f5104c9dcbc2cfad45d01d5150c1da9836967271", - "reference": "f5104c9dcbc2cfad45d01d5150c1da9836967271", + "url": "https://api.github.com/repos/symfony/process/zipball/8a895f0c92a7c4b10db95139bcff71bdf66d4d21", + "reference": "8a895f0c92a7c4b10db95139bcff71bdf66d4d21", "shasum": "" }, "require": { @@ -2156,11 +2211,11 @@ "type": "tidelift" } ], - "time": "2020-04-12T14:33:46+00:00" + "time": "2020-05-23T17:05:51+00:00" }, { "name": "symfony/proxy-manager-bridge", - "version": "v3.4.40", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/proxy-manager-bridge.git", @@ -2228,16 +2283,16 @@ }, { "name": "symfony/routing", - "version": "v3.4.40", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "53b432fde8eea7dab820e75abda5b97fdaa829b4" + "reference": "e0d43b6f9417ad59ecaa8e2f799b79eef417387f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/53b432fde8eea7dab820e75abda5b97fdaa829b4", - "reference": "53b432fde8eea7dab820e75abda5b97fdaa829b4", + "url": "https://api.github.com/repos/symfony/routing/zipball/e0d43b6f9417ad59ecaa8e2f799b79eef417387f", + "reference": "e0d43b6f9417ad59ecaa8e2f799b79eef417387f", "shasum": "" }, "require": { @@ -2314,11 +2369,11 @@ "type": "tidelift" } ], - "time": "2020-04-12T09:58:27+00:00" + "time": "2020-05-30T19:50:06+00:00" }, { "name": "symfony/twig-bridge", - "version": "v3.4.40", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/twig-bridge.git", @@ -2423,16 +2478,16 @@ }, { "name": "symfony/yaml", - "version": "v3.4.40", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "8fef49ac1357f4e05c997a1f139467ccb186bffa" + "reference": "7233ac2bfdde24d672f5305f2b3f6b5d741ef8eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/8fef49ac1357f4e05c997a1f139467ccb186bffa", - "reference": "8fef49ac1357f4e05c997a1f139467ccb186bffa", + "url": "https://api.github.com/repos/symfony/yaml/zipball/7233ac2bfdde24d672f5305f2b3f6b5d741ef8eb", + "reference": "7233ac2bfdde24d672f5305f2b3f6b5d741ef8eb", "shasum": "" }, "require": { @@ -2492,7 +2547,7 @@ "type": "tidelift" } ], - "time": "2020-04-24T10:16:04+00:00" + "time": "2020-05-11T07:51:54+00:00" }, { "name": "twig/twig", @@ -2676,16 +2731,16 @@ "packages-dev": [ { "name": "blackfire/php-sdk", - "version": "v1.22.0", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/blackfireio/php-sdk.git", - "reference": "4188f61bad20b45b19b61c3b6225f9aec2c8c8e4" + "reference": "c11e9546182fcd8c2f3b1d5a4b867da062264355" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/blackfireio/php-sdk/zipball/4188f61bad20b45b19b61c3b6225f9aec2c8c8e4", - "reference": "4188f61bad20b45b19b61c3b6225f9aec2c8c8e4", + "url": "https://api.github.com/repos/blackfireio/php-sdk/zipball/c11e9546182fcd8c2f3b1d5a4b867da062264355", + "reference": "c11e9546182fcd8c2f3b1d5a4b867da062264355", "shasum": "" }, "require": { @@ -2693,6 +2748,8 @@ "php": ">=5.2.0" }, "require-dev": { + "guzzlehttp/psr7": "^1.6", + "psr/http-message": "^1.0", "symfony/http-client": "^4.3" }, "suggest": { @@ -2736,7 +2793,7 @@ "type": "custom" } ], - "time": "2020-03-13T12:50:29+00:00" + "time": "2020-05-29T11:19:11+00:00" }, { "name": "composer/ca-bundle", @@ -2806,20 +2863,20 @@ }, { "name": "doctrine/instantiator", - "version": "1.3.0", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "ae466f726242e637cebdd526a7d991b9433bacf1" + "reference": "f350df0268e904597e3bd9c4685c53e0e333feea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1", - "reference": "ae466f726242e637cebdd526a7d991b9433bacf1", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f350df0268e904597e3bd9c4685c53e0e333feea", + "reference": "f350df0268e904597e3bd9c4685c53e0e333feea", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.1 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^6.0", @@ -2858,7 +2915,21 @@ "constructor", "instantiate" ], - "time": "2019-10-21T16:45:58+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", + "type": "tidelift" + } + ], + "time": "2020-05-29T17:27:14+00:00" }, { "name": "fabpot/goutte", @@ -4607,16 +4678,16 @@ }, { "name": "symfony/browser-kit", - "version": "v3.4.40", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "1c7bcd954ad1fc02354c4cfd3fcd1b0c95245367" + "reference": "1467e0c7cf0c5c2c08dc9b45ca0300ac3cd3a824" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/1c7bcd954ad1fc02354c4cfd3fcd1b0c95245367", - "reference": "1c7bcd954ad1fc02354c4cfd3fcd1b0c95245367", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/1467e0c7cf0c5c2c08dc9b45ca0300ac3cd3a824", + "reference": "1467e0c7cf0c5c2c08dc9b45ca0300ac3cd3a824", "shasum": "" }, "require": { @@ -4674,11 +4745,11 @@ "type": "tidelift" } ], - "time": "2020-03-15T09:38:08+00:00" + "time": "2020-04-27T06:55:12+00:00" }, { "name": "symfony/css-selector", - "version": "v3.4.40", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -4745,16 +4816,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v3.4.40", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "ceacdab4abf7695ef6bec77c8b7983e1544c6358" + "reference": "c3086a58a66b2a519c0b7ac80539a3727609ea9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/ceacdab4abf7695ef6bec77c8b7983e1544c6358", - "reference": "ceacdab4abf7695ef6bec77c8b7983e1544c6358", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/c3086a58a66b2a519c0b7ac80539a3727609ea9c", + "reference": "c3086a58a66b2a519c0b7ac80539a3727609ea9c", "shasum": "" }, "require": { @@ -4812,7 +4883,7 @@ "type": "tidelift" } ], - "time": "2020-03-16T08:31:04+00:00" + "time": "2020-05-22T19:35:43+00:00" }, { "name": "theseer/tokenizer", From cfea05c2b49d753bbe55bc7bd1cabf8bbb081e29 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 8 Jun 2020 17:29:52 +0200 Subject: [PATCH 4/6] [prep-release-3.3.1] Add migration for 3.3.1-RC1 --- .../phpbb/db/migration/data/v33x/v331rc1.php | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v33x/v331rc1.php diff --git a/phpBB/phpbb/db/migration/data/v33x/v331rc1.php b/phpBB/phpbb/db/migration/data/v33x/v331rc1.php new file mode 100644 index 0000000000..64b0dc49fc --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/v331rc1.php @@ -0,0 +1,43 @@ + +* @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 v331rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.3.1-RC1', '>='); + } + + static public function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\add_notification_emails_table', + '\phpbb\db\migration\data\v33x\fix_display_unapproved_posts_config', + '\phpbb\db\migration\data\v33x\bot_update', + '\phpbb\db\migration\data\v33x\font_awesome_5_update', + '\phpbb\db\migration\data\v33x\profilefield_cleanup', + '\phpbb\db\migration\data\v33x\google_recaptcha_v3', + '\phpbb\db\migration\data\v33x\default_search_return_chars', + '\phpbb\db\migration\data\v32x\v3210rc2', + ]; + } + + public function update_data() + { + return [ + ['config.update', ['version', '3.3.1-RC1']], + ]; + } +} From 390522775822e6ce35ec0cf6bd8df17a04ad058b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 8 Jun 2020 17:32:41 +0200 Subject: [PATCH 5/6] [prep-release-3.3.1] Update changelog for 3.3.1-RC1 --- phpBB/docs/CHANGELOG.html | 158 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index f8aba22e5d..1d89d0ace6 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog
      +
    • Changes since 3.3.0
    • Changes since 3.3.0-RC1
    • Changes since 3.3.0-b2
    • Changes since 3.3.0-b1
      • @@ -148,6 +149,163 @@
      +

      Changes since 3.3.0

      +

      Bug

      +
        +
      • [PHPBB3-10506] - Not confirming "Save as Draft" strips attachments from PMs
        • +
      • [PHPBB3-13426] - Timezone related fatal error after upgrade to 3.1.2
        • +
      • [PHPBB3-13914] - Could not get style data via MySQL DB auto_increment_offset != 1
        • +
      • [PHPBB3-14754] - Receive too many topic email notifications when "notification.method.board" is off.
        • +
      • [PHPBB3-15079] - MySql Error when saving draft with Emoji
        • +
      • [PHPBB3-15194] - Cannot remove group avatar in UCP (manage group)
        • +
      • [PHPBB3-15275] - Post details: Look up IP links don't properly work
        • +
      • [PHPBB3-15395] - Very slow FTS on PostgreSQL
        • +
      • [PHPBB3-15438] - Use wrong word in ACP for logged administrators actions
        • +
      • [PHPBB3-15560] - Wrong redirection upon hard delete after soft delete in viewtopic
        • +
      • [PHPBB3-15572] - Quoted posts fail W3C Validator
        • +
      • [PHPBB3-15591] - Users with disabled "Can send instant messages" permission can view jabber address
        • +
      • [PHPBB3-15712] - Inserting an emoji in PM subject field causes errors
        • +
      • [PHPBB3-15766] - "No role assigned...." for forum permissions is ambiguous
        • +
      • [PHPBB3-15887] - Firefox confuses username and e-mail when storing passwords
        • +
      • [PHPBB3-15937] - Update phpBB reCAPTCHA plugin to handle Google reCAPTCHA v3
        • +
      • [PHPBB3-15979] - Restoring deleted post on edit does not update last post info
        • +
      • [PHPBB3-16060] - auto-prune of shadow topics triggered by prune_all_forums updates wrong timestamp
        • +
      • [PHPBB3-16149] - Missing profile field data
        • +
      • [PHPBB3-16222] - Timezone suggestion in UCP
        • +
      • [PHPBB3-16234] - Search syntax broken when using Sphinx Fulltext backend
        • +
      • [PHPBB3-16245] - Overflow in MSSQL attempting to manage attachments when collection > 2.1 GB
        • +
      • [PHPBB3-16289] - U_VIEW_REPORT in emails is incorrectly HTML-encoded
        • +
      • [PHPBB3-16296] - Unable to delete or mark PMs in UCP folder view
        • +
      • [PHPBB3-16307] - Incorrect SQL / PHP time when debug.sql_explain is enabled
        • +
      • [PHPBB3-16308] - phpBB 3.3.0 PHP Fatal error (template\context::assign_block_vars())
        • +
      • [PHPBB3-16309] - Smilies with a left square bracket do not work
        • +
      • [PHPBB3-16310] - S_SOFTDELETE_ALLOWED condition in posting.php is wrong and causes soft delete option to appear when it should not
        • +
      • [PHPBB3-16311] - Incorrect password length ACP setting explanation
        • +
      • [PHPBB3-16314] - Database connection gets closed on controllers
        • +
      • [PHPBB3-16316] - navbar_header.html of prosilver style breaks Rich-Markup
        • +
      • [PHPBB3-16319] - Mobile landscape, tablet portrait react wrong
        • +
      • [PHPBB3-16323] - The spaceless tag is deprecated
        • +
      • [PHPBB3-16325] - Error "Failure while aqcuiring locks" when trying to install phpBB 3.3.0
        • +
      • [PHPBB3-16332] - Language strings for CODE and QUOTE are missing in the MCP post details and in the member profiles
        • +
      • [PHPBB3-16335] - $display_cat and $download_link are undefined variables for core.parse_attachments_modify_template_data when $denied is true
        • +
      • [PHPBB3-16339] - Poll's voting options are not fully Ajaxed
        • +
      • [PHPBB3-16344] - phpbb_validate_email uses non-existent language keys
        • +
      • [PHPBB3-16348] - user_ban double free of $result when banning a non-existent or disallowed username on command line
        • +
      • [PHPBB3-16356] - Saving a draft does not delete orphaned attachments from the server
        • +
      • [PHPBB3-16358] - Attachment tab should be removed when there are no filters
        • +
      • [PHPBB3-16360] - PHP warning on GD 3D image CAPTCHA
        • +
      • [PHPBB3-16361] - Local URL truncation from link helper truncate_local_url does not work correctly
        • +
      • [PHPBB3-16367] - Feed controller is not actually setting character set of response
        • +
      • [PHPBB3-16368] - DI container always rebuilds itself when defined('DEBUG') is true and extensions use Composer for dependencies due to out-of-order freshness checks
        • +
      • [PHPBB3-16376] - Undefined index 'display_subforum_limit' on board index
        • +
      • [PHPBB3-16377] - Undefined index navlinks in navbar_header
        • +
      • [PHPBB3-16378] - Update deprecated console exception_subscriber
        • +
      • [PHPBB3-16379] - Update deprecated event dispatcher class
        • +
      • [PHPBB3-16380] - Exception interface should extend \Throwable
        • +
      • [PHPBB3-16382] - Update deprecated Twig classes
        • +
      • [PHPBB3-16391] - Language file info_mcp_xxx.php from extensions should be included in ACP
        • +
      • [PHPBB3-16394] - Access array offset bug in MCP topic approval - PHP 7.4
        • +
      • [PHPBB3-16399] - Emoji's in topic title cause errors
        • +
      • [PHPBB3-16403] - Attachment icon always displayed in list of reported message
        • +
      • [PHPBB3-16407] - S_MESSAGE_REPORTED and L_MESSAGE_REPORTED aren't defined anywhere
        • +
      • [PHPBB3-16416] - A non-numeric value encountered in ACP attachments settings
        • +
      • [PHPBB3-16417] - SQL fatal error while updating database from older versions via CLI
        • +
      • [PHPBB3-16418] - A non-numeric value encountered - ACP board start date
        • +
      • [PHPBB3-16422] - bbcode URL tag breaking URL's?
        • +
      • [PHPBB3-16423] - Add Aria Engine to list of Fulltext Supported
        • +
      • [PHPBB3-16428] - Allowed schemes in links and similar fields should check field content
        • +
      • [PHPBB3-16432] - PHP Fatal error: APCuIterator::__construct(): APC must be enabled to use APCuIterator
        • +
      • [PHPBB3-16435] - core.page_footer/core.page_footer_after events don't run on app.php pages
        • +
      • [PHPBB3-16437] - Forum permissions don't appear for logged users who cannot post a new topic
        • +
      • [PHPBB3-16439] - Subject line of first unread post displays with incorrect colour
        • +
      • [PHPBB3-16453] - Always load permission lang files before core.permissions
        • +
      • [PHPBB3-16462] - Slow tests fail when LDAP extension is not enabled
        • +
      • [PHPBB3-16467] - phpBB3 does not work with spaces in PostgreSQL database passwords
        • +
      • [PHPBB3-16474] - Scrollbar in attachbox
        • +
      • [PHPBB3-16476] - Outdated entries in tweaks.css
        • +
      • [PHPBB3-16478] - phpBB Debug warning "Use of undefined constant ANONYMOUS" in installer
        • +
      • [PHPBB3-16480] - Fix Emoji in report post
        • +
      • [PHPBB3-16485] - Fix Emoji in logs for warning message
        • +
      • [PHPBB3-16486] - Wrong configuration DB update in 3.2.0-a1 migration
        • +
      • [PHPBB3-16500] - Copying topics results in rearranging of inline attachments
        • +
      • [PHPBB3-16503] - WhoIs lookup has error message in MCP
        • +
      • [PHPBB3-16505] - PHP debug warning while using \phpbb\language\language\lang_array() function
        • +
      • [PHPBB3-16508] - Whois not working for IPv6 addresses
        • +
      • [PHPBB3-16510] - Missing rows in config table on new install
        • +
      • [PHPBB3-16514] - Migration google_recaptcha_v3 is in wrong directory
        • +
      • [PHPBB3-16530] - Unknown or bad timezone warning in console installer
        • +
      • [PHPBB3-16534] - Passwords converted from phpBB2 can have invalid hash
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-13867] - Profile field types need an enable/disable mechanism
        • +
      • [PHPBB3-15370] - Spinning indicator missing when updating permissions
        • +
      • [PHPBB3-15672] - Keep same format in Submit changes.
        • +
      • [PHPBB3-16163] - No error message when there is no displayed post in the MCP
        • +
      • [PHPBB3-16180] - Enhance "Send test email" to include information that allows identifying "the test that was being performed."
        • +
      • [PHPBB3-16288] - PHP 8 compatibility
        • +
      • [PHPBB3-16313] - Remote http{} block from nginx sample config
        • +
      • [PHPBB3-16315] - Remove Google+ from Custom profile fields
        • +
      • [PHPBB3-16338] - Add DuckDuckGo as a search bot that phpBB recognizes
        • +
      • [PHPBB3-16342] - Update Argon2 hashing costs
        • +
      • [PHPBB3-16350] - Move acp/mcp ban code to functions_admin.php
        • +
      • [PHPBB3-16351] - Use CHMOD constants from filesystem_interface
        • +
      • [PHPBB3-16352] - Deprecate unused functions/classes
        • +
      • [PHPBB3-16363] - Allow replying to locked topics with m_lock permission
        • +
      • [PHPBB3-16370] - Add core events for Notification
        • +
      • [PHPBB3-16381] - Add core event to Modify Topics SQL
        • +
      • [PHPBB3-16383] - Add core events to modify friends list
        • +
      • [PHPBB3-16384] - Add template events friends list username {prepend/append}
        • +
      • [PHPBB3-16388] - Add new events in viewforum_body.html and viewtopic_body.html
        • +
      • [PHPBB3-16396] - Use php-webdriver instead of facebook webdriver
        • +
      • [PHPBB3-16397] - Expose user id directly
        • +
      • [PHPBB3-16406] - Event core.notification_manager_add_notifications_for_users_modify_data incorrectly placed
        • +
      • [PHPBB3-16411] - Add vars to notification core events
        • +
      • [PHPBB3-16421] - Add contact field icon template events to viewtopic_body.html
        • +
      • [PHPBB3-16424] - Add base_url to generate_smilies events
        • +
      • [PHPBB3-16425] - Add event core.generate_smilies_modify_sql
        • +
      • [PHPBB3-16426] - Search settings should allow specification of number of characters to return
        • +
      • [PHPBB3-16429] - Add vars to 2 ACP User core events
        • +
      • [PHPBB3-16433] - Add data array to core.ucp_register_user_row_after
        • +
      • [PHPBB3-16434] - Remember forum for advanced search
        • +
      • [PHPBB3-16443] - Add event core.ucp_pm_compose_modify_parse_after
        • +
      • [PHPBB3-16444] - Add event core.ucp_pm_view_message_before
        • +
      • [PHPBB3-16446] - Add event core.message_history_modify_rowset
        • +
      • [PHPBB3-16447] - Add event core.ucp_pm_compose_compose_pm_basic_info_query_after
        • +
      • [PHPBB3-16448] - Add event core.mcp_get_post_data_after
        • +
      • [PHPBB3-16449] - Remove AJAX actions for extension management
        • +
      • [PHPBB3-16450] - ACP permission tabs don't use all available space
        • +
      • [PHPBB3-16452] - Upgrade to FontAwesome 5
        • +
      • [PHPBB3-16456] - Add event core.text_formatter_s9e_get_errors
        • +
      • [PHPBB3-16458] - Add template events to acp_profile.html
        • +
      • [PHPBB3-16461] - Ignore .idea and node_modules
        • +
      • [PHPBB3-16463] - Fix "acp_board.php" where "ACP_SUBMIT_CHANGES" is not displayed.
        • +
      • [PHPBB3-16468] - Amend DocBlocks for user_delete()
        • +
      • [PHPBB3-16494] - Update composer and composer dependencies
        • +
      +

      New Feature

      +
        +
      • [PHPBB3-16225] - Add style version display in ACP install styles page
        • +
      • [PHPBB3-16329] - Strip Exif metadata from uploaded image attachments
        • +
      • [PHPBB3-16330] - Enable ACP option to specify image compression level
        • +
      +

      Sub-task

      +
        +
      • [PHPBB3-16233] - Enable exact phrase searching with Sphinx Fulltext
        • +
      +

      Task

      +
        +
      • [PHPBB3-15609] - Discrepancy and bugs between moderation queue and reports
        • +
      • [PHPBB3-16121] - Add footer-row to simple_footer.html
        • +
      • [PHPBB3-16122] - RANK_IMG, GROUP_RANK and RANK_TITLE variables are useless in some template files
        • +
      • [PHPBB3-16392] - Update composer & dependencies
        • +
      • [PHPBB3-16415] - Use API token for appveyor builds
        • +
      • [PHPBB3-16419] - Add mrgoldy to CREDITS.txt
        • +
      • [PHPBB3-16440] - Use a stable version of PHP 7.4 in Travis CI tests
        • +
      • [PHPBB3-16496] - The help line text for custom BBcode could be wrongly displayed
        • +
      • [PHPBB3-16506] - Update credits to latest state
        • +
      +

      Changes since 3.3.0-RC1

      Bug

        From 65065bf315dfd09e2a57288c783e2749a0277880 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 21 Jun 2020 21:29:51 +0200 Subject: [PATCH 6/6] [3.3.x] Update version numbers to 3.3.2-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 5630a679b5..04152a1c5a 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 3e3c42ceac..bff54c166b 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.1-RC1'); +@define('PHPBB_VERSION', '3.3.2-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 9783b8487b..19ad50a7a4 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.1-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.2-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');