Skip to content

Commit b6e0404

Browse files
marc1706marc1706
committed
Merge branch 'prep-release-4.0.0'
2 parents 66d066c + 643f5e8 commit b6e0404

7 files changed

Lines changed: 138 additions & 12 deletions

File tree

‎build/build.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
<project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
44
<!-- a few settings for the build -->
5-
<property name="newversion" value="4.0.0-a2-dev" />
6-
<property name="prevversion" value="3.3.16" />
7-
<property name="olderversions" value="3.1.12, 3.2.11, 4.0.0-a1" />
5+
<property name="newversion" value="4.0.0-a2" />
6+
<property name="prevversion" value="4.0.0-a1" />
7+
<property name="olderversions" value="3.1.12, 3.2.11, 3.3.16" />
88
<!-- no configuration should be needed beyond this point -->
99

1010
<property name="oldversions" value="${olderversions}, ${prevversion}" />

‎phpBB/docs/CHANGELOG.html‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ <h1>Changelog</h1>
5050
<ol>
5151
<li><a href="#changelog">Changelog</a>
5252
<ul>
53+
<li><a href="#v400a1">Changes since 4.0.0-a1</a></li>
5354
<li><a href="#v33x">Changes since 3.3.x</a></li>
5455
<li><a href="#v3316rc1">Changes since 3.3.16-RC1</a></li>
5556
<li><a href="#v3315">Changes since 3.3.15</a></li>
@@ -178,6 +179,93 @@ <h1>Changelog</h1>
178179
<div class="inner">
179180

180181
<div class="content">
182+
<a name="v400a1"></a><h3>Changes since 4.0.0-a1</h3>
183+
<h4>Bug</h4>
184+
<ul>
185+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15085">PHPBB-15085</a>] - HTTP authentication from feeds served via controller</li>
186+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17477">PHPBB-17477</a>] - Problem with Whois lookups returning incorrect information due to ARIN/RIPE changes</li>
187+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17552">PHPBB-17552</a>] - extensions.php lang file uses plural rule structure for different purpose</li>
188+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17553">PHPBB-17553</a>] - Remove jabber notification entries instead of trying to convert them</li>
189+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17554">PHPBB-17554</a>] - Feature tests for Extensions Catalog are making external HTTP calls</li>
190+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17557">PHPBB-17557</a>] - Error suppression is missing for migrating avatars in 4.0</li>
191+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17560">PHPBB-17560</a>] - Diff engine causes PHP fatal error</li>
192+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17562">PHPBB-17562</a>] - base.css file contains font-size declaration overridden in common.css</li>
193+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17563">PHPBB-17563</a>] - CodeSniffer ruleset (PPSSE) not fully compatible with CS 4</li>
194+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17564">PHPBB-17564</a>] - Header profile contrast in navbar can result in hard to read username</li>
195+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17565">PHPBB-17565</a>] - Incorrect exporting PM as CSV for Excel</li>
196+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17567">PHPBB-17567</a>] - Page width exceeds the screen width in responsive mode</li>
197+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17569">PHPBB-17569</a>] - Responsive bug in footer navbar</li>
198+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17571">PHPBB-17571</a>] - pm inline attachment not showing</li>
199+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17573">PHPBB-17573</a>] - Allow to run phpunit in local again</li>
200+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17575">PHPBB-17575</a>] - Web Manifest scope path is likely invalid</li>
201+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17580">PHPBB-17580</a>] - Downloading files with a byte range of 8192 bytes causes fatal error</li>
202+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17581">PHPBB-17581</a>] - PHP warning on viewing a topic page with avatars as bot</li>
203+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17582">PHPBB-17582</a>] - Not working lang vars in acp_ext_list.html</li>
204+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17585">PHPBB-17585</a>] - Some extensions with modules can't be uninstalled</li>
205+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17589">PHPBB-17589</a>] - QA captcha appears on every other login attempt</li>
206+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17594">PHPBB-17594</a>] - Improved error handling of web push subscriber</li>
207+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17596">PHPBB-17596</a>] - Logout link in ACP does not work</li>
208+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17622">PHPBB-17622</a>] - Version helper may return update from newer branch</li>
209+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17624">PHPBB-17624</a>] - Datetime edge case tests fail when local timezone is ahead of UTC</li>
210+
</ul>
211+
<h4>Improvement</h4>
212+
<ul>
213+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-13481">PHPBB-13481</a>] - Explain in ACP Attachment settings images get resized (at client-side)</li>
214+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15007">PHPBB-15007</a>] - Add Restart link to installer</li>
215+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17447">PHPBB-17447</a>] - Attachments controller: Use BinaryFileResponse when adapter is local</li>
216+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17524">PHPBB-17524</a>] - Add possibility to use index key length in migrations</li>
217+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17536">PHPBB-17536</a>] - Add event to Edit forum in ACP to modify template</li>
218+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17539">PHPBB-17539</a>] - Increase default password complexity</li>
219+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17541">PHPBB-17541</a>] - Ext Catalog is using variables in loops incorrectly</li>
220+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17555">PHPBB-17555</a>] - Improve running of tests on windows runners in GitHub Actions</li>
221+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17556">PHPBB-17556</a>] - Upgrade to Symfony 7.4</li>
222+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17559">PHPBB-17559</a>] - Extension Catalog can be installed without repositories</li>
223+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17561">PHPBB-17561</a>] - Extension Catalog Installs Incompatible Extensions</li>
224+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17570">PHPBB-17570</a>] - Replace an old CSS accessibility hack with a modern, recommended and W3C compliant method</li>
225+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17572">PHPBB-17572</a>] - meta apple-mobile-web-app-capable depreciated</li>
226+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17587">PHPBB-17587</a>] - Move mark notification read to controller</li>
227+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17588">PHPBB-17588</a>] - Move index page to controller</li>
228+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17590">PHPBB-17590</a>] - Use index.php as frontend controller</li>
229+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17592">PHPBB-17592</a>] - Translate &quot;No match found!!!&quot; if no mention entry was found</li>
230+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17598">PHPBB-17598</a>] - Deny access to composer files in apache</li>
231+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17603">PHPBB-17603</a>] - Remove unused gulp</li>
232+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17604">PHPBB-17604</a>] - Disable all extension during phpBB4 install/update</li>
233+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17605">PHPBB-17605</a>] - Fix homestead and use a fork since is no longer maintained</li>
234+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17619">PHPBB-17619</a>] - Fix UnusedUseSniff to detect property type declarations</li>
235+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17620">PHPBB-17620</a>] - Skip whois test when daily rate-limit is reached</li>
236+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17621">PHPBB-17621</a>] - Change U_WARN to use new warn_allowed variable</li>
237+
</ul>
238+
<h4>New Feature</h4>
239+
<ul>
240+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17566">PHPBB-17566</a>] - Add default avatars based on username</li>
241+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17597">PHPBB-17597</a>] - Use avatar twig function instead of html generated in PHP</li>
242+
</ul>
243+
<h4>Task</h4>
244+
<ul>
245+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15823">PHPBB-15823</a>] - Move viewonline.php to controller</li>
246+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16005">PHPBB-16005</a>] - Remove phpBB2 converter</li>
247+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17545">PHPBB-17545</a>] - Improve handling of DDoS/brute force attacks on login form</li>
248+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17584">PHPBB-17584</a>] - Exclude tests from PSR1 code sniffs</li>
249+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17591">PHPBB-17591</a>] - Update to Code Sniffer 4</li>
250+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17593">PHPBB-17593</a>] - Allow functional tests on a secure local server</li>
251+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17595">PHPBB-17595</a>] - Ext Catalog should load packages from titania's 4.0 branch</li>
252+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17599">PHPBB-17599</a>] - Update composer and node dependencies</li>
253+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17602">PHPBB-17602</a>] - Clean up avatar code and avatar tests</li>
254+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17612">PHPBB-17612</a>] - Remove imageset to css converter</li>
255+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17613">PHPBB-17613</a>] - Remove support for retired WebPI packages</li>
256+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17628">PHPBB-17628</a>] - Update composer and node dependencies</li>
257+
</ul>
258+
<h4>Security Issue</h4>
259+
<ul>
260+
<li>[SECURITY-285] - Password Reset Link Poisoning</li>
261+
<li>[SECURITY-286] - IDOR when composing PMs</li>
262+
<li>[SECURITY-287] - CSRF on report submission</li>
263+
<li>[SECURITY-288] - Blind POST SSRF via Web Push Notification</li>
264+
<li>[SECURITY-289] - Hardening against non-rasterized image uploads</li>
265+
<li>[SECURITY-290] - Cross-User Notification Read State Manipulation</li>
266+
<li>[SECURITY-291] - Improper access control in mention controller</li>
267+
</ul>
268+
181269
<a name="v33x"></a><h3>Changes since 3.3.x</h3>
182270
<h4>Bug</h4>
183271
<ul>

‎phpBB/includes/constants.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
*/
2929

3030
// phpBB Version
31-
@define('PHPBB_VERSION', '4.0.0-a2-dev');
31+
@define('PHPBB_VERSION', '4.0.0-a2');
3232

3333
// QA-related
3434
// define('PHPBB_QA', 1);

‎phpBB/install/phpbbcli.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
define('IN_PHPBB', true);
2424
define('IN_INSTALL', true);
2525
define('PHPBB_ENVIRONMENT', 'production');
26-
define('PHPBB_VERSION', '4.0.0-a1');
26+
define('PHPBB_VERSION', '4.0.0-a2');
2727
$phpbb_root_path = __DIR__ . '/../';
2828
$phpEx = substr(strrchr(__FILE__, '.'), 1);
2929

‎phpBB/install/schemas/schema_data.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_last
299299
INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_lock', '0');
300300
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
301301
INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0');
302-
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '4.0.0-a2-dev');
302+
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '4.0.0-a2');
303303
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
304304
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
305305
INSERT INTO phpbb_config (config_name, config_value) VALUES ('exts_composer_repositories', '["https://satis.phpbb.com/","https://www.phpbb.com/customise/db/composer/40/"]');

‎phpBB/phpbb/db/migration/data/v400/v400a2.php‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?php
2+
/**
3+
*
4+
* This file is part of the phpBB Forum Software package.
5+
*
6+
* @copyright (c) phpBB Limited <https://www.phpbb.com>
7+
* @license GNU General Public License, version 2 (GPL-2.0)
8+
*
9+
* For full copyright and license information, please see
10+
* the docs/CREDITS.txt file.
11+
*
12+
*/
13+
14+
namespace phpbb\db\migration\data\v400;
15+
16+
class v400a2 extends \phpbb\db\migration\migration
17+
{
18+
public function effectively_installed()
19+
{
20+
return version_compare($this->config['version'], '4.0.0-a2', '>=');
21+
}
22+
23+
public static function depends_on()
24+
{
25+
return [
26+
'\phpbb\db\migration\data\v33x\v3316',
27+
'\phpbb\db\migration\data\v400\disable_extensions',
28+
'\phpbb\db\migration\data\v400\extensions_composer_4',
29+
];
30+
}
31+
32+
public function update_data()
33+
{
34+
return [
35+
['config.update', ['version', '4.0.0-a2']],
36+
];
37+
}
38+
}

‎phpBB/styles/prosilver/theme/stylesheet.css‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
@import url("base.css?hash=e4336923");
1212
@import url("utilities.css?hash=b95e1ad4");
1313
@import url("icons.css?hash=cf9a9308");
14-
@import url("common.css?hash=b2c7c02b");
14+
@import url("common.css?hash=3e946b8c");
1515
@import url("buttons.css?hash=be0468e7");
16-
@import url("links.css?hash=ecc09d7a");
16+
@import url("links.css?hash=20df6b95");
1717
@import url("mentions.css?hash=308fbc69");
18-
@import url("content.css?hash=46dafcea");
18+
@import url("content.css?hash=cab73962");
1919
@import url("cp.css?hash=9ed1a111");
2020
@import url("forms.css?hash=e6a667ba");
21-
@import url("colours.css?hash=f1c629cc");
22-
@import url("responsive.css?hash=c6136396");
23-
@import url("bidi.css?hash=c1b99d9a");
21+
@import url("colours.css?hash=fae5c302");
22+
@import url("responsive.css?hash=62adf6f6");
23+
@import url("bidi.css?hash=2e917914");

0 commit comments

Comments
 (0)