Merge 18a63b6d7d into f94423d491

build/code_sniffer/phpbb/Sniffs/CodeLayout/UnionTypesCheckSniff.php

@@ -1,116 +0,0 @@
-<?php
-/**
- *
- * This file is part of the phpBB Forum Software package.
- *
- * @copyright (c) phpBB Limited <https://www.phpbb.com>
- * @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\Sniffs\CodeLayout;
-
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Sniffs\Sniff;
-
-/**
- * Checks that union type declarations follows the coding guidelines.
- */
-class UnionTypesCheckSniff implements Sniff
-{
-	/**
-	* {@inheritdoc}
-	*/
-	public function register()
-	{
-		return [
-			T_FUNCTION,
-			T_CLASS,
-		];
-	}
-
-	/**
-	* {@inheritdoc}
-	*/
-	public function process(File $phpcsFile, $stackPtr)
-	{
-		$tokens = $phpcsFile->getTokens();
-		if ($tokens[$stackPtr]['type'] === 'T_FUNCTION')
-		{
-			$method_params = $phpcsFile->getMethodParameters($stackPtr);
-			$method_params_array = array_column($method_params, 'type_hint', 'token');
-			foreach ($method_params_array as $stack_pointer => $type_hint)
-			{
-				$this->check_union_type($phpcsFile, $stack_pointer, $type_hint);
-			}
-
-			$method_properties = $phpcsFile->getMethodProperties($stackPtr);
-			$this->check_union_type($phpcsFile, $stackPtr, $method_properties['return_type']);
-		}
-		else if ($tokens[$stackPtr]['type'] === 'T_CLASS')
-		{
-			$class_token = $tokens[$stackPtr];
-			$class_closer_pointer = $class_token['scope_closer'];
-			$first_method_pointer = $phpcsFile->findNext(T_FUNCTION, $stackPtr);
-			$class_members_declarations_end_pointer = $first_method_pointer ?: $class_closer_pointer;
-
-			$stack_pointer = $stackPtr;
-			while(($class_member_pointer = $phpcsFile->findNext(T_VARIABLE, $stack_pointer)) !== false && ($class_member_pointer < $class_members_declarations_end_pointer))
-			{
-				$properties = $phpcsFile->getMemberProperties($class_member_pointer);
-				$this->check_union_type($phpcsFile, $class_member_pointer, $properties['type']);
-				$stack_pointer = $class_member_pointer + 1;
-			}
-		}
-	}
-
-	public function check_union_type(File $phpcsFile, $stack_pointer, $type_hint)
-	{
-		if (empty($type_hint))
-		{
-			return;
-		}
-
-		if (!strpos($type_hint, '|') && $type_hint[0] == '?') // Check nullable shortcut syntax
-		{
-			$type = substr($type_hint, 1);
-			$error = 'Nullable shortcut syntax must not be used. Use union type instead: %1$s|null; found %2$s';
-			$data  = [$type, $type_hint];
-			$phpcsFile->addError($error, $stack_pointer, 'ShortNullableSyntax', $data);					
-		}
-		else if ((count($types_array = explode('|', $type_hint))) > 1) // Check union type layout
-		{
-			$types_array_null_less = $types_array;
-
-			// Check 'null' to be the last element
-			$null_position = array_search('null', $types_array);
-			if ($null_position !== false && $null_position != array_key_last($types_array))
-			{
-				$error = 'The "null" type hint must be the last of the union type elements; found %s';
-				$data  = [implode('|', $types_array)];
-				$phpcsFile->addError($error, $stack_pointer, 'NullAlwaysLast', $data);
-			}
-
-			// Check types excepting 'null' to follow alphabetical order
-			if ($null_position !== false)
-			{
-				array_splice($types_array_null_less, $null_position, 1);
-			}
-
-			if (count($types_array_null_less) > 1)
-			{
-				$types_array_null_less_sorted = $types_array_null_less;
-				sort($types_array_null_less_sorted);
-				if (!empty(array_diff_assoc($types_array_null_less, $types_array_null_less_sorted)))
-				{
-					$error = 'Union type elements must be sorted alphabetically excepting the "null" type hint must be the last if any; found %s';
-					$data  = [implode('|', $types_array)];
-					$phpcsFile->addError($error, $stack_pointer, 'AlphabeticalSort', $data);
-				}
-			}
-		}
-	}
-}

build/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php

@@ -11,8 +11,6 @@
 *
 */
 
-namespace phpbb\Sniffs\Commenting;
-
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
@@ -23,7 +21,7 @@ use PHP_CodeSniffer\Sniffs\Sniff;
 * @package code_sniffer
 * @author Manuel Pichler <mapi@phpundercontrol.org>
 */
-class FileCommentSniff implements Sniff
+class phpbb_Sniffs_Commenting_FileCommentSniff implements Sniff
 {
 	/**
 	* Returns an array of tokens this test wants to listen for.

build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningBraceBsdAllmanSniff.php

@@ -11,8 +11,6 @@
 *
 */
 
-namespace phpbb\Sniffs\ControlStructures;
-
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
@@ -20,7 +18,7 @@ use PHP_CodeSniffer\Sniffs\Sniff;
  * Checks that the opening brace of a control structures is on the line after.
  * From Generic_Sniffs_Functions_OpeningFunctionBraceBsdAllmanSniff
  */
-class OpeningBraceBsdAllmanSniff implements Sniff
+class phpbb_Sniffs_ControlStructures_OpeningBraceBsdAllmanSniff implements Sniff
 {
 	/**
 	 * Registers the tokens that this sniff wants to listen for.

build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningParenthesisSniff.php

@@ -10,7 +10,6 @@
  * the docs/CREDITS.txt file.
  *
  */
-namespace phpbb\Sniffs\ControlStructures;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
@@ -19,7 +18,7 @@ use PHP_CodeSniffer\Sniffs\Sniff;
  * Checks that there is exactly one space between the keyword and the opening
  * parenthesis of a control structures.
  */
-class OpeningParenthesisSniff implements Sniff
+class phpbb_Sniffs_ControlStructures_OpeningParenthesisSniff implements Sniff
 {
 	/**
 	 * Registers the tokens that this sniff wants to listen for.

build/code_sniffer/phpbb/Sniffs/ControlStructures/StaticKeywordSniff.php

@@ -11,8 +11,6 @@
  *
  */
 
-namespace phpbb\Sniffs\ControlStructures;
-
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
@@ -20,7 +18,7 @@ use PHP_CodeSniffer\Sniffs\Sniff;
  * Checks that the visibility qualifiers are placed after the static keyword
  * according to the coding guidelines
  */
-class StaticKeywordSniff implements Sniff
+class phpbb_Sniffs_ControlStructures_StaticKeywordSniff implements Sniff
 {
 	/**
 	 * Registers the tokens that this sniff wants to listen for.

build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php

@@ -11,15 +11,13 @@
 *
 */
 
-namespace phpbb\Sniffs\Namespaces;
-
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
 /**
 * Checks that each use statement is used.
 */
-class UnusedUseSniff implements Sniff
+class phpbb_Sniffs_Namespaces_UnusedUseSniff implements Sniff
 {
 	const FIND = [
 		T_NS_SEPARATOR,

build/code_sniffer/ruleset-php-legacy.xml

@@ -17,6 +17,9 @@
  <!-- There MUST not be more than one statement per line. -->
  <rule ref="Generic.Formatting.DisallowMultipleStatements" />
 
+ <!-- Call-time pass-by-reference MUST not be used. -->
+ <rule ref="Generic.Functions.CallTimePassByReference.NotAllowed" />
+
  <!-- Filenames MUST be lowercase. -->
  <rule ref="Generic.Files.LowercasedFilename" />
 

build/code_sniffer/ruleset-php-strict.xml

@@ -45,8 +45,4 @@
  <!-- There MUST NOT be unused use statements. -->
  <rule ref="./phpbb/Sniffs/Namespaces/UnusedUseSniff.php" />
 
- <!-- The null type SHALL be the last union type element, other types SHALL follow alphabetical order.
-	No nullable type shortcut syntax should be used. -->
- <rule ref="./phpbb/Sniffs/CodeLayout/UnionTypesCheckSniff.php" />
-
 </ruleset>

phpBB/composer.lock

@@ -9459,16 +9459,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.13.0",
+            "version": "3.12.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "65ff2489553b83b4597e89c3b8b721487011d186"
+                "reference": "6d4cf6032d4b718f168c90a96e36c7d0eaacb2aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/65ff2489553b83b4597e89c3b8b721487011d186",
-                "reference": "65ff2489553b83b4597e89c3b8b721487011d186",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/6d4cf6032d4b718f168c90a96e36c7d0eaacb2aa",
+                "reference": "6d4cf6032d4b718f168c90a96e36c7d0eaacb2aa",
                 "shasum": ""
             },
             "require": {
@@ -9539,7 +9539,7 @@
                     "type": "thanks_dev"
                 }
             ],
-            "time": "2025-05-11T03:36:00+00:00"
+            "time": "2025-04-13T04:10:18+00:00"
         },
         {
             "name": "symfony/browser-kit",

phpBB/docs/events.md

@@ -1746,33 +1746,29 @@ overall_header_body_before
 overall_header_breadcrumb_append
 ===
 * Locations:
-    + styles/prosilver/template/breadcrumbs.html
+    + styles/prosilver/template/navbar_header.html
 * Since: 3.1.0-a1
-* Changed: 4.0.0-a1 Moved to breadcrumbs.html
 * Purpose: Add links to the list of breadcrumbs in the header
 
 overall_header_breadcrumb_prepend
 ===
 * Locations:
-    + styles/prosilver/template/breadcrumbs.html
+    + styles/prosilver/template/navbar_header.html
 * Since: 3.1.0-RC3
-* Changed: 4.0.0-a1 Moved to breadcrumbs.html
 * Purpose: Add links to the list of breadcrumbs in the header (after site-home, but before board-index)
 
 overall_header_breadcrumbs_after
 ===
 * Locations:
-    + styles/prosilver/template/breadcrumbs.html
+    + styles/prosilver/template/navbar_header.html
 * Since: 3.1.0-RC3
-* Changed: 4.0.0-a1 Moved to breadcrumbs.html
 * Purpose: Add content after the breadcrumbs (outside of the breadcrumbs container)
 
 overall_header_breadcrumbs_before
 ===
 * Locations:
-    + styles/prosilver/template/breadcrumbs.html
+    + styles/prosilver/template/navbar_header.html
 * Since: 3.1.0-RC3
-* Changed: 4.0.0-a1 Moved to breadcrumbs.html
 * Purpose: Add content before the breadcrumbs (outside of the breadcrumbs container)
 
 overall_header_content_before
@@ -1834,17 +1830,15 @@ overall_header_navigation_prepend
 overall_header_navlink_append
 ===
 * Locations:
-    + styles/prosilver/template/breadcrumbs.html
+    + styles/prosilver/template/navbar_header.html
 * Since: 3.1.0-b3
-* Changed: 4.0.0-a1 Moved to breadcrumbs.html
 * Purpose: Add content after each individual navlink (breadcrumb)
 
 overall_header_navlink_prepend
 ===
 * Locations:
-    + styles/prosilver/template/breadcrumbs.html
+    + styles/prosilver/template/navbar_header.html
 * Since: 3.1.0-b3
-* Changed: 4.0.0-a1 Moved to breadcrumbs.html
 * Purpose: Add content before each individual navlink (breadcrumb)
 
 overall_header_page_body_before

phpBB/includes/acp/acp_profile.php

@@ -475,41 +475,6 @@ class acp_profile
 					$cp->vars[$key] = $var;
 				}
 
-				// step 3 - all arrays
-				if ($action == 'edit')
-				{
-					// Get language entries
-					$sql = 'SELECT *
-						FROM ' . PROFILE_FIELDS_LANG_TABLE . '
-						WHERE lang_id <> ' . $this->edit_lang_id . "
-							AND field_id = $field_id
-						ORDER BY option_id ASC";
-					$result = $db->sql_query($sql);
-
-					$l_lang_options = [];
-					while ($row = $db->sql_fetchrow($result))
-					{
-						$l_lang_options[$row['lang_id']][$row['option_id']] = $row['lang_value'];
-					}
-					$db->sql_freeresult($result);
-
-					$sql = 'SELECT lang_id, lang_name, lang_explain, lang_default_value
-						FROM ' . PROFILE_LANG_TABLE . '
-						WHERE lang_id <> ' . $this->edit_lang_id . "
-							AND field_id = $field_id
-						ORDER BY lang_id ASC";
-					$result = $db->sql_query($sql);
-
-					$l_lang_name = $l_lang_explain = $l_lang_default_value = [];
-					while ($row = $db->sql_fetchrow($result))
-					{
-						$l_lang_name[$row['lang_id']] = $row['lang_name'];
-						$l_lang_explain[$row['lang_id']] = $row['lang_explain'];
-						$l_lang_default_value[$row['lang_id']] = $row['lang_default_value'];
-					}
-					$db->sql_freeresult($result);
-				}
-
 				foreach ($exclude[3] as $key)
 				{
 					$cp->vars[$key] = $request->variable($key, array(0 => ''), true);

phpBB/phpbb/request/request.php

@@ -70,12 +70,12 @@ class request implements request_interface
 
 		foreach ($this->super_globals as $const => $super_global)
 		{
-			$this->input[$const] = isset($GLOBALS[$super_global]) ? (array) $GLOBALS[$super_global] : array();
+			$this->input[$const] = isset($GLOBALS[$super_global]) ? $GLOBALS[$super_global] : array();
 		}
 
 		// simulate request_order = GP
-		$this->original_request = (array) $this->input[request_interface::REQUEST];
-		$this->input[request_interface::REQUEST] = (array) $this->input[request_interface::POST] + (array) $this->input[request_interface::GET];
+		$this->original_request = $this->input[request_interface::REQUEST];
+		$this->input[request_interface::REQUEST] = $this->input[request_interface::POST] + $this->input[request_interface::GET];
 
 		if ($disable_super_globals)
 		{

phpBB/phpbb/routing/loader_resolver.php

@@ -33,7 +33,7 @@ class loader_resolver implements LoaderResolverInterface
 	/**
 	 * {@inheritdoc}
 	 */
-	public function resolve($resource, $type = null): \Symfony\Component\Config\Loader\LoaderInterface|false
+	public function resolve($resource, $type = null): false|\Symfony\Component\Config\Loader\LoaderInterface
 	{
 		/** @var \Symfony\Component\Config\Loader\LoaderInterface $loader */
 		foreach ($this->loaders as $loader)

phpBB/styles/prosilver/template/breadcrumbs.html

@@ -1,53 +0,0 @@
-<ul id="nav-breadcrumbs" class="nav-breadcrumbs linklist navlinks" role="menubar">
-	{% set MICRODATA = 'itemtype="https://schema.org/ListItem" itemprop="itemListElement" itemscope' %}
-	{% set navlink_position = 1 %}
-
-	{% EVENT overall_header_breadcrumbs_before %}
-
-	<li class="breadcrumbs" itemscope itemtype="https://schema.org/BreadcrumbList">
-		{% if U_SITE_HOME %}
-		<span class="crumb" {{ MICRODATA }}>
-						{% apply spaceless %}
-						<a itemprop="item" href="{{ U_SITE_HOME }}" data-navbar-reference="home">
-							{{ Icon('font', 'home', '', true, 'fas o-icon-baseline') }}
-							<span itemprop="name">{{ L_SITE_HOME }}</span>
-						</a>
-						{% endapply %}
-						<meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}">
-					</span>
-		{% endif %}
-
-		{% EVENT overall_header_breadcrumb_prepend %}
-
-		<span class="crumb" {{ MICRODATA }}>
-					{% apply spaceless %}
-					<a itemprop="item" href="{{ U_INDEX }}" accesskey="h" data-navbar-reference="index">
-						{% if not U_SITE_HOME %}{{ Icon('font', 'home', '', true, 'fas o-icon-baseline') }}{% endif %}
-						<span itemprop="name">{{ L_INDEX }}</span>
-					</a>
-					{% endapply %}
-					<meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}">
-				</span>
-
-		{% for navlink in navlinks %}
-		{% set NAVLINK_NAME = navlink.BREADCRUMB_NAME | default(navlink.FORUM_NAME) %}
-		{% set NAVLINK_LINK = navlink.U_BREADCRUMB | default(navlink.U_VIEW_FORUM) %}
-
-		{% EVENT overall_header_navlink_prepend %}
-		<span class="crumb" {{ MICRODATA }}{% if navlink.MICRODATA %} {{ navlink.MICRODATA }}{% endif %}>
-						{% apply spaceless %}
-						<a itemprop="item" href="{{ NAVLINK_LINK }}">
-							<span itemprop="name">{{ NAVLINK_NAME }}</span>
-						</a>
-						{% endapply %}
-						<meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}">
-					</span>
-		{% EVENT overall_header_navlink_append %}
-		{% endfor %}
-
-		{% EVENT overall_header_breadcrumb_append %}
-
-	</li>
-
-	{% EVENT overall_header_breadcrumbs_after %}
-</ul>

phpBB/styles/prosilver/template/faq_body.html

@@ -44,7 +44,7 @@
 <!-- END faq_block -->
 
 <div class="to-top-button">
-	<a href="#faqlinks" title="{{ lang('BACK_TO_TOP') }}">
+	<a href="#faqlinks">
 		{{ Icon('font', 'chevron-up', '', false) }}
 	</a>
 </div>

phpBB/styles/prosilver/template/navbar_header.html

@@ -203,5 +203,68 @@
 
 			{% endif %}
 		</ul>
+
+		<ul id="nav-breadcrumbs" class="nav-breadcrumbs linklist navlinks" role="menubar">
+			{% set MICRODATA = 'itemtype="https://schema.org/ListItem" itemprop="itemListElement" itemscope' %}
+			{% set navlink_position = 1 %}
+
+			{% EVENT overall_header_breadcrumbs_before %}
+
+			<li class="breadcrumbs" itemscope itemtype="https://schema.org/BreadcrumbList">
+				{% if U_SITE_HOME %}
+					<span class="crumb" {{ MICRODATA }}>
+						{% apply spaceless %}
+						<a itemprop="item" href="{{ U_SITE_HOME }}" data-navbar-reference="home">
+							{{ Icon('font', 'home', '', true, 'fas o-icon-baseline') }}
+							<span itemprop="name">{{ L_SITE_HOME }}</span>
+						</a>
+						{% endapply %}
+						<meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}">
+					</span>
+				{% endif %}
+
+				{% EVENT overall_header_breadcrumb_prepend %}
+
+				<span class="crumb" {{ MICRODATA }}>
+					{% apply spaceless %}
+					<a itemprop="item" href="{{ U_INDEX }}" accesskey="h" data-navbar-reference="index">
+						{% if not U_SITE_HOME %}{{ Icon('font', 'home', '', true, 'fas o-icon-baseline') }}{% endif %}
+						<span itemprop="name">{{ L_INDEX }}</span>
+					</a>
+					{% endapply %}
+					<meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}">
+				</span>
+
+				{% for navlink in navlinks %}
+					{% set NAVLINK_NAME = navlink.BREADCRUMB_NAME | default(navlink.FORUM_NAME) %}
+					{% set NAVLINK_LINK = navlink.U_BREADCRUMB | default(navlink.U_VIEW_FORUM) %}
+
+					{% EVENT overall_header_navlink_prepend %}
+					<span class="crumb" {{ MICRODATA }}{% if navlink.MICRODATA %} {{ navlink.MICRODATA }}{% endif %}>
+						{% apply spaceless %}
+						<a itemprop="item" href="{{ NAVLINK_LINK }}">
+							<span itemprop="name">{{ NAVLINK_NAME }}</span>
+						</a>
+						{% endapply %}
+						<meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}">
+					</span>
+					{% EVENT overall_header_navlink_append %}
+				{% endfor %}
+
+				{% EVENT overall_header_breadcrumb_append %}
+
+			</li>
+
+			{% EVENT overall_header_breadcrumbs_after %}
+
+			{% if S_DISPLAY_SEARCH and not S_IN_SEARCH %}
+				<li class="rightside responsive-search">
+					<a href="{{ U_SEARCH }}" title="{{ lang('SEARCH_ADV_EXPLAIN') }}" role="menuitem">
+						{{ Icon('font', 'search', lang('SEARCH'), true) }}
+					</a>
+				</li>
+			{% endif %}
+		</ul>
+
 	</div>
 </div>

phpBB/styles/prosilver/template/overall_header.html

@@ -68,7 +68,7 @@
 <!-- EVENT overall_header_stylesheets_after -->
 
 {% if NOTIFICATIONS_WEBPUSH_ENABLE %}
-	{% include 'ucp_notifications_webpush.html' %}
+	{% include('ucp_notifications_webpush.html') %}
 {% endif %}
 
 </head>
@@ -79,11 +79,7 @@
 <div id="wrap" class="wrap">
 	<a id="top" class="top-anchor" accesskey="t"></a>
 	<div id="page-header">
-		<!-- EVENT overall_header_navbar_before -->
-
 		<div class="headerbar" role="banner">
-
-			{% include 'navbar_header.html' %}
 		<!-- EVENT overall_header_headerbar_before -->
 			<div class="inner">
 
@@ -121,10 +117,10 @@
 			</div>
 			<!-- EVENT overall_header_headerbar_after -->
 		</div>
+		<!-- EVENT overall_header_navbar_before -->
+		<!-- INCLUDE navbar_header.html -->
 	</div>
 
-	{% include 'breadcrumbs.html' %}
-
 	<!-- EVENT overall_header_page_body_before -->
 
 	<a id="start_here" class="anchor"></a>

phpBB/styles/prosilver/template/viewtopic_body.html

@@ -423,6 +423,9 @@
 		<!-- EVENT viewtopic_body_postrow_back2top_before -->
 		<div class="back2top">
 			<!-- EVENT viewtopic_body_postrow_back2top_prepend -->
+			<a href="#top" class="top" title="{L_BACK_TO_TOP}">
+				{{ Icon('font', 'circle-chevron-up', lang('BACK_TO_TOP'), false, 'fas c-top-icon') }}
+			</a>
 			<!-- EVENT viewtopic_body_postrow_back2top_append -->
 		</div>
 		<!-- EVENT viewtopic_body_postrow_back2top_after -->
@@ -493,12 +496,6 @@
 	<!-- ENDIF -->
 </div>
 
-<div class="to-top-button">
-	<a href="#top" title="{{ lang('BACK_TO_TOP') }}">
-		{{ Icon('font', 'chevron-up', '', false) }}
-	</a>
-</div>
-
 <!-- EVENT viewtopic_body_footer_before -->
 <!-- INCLUDE jumpbox.html -->
 

phpBB/styles/prosilver/theme/colours.css

@@ -99,19 +99,18 @@ th a:hover {
 }
 
 /* round cornered boxes and backgrounds */
-.headerbar,
-.headerbar h1 {
-	color: #eaf8ff;
+.headerbar {
+	color: #ffffff;
 }
 
 .headerbar,
 .forumbg {
-	background-color: #4688ce;
+	background-color: #13a4ec;
 	background-repeat: repeat-x;
 }
 
 .forabg {
-	background-color: #4688ce;
+	background-color: #13a4ec;
 	background-repeat: repeat-x;
 }
 
@@ -119,18 +118,6 @@ th a:hover {
 	background-color: #c9dee8;
 }
 
-.headerbar .navbar a {
-	color: #eaf8ff;
-}
-
-.headerbar .navbar .dropdown a {
-	color: #0f4d8a;
-}
-
-.header-profile {
-	text-shadow: 0 0 1.75rem #eaf8ff;
-}
-
 .panel {
 	background-color: #f0f3f5;
 	color: #29303d;
@@ -827,10 +814,6 @@ dd.profile-warnings {
 /*  icon images */
 .site_logo { background-image: url("./images/site_logo.svg"); }
 
-.c-hero-logo-img g {
-	fill: #eaf8ff;
-}
-
 /*	colours and backgrounds for cp.css */
 
 /* main cp box */
@@ -1126,7 +1109,6 @@ input.disabled {
 
 .dropdown-extended .dropdown-extended-item {
 	border-top-color: #bdbdbd;
-	color: #47536b;
 }
 
 .dropdown-extended .dropdown-extended-item:hover {

phpBB/styles/prosilver/theme/common.css

@@ -17,7 +17,7 @@ body {
 	line-height: normal;
 	word-wrap: break-word;
 	margin: 0;
-	padding: 0 0 12px;
+	padding: 12px 0;
 	-webkit-print-color-adjust: exact;
 }
 
@@ -151,13 +151,12 @@ a:hover {
 /* Main blocks
 ---------------------------------------- */
 .wrap {
-	border: solid transparent;
-	border-width: 0 1px 1px;
-	border-radius: 0 0 8px 8px;
+	border: 1px solid transparent;
+	border-radius: 8px;
 	min-width: 625px;
 	max-width: 1152px;
 	margin: 0 auto;
-	padding: 0 15px 15px;
+	padding: 15px;
 }
 
 .page-body {
@@ -201,7 +200,7 @@ a:hover {
 /* Round cornered boxes and backgrounds
 ---------------------------------------- */
 .headerbar {
-	border-radius: 0 0 7px 7px;
+	border-radius: 7px;
 	display: flex;
 	flex-direction: column;
 	margin-bottom: 0.5rem;
@@ -213,11 +212,6 @@ a:hover {
 	padding: 3px 10px;
 }
 
-.headerbar .navbar {
-	background: none;
-	padding: calc(var(--ps-line-height) * 0.25) 5px calc(var(--ps-line-height) * 0.5);
-}
-
 .forabg {
 	border-radius: 7px;
 	clear: both;
@@ -346,10 +340,6 @@ ul.linklist .dropdown-up .dropdown {
 	bottom: 18px;
 }
 
-ul.nav-breadcrumbs {
-	margin: calc(var(--ps-line-height) * 0.75) 0;
-}
-
 /* Bulletin icons for list items
 ---------------------------------------- */
 ul.linklist.bulletin > li:before {

phpBB/styles/prosilver/theme/content.css

@@ -465,7 +465,7 @@ p.author {
 	clear: left;
 	overflow: hidden;
 	width: 100%;
-	margin: calc(var(--ps-font-small) * 1.4) 0;
+	margin-top: calc(var(--ps-font-small) * 1.4);
 	padding-top: 2px;
 }
 

phpBB/styles/prosilver/theme/responsive.css

@@ -328,6 +328,7 @@
 		vertical-align: bottom;
 		text-overflow: ellipsis;
 		overflow: hidden;
+		max-width: 100px;
 	}
 
 	/* Pagination

tests/functional/acp_profile_field_test.php

@@ -69,32 +69,4 @@ class phpbb_functional_acp_profile_field_test extends phpbb_functional_test_case
 
 		$this->assertContainsLang('ADDED_PROFILE_FIELD', $crawler->text());
 	}
-
-	public function test_edit_profile_fields()
-	{
-		// Custom profile fields page
-		$crawler = self::request('GET', 'adm/index.php?i=acp_profile&mode=profile&sid=' . $this->sid);
-
-		// Get all profile fields edit URLs
-		$edits = $crawler->filter('td.actions a')
-			->reduce(
-				function ($node, $i) {
-					$url = $node->attr('href');
-					return ((bool) strpos($url, 'action=edit'));
-			})
-			->each(
-				function ($node, $i) {
-					$url = $node->attr('href');
-					return ($url);
-			});
-
-		foreach ($edits as $edit_url)
-		{
-			$crawler = self::request('GET', 'adm/' . $edit_url . '&sid=' . $this->sid);
-			$form = $crawler->selectButton('Save')->form();
-			$crawler= self::submit($form);
-
-			$this->assertContainsLang('CHANGED_PROFILE_FIELD', $crawler->text());
-		}
-	}
 }