diff --git a/build/build.xml b/build/build.xml index a2571d50f5..b4301aa077 100644 --- a/build/build.xml +++ b/build/build.xml @@ -4,7 +4,7 @@ - + diff --git a/composer.phar b/composer.phar index c435e8986d..9efd41a1a7 100755 Binary files a/composer.phar and b/composer.phar differ diff --git a/phpBB/composer.json b/phpBB/composer.json index 3667791bbd..0581f5188e 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -48,7 +48,6 @@ "symfony/finder": "~3.4", "symfony/http-foundation": "~3.4", "symfony/http-kernel": "~3.4", - "symfony/polyfill-intl-idn": "~1.17.0", "symfony/process": "^3.4", "symfony/proxy-manager-bridge": "~3.4", "symfony/routing": "~3.4", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 739d9f2f7e..9c1fece69a 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5039b83cb8ee1def8a7f60edcf6b6890", + "content-hash": "8436b462289aea75fb1758aeb17fdc4e", "packages": [ { "name": "bantu/ini-get-wrapper", @@ -85,16 +85,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.2.8", + "version": "1.2.9", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "8a7ecad675253e4654ea05505233285377405215" + "reference": "78a0e288fdcebf92aa2318a8d3656168da6ac1a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/8a7ecad675253e4654ea05505233285377405215", - "reference": "8a7ecad675253e4654ea05505233285377405215", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/78a0e288fdcebf92aa2318a8d3656168da6ac1a5", + "reference": "78a0e288fdcebf92aa2318a8d3656168da6ac1a5", "shasum": "" }, "require": { @@ -103,14 +103,15 @@ "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8", + "phpstan/phpstan": "^0.12.55", "psr/log": "^1.0", + "symfony/phpunit-bridge": "^4.2 || ^5", "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.x-dev" + "dev-main": "1.x-dev" } }, "autoload": { @@ -140,7 +141,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.2.8" + "source": "https://github.com/composer/ca-bundle/tree/1.2.9" }, "funding": [ { @@ -156,7 +157,7 @@ "type": "tidelift" } ], - "time": "2020-08-23T12:54:47+00:00" + "time": "2021-01-12T12:10:35+00:00" }, { "name": "composer/composer", @@ -257,16 +258,16 @@ }, { "name": "composer/installers", - "version": "v1.9.0", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/composer/installers.git", - "reference": "b93bcf0fa1fccb0b7d176b0967d969691cd74cca" + "reference": "1a0357fccad9d1cc1ea0c9a05b8847fbccccb78d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/installers/zipball/b93bcf0fa1fccb0b7d176b0967d969691cd74cca", - "reference": "b93bcf0fa1fccb0b7d176b0967d969691cd74cca", + "url": "https://api.github.com/repos/composer/installers/zipball/1a0357fccad9d1cc1ea0c9a05b8847fbccccb78d", + "reference": "1a0357fccad9d1cc1ea0c9a05b8847fbccccb78d", "shasum": "" }, "require": { @@ -277,17 +278,18 @@ "shama/baton": "*" }, "require-dev": { - "composer/composer": "1.6.* || 2.0.*@dev", - "composer/semver": "1.0.* || 2.0.*@dev", - "phpunit/phpunit": "^4.8.36", - "sebastian/comparator": "^1.2.4", + "composer/composer": "1.6.* || ^2.0", + "composer/semver": "^1 || ^3", + "phpstan/phpstan": "^0.12.55", + "phpstan/phpstan-phpunit": "^0.12.16", + "symfony/phpunit-bridge": "^4.2 || ^5", "symfony/process": "^2.3" }, "type": "composer-plugin", "extra": { "class": "Composer\\Installers\\Plugin", "branch-alias": { - "dev-master": "1.0-dev" + "dev-main": "1.x-dev" } }, "autoload": { @@ -325,6 +327,7 @@ "Porto", "RadPHP", "SMF", + "Starbug", "Thelia", "Whmcs", "WolfCMS", @@ -365,6 +368,7 @@ "phpbb", "piwik", "ppi", + "processwire", "puppet", "pxcms", "reindex", @@ -382,19 +386,23 @@ ], "support": { "issues": "https://github.com/composer/installers/issues", - "source": "https://github.com/composer/installers/tree/v1.9.0" + "source": "https://github.com/composer/installers/tree/v1.10.0" }, "funding": [ { "url": "https://packagist.com", "type": "custom" }, + { + "url": "https://github.com/composer", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/composer/composer", "type": "tidelift" } ], - "time": "2020-04-07T06:57:05+00:00" + "time": "2021-01-14T11:07:16+00:00" }, { "name": "composer/package-versions-deprecated", @@ -1222,16 +1230,16 @@ }, { "name": "patchwork/utf8", - "version": "v1.3.2", + "version": "v1.3.3", "source": { "type": "git", "url": "https://github.com/tchwork/utf8.git", - "reference": "d296e0026e7ce10b2a9fe594feca9628ef00e9e8" + "reference": "e1fa4d4a57896d074c9a8d01742b688d5db4e9d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tchwork/utf8/zipball/d296e0026e7ce10b2a9fe594feca9628ef00e9e8", - "reference": "d296e0026e7ce10b2a9fe594feca9628ef00e9e8", + "url": "https://api.github.com/repos/tchwork/utf8/zipball/e1fa4d4a57896d074c9a8d01742b688d5db4e9d5", + "reference": "e1fa4d4a57896d074c9a8d01742b688d5db4e9d5", "shasum": "" }, "require": { @@ -1282,9 +1290,20 @@ ], "support": { "issues": "https://github.com/tchwork/utf8/issues", - "source": "https://github.com/tchwork/utf8/tree/master" + "source": "https://github.com/tchwork/utf8/tree/v1.3.3" }, - "time": "2019-12-03T14:44:12+00:00" + "funding": [ + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/patchwork/utf8", + "type": "tidelift" + } + ], + "abandoned": "symfony/polyfill-mbstring or symfony/string", + "time": "2021-01-07T16:38:58+00:00" }, { "name": "psr/container", @@ -2487,16 +2506,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.20.0", + "version": "v1.22.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41" + "reference": "c6c942b1ac76c82448322025e084cadc56048b4e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f4ba089a5b6366e453971d3aad5fe8e897b37f41", - "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e", + "reference": "c6c942b1ac76c82448322025e084cadc56048b4e", "shasum": "" }, "require": { @@ -2508,7 +2527,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2546,7 +2565,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.20.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.0" }, "funding": [ { @@ -2562,25 +2581,25 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.17.1", + "version": "v1.22.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "a57f8161502549a742a63c09f0a604997bf47027" + "reference": "0eb8293dbbcd6ef6bf81404c9ce7d95bcdf34f44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a57f8161502549a742a63c09f0a604997bf47027", - "reference": "a57f8161502549a742a63c09f0a604997bf47027", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/0eb8293dbbcd6ef6bf81404c9ce7d95bcdf34f44", + "reference": "0eb8293dbbcd6ef6bf81404c9ce7d95bcdf34f44", "shasum": "" }, "require": { - "php": ">=5.3.3", - "symfony/polyfill-mbstring": "^1.3", + "php": ">=7.1", + "symfony/polyfill-intl-normalizer": "^1.10", "symfony/polyfill-php72": "^1.10" }, "suggest": { @@ -2589,7 +2608,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.17-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2613,6 +2632,10 @@ "name": "Laurent Bassin", "email": "laurent@bassin.info" }, + { + "name": "Trevor Rowbotham", + "email": "trevor.rowbotham@pm.me" + }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" @@ -2629,7 +2652,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.17.1" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.22.0" }, "funding": [ { @@ -2645,20 +2668,104 @@ "type": "tidelift" } ], - "time": "2020-06-06T08:46:27+00:00" + "time": "2021-01-07T16:49:33+00:00" }, { - "name": "symfony/polyfill-mbstring", - "version": "v1.20.0", + "name": "symfony/polyfill-intl-normalizer", + "version": "v1.22.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "39d483bdf39be819deabf04ec872eb0b2410b531" + "url": "https://github.com/symfony/polyfill-intl-normalizer.git", + "reference": "6e971c891537eb617a00bb07a43d182a6915faba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/39d483bdf39be819deabf04ec872eb0b2410b531", - "reference": "39d483bdf39be819deabf04ec872eb0b2410b531", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/6e971c891537eb617a00bb07a43d182a6915faba", + "reference": "6e971c891537eb617a00bb07a43d182a6915faba", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.22-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's Normalizer class and related functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "intl", + "normalizer", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.0" + }, + "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": "2021-01-07T17:09:11+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.22.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f377a3dd1fde44d37b9831d68dc8dea3ffd28e13", + "reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13", "shasum": "" }, "require": { @@ -2670,7 +2777,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2709,7 +2816,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.20.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.0" }, "funding": [ { @@ -2725,7 +2832,7 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/polyfill-php56", @@ -2865,16 +2972,16 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.20.0", + "version": "v1.22.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930" + "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cede45fcdfabdd6043b3592e83678e42ec69e930", - "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", + "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", "shasum": "" }, "require": { @@ -2883,7 +2990,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2921,7 +3028,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.20.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.22.0" }, "funding": [ { @@ -2937,7 +3044,7 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/process", diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 59621ce429..c3b242cca9 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog
      +
    • Changes since 3.3.2
    • Changes since 3.3.1
    • Changes since 3.3.1-RC1
    • Changes since 3.3.0
      • @@ -153,6 +154,54 @@
      +

      Changes since 3.3.2

      +

      Bug

      +
        +
      • [PHPBB3-16178] - Container_builder and Container don't use the same cache_dir when cache dir is overridden via env parameter
        • +
      • [PHPBB3-16535] - Migration from phpBB 2.0.x broken with MySQL 8.x
        • +
      • [PHPBB3-16582] - SQL error when saving profile with empty custom field of type "Numbers"
        • +
      • [PHPBB3-16619] - Spelling on non-existant
        • +
      • [PHPBB3-16629] - ACP get_database_size() fails on MySql 8.0.xx
        • +
      • [PHPBB3-16630] - Preserve the text manipulation API
        • +
      • [PHPBB3-16640] - MCP link not showing in menubar
        • +
      • [PHPBB3-16641] - Failure in config.php validation in ACP (Windows) - PHP 8
        • +
      • [PHPBB3-16646] - PHP fatal error while installing
        • +
      • [PHPBB3-16648] - "Access to undeclared static property" error on setExpectedTriggerError() tests
        • +
      • [PHPBB3-16653] - Recaptcha v3 - Request method is set even though that default isn't actually available
        • +
      • [PHPBB3-16656] - Outdated check in code for mbstring http_input & output
        • +
      • [PHPBB3-16665] - Fix Emoji for strings in board settings + new event
        • +
      • [PHPBB3-16666] - Windows tests in github actions can't write file in postgres
        • +
      • [PHPBB3-16667] - Remove unused create_schema install task
        • +
      • [PHPBB3-16670] - OAuth provider unique secret and key check fails on PHP 8
        • +
      • [PHPBB3-16673] - Invalid Atom feed
        • +
      • [PHPBB3-16677] - Event handlers inside dropdown containers not working in mobile view
        • +
      • [PHPBB3-16679] - Login form should respect setting for "Allow password reset"
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-15722] - Allow forum topicrow pagination to use topicrow values
        • +
      • [PHPBB3-16538] - Add MySQL 8 tests
        • +
      • [PHPBB3-16549] - Use PHPUnit 9.3+ for PHP 8.0+ tests
        • +
      • [PHPBB3-16606] - UCP_PM_VIEWMESSAGE.HTML Event Request
        • +
      • [PHPBB3-16607] - Oracle DBAL driver uses obsoleted PHP OCI8 aliases and functions
        • +
      • [PHPBB3-16617] - Add events to modify content status variables
        • +
      • [PHPBB3-16632] - Update composer to version 2
        • +
      • [PHPBB3-16636] - Add PHP 8.0 builds to TravisCI
        • +
      • [PHPBB3-16659] - Use Github Actions instead of TravisCI and AppVeyor
        • +
      • [PHPBB3-16661] - Clean up github actions tasks after merge
        • +
      • [PHPBB3-16675] - Restore checking commit messages
        • +
      • [PHPBB3-16676] - Make Github actions cache composer dependendencies
        • +
      • [PHPBB3-16678] - Add support for Traits in code sniffer
        • +
      +

      New Feature

      +
        +
      • [PHPBB3-15951] - Add core events to core.mcp_delete_topic_modify_*
        • +
      +

      Task

      +
        +
      • [PHPBB3-16633] - Update pull request template after end of life of 3.2
        • +
      +

      Changes since 3.3.1

      Bug

        diff --git a/phpBB/docs/CREDITS.txt b/phpBB/docs/CREDITS.txt index fcd8252b54..bc0688e62a 100644 --- a/phpBB/docs/CREDITS.txt +++ b/phpBB/docs/CREDITS.txt @@ -1,6 +1,6 @@ /** * -* phpBB © Copyright phpBB Limited 2003-2020 +* phpBB © Copyright phpBB Limited 2003-2021 * https://www.phpbb.com * * phpBB is free software. You can redistribute it and/or modify it diff --git a/phpBB/phpbb/db/migration/data/v33x/v333rc1.php b/phpBB/phpbb/db/migration/data/v33x/v333rc1.php new file mode 100644 index 0000000000..a1c3c2faa3 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/v333rc1.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 v333rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.3.3-RC1', '>='); + } + + static public function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\v332', + ]; + } + + public function update_data() + { + return [ + ['config.update', ['version', '3.3.3-RC1']], + ]; + } +} diff --git a/phpBB/styles/prosilver/theme/stylesheet.css b/phpBB/styles/prosilver/theme/stylesheet.css index fa168a02bb..94bea37750 100644 --- a/phpBB/styles/prosilver/theme/stylesheet.css +++ b/phpBB/styles/prosilver/theme/stylesheet.css @@ -10,13 +10,13 @@ @import url("normalize.css?hash=e6c08715"); @import url("base.css?hash=9b6738c8"); @import url("utilities.css?hash=b95e1ad4"); -@import url("icons.css?hash=2fcf49a1"); -@import url("common.css?hash=fe09f059"); -@import url("buttons.css?hash=f4e39187"); -@import url("links.css?hash=5fc8ca41"); -@import url("content.css?hash=0daf1369"); -@import url("buttons.css?hash=f4e39187"); -@import url("cp.css?hash=2530357c"); -@import url("forms.css?hash=7a849801"); -@import url("colours.css?hash=73de7bbf"); -@import url("responsive.css?hash=8b3f0a01"); +@import url("icons.css?hash=ce762578"); +@import url("common.css?hash=658f990b"); +@import url("buttons.css?hash=eb16911f"); +@import url("links.css?hash=5fec3654"); +@import url("content.css?hash=f7bdea58"); +@import url("buttons.css?hash=eb16911f"); +@import url("cp.css?hash=73c6f37d"); +@import url("forms.css?hash=5e06dbba"); +@import url("colours.css?hash=dbf08dba"); +@import url("responsive.css?hash=78159a5e");