From e6f4df3442761d24b6052eb0d4debe503c0a7606 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Fri, 31 Jan 2025 12:11:59 -0500
Subject: [PATCH 1/2] Prioritize coalescing parameters in
 Moderation\Users\*->processGetActions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

↪ This was causing missing array index warnings when the casting took precedence
---
 src/Module/Moderation/Users/Active.php  | 4 ++--
 src/Module/Moderation/Users/Blocked.php | 4 ++--
 src/Module/Moderation/Users/Index.php   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Module/Moderation/Users/Active.php b/src/Module/Moderation/Users/Active.php
index 1b11685f64..a91f5934dc 100644
--- a/src/Module/Moderation/Users/Active.php
+++ b/src/Module/Moderation/Users/Active.php
@@ -124,8 +124,8 @@ class Active extends BaseUsers
 	 */
 	private function processGetActions(): void
 	{
-		$action = (string)$this->parameters['action'] ?? '';
-		$uid = (int)$this->parameters['uid'] ?? 0;
+		$action = (string) ($this->parameters['action'] ?? '');
+		$uid = (int) ($this->parameters['uid'] ?? 0);
 
 		if ($uid === 0) {
 			return;
diff --git a/src/Module/Moderation/Users/Blocked.php b/src/Module/Moderation/Users/Blocked.php
index fbdbc8d8c7..3c2577f7f0 100644
--- a/src/Module/Moderation/Users/Blocked.php
+++ b/src/Module/Moderation/Users/Blocked.php
@@ -123,8 +123,8 @@ class Blocked extends BaseUsers
 	 */
 	private function processGetActions(): void
 	{
-		$action = (string)$this->parameters['action'] ?? '';
-		$uid = (int)$this->parameters['uid'] ?? 0;
+		$action = (string) ($this->parameters['action'] ?? '');
+		$uid = (int) ($this->parameters['uid'] ?? 0);
 
 		if ($uid === 0) {
 			return;
diff --git a/src/Module/Moderation/Users/Index.php b/src/Module/Moderation/Users/Index.php
index 7d195c1096..26d71efd60 100644
--- a/src/Module/Moderation/Users/Index.php
+++ b/src/Module/Moderation/Users/Index.php
@@ -135,8 +135,8 @@ class Index extends BaseUsers
 	 */
 	private function processGetActions(): void
 	{
-		$action = (string) $this->parameters['action'] ?? '';
-		$uid = (int) $this->parameters['uid'] ?? 0;
+		$action = (string) ($this->parameters['action'] ?? '');
+		$uid = (int) ($this->parameters['uid'] ?? 0);
 
 		if ($uid === 0) {
 			return;

From 3799f6c69e836cb24b71d6f3b4000fda5c02d82f Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Fri, 31 Jan 2025 12:15:31 -0500
Subject: [PATCH 2/2] Fix code style in Moderation\Users classes

---
 src/Module/Moderation/Users/Active.php  | 3 ++-
 src/Module/Moderation/Users/Blocked.php | 3 ++-
 src/Module/Moderation/Users/Index.php   | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Module/Moderation/Users/Active.php b/src/Module/Moderation/Users/Active.php
index a91f5934dc..7d1f61c7a7 100644
--- a/src/Module/Moderation/Users/Active.php
+++ b/src/Module/Moderation/Users/Active.php
@@ -125,7 +125,7 @@ class Active extends BaseUsers
 	private function processGetActions(): void
 	{
 		$action = (string) ($this->parameters['action'] ?? '');
-		$uid = (int) ($this->parameters['uid'] ?? 0);
+		$uid    = (int) ($this->parameters['uid'] ?? 0);
 
 		if ($uid === 0) {
 			return;
@@ -150,6 +150,7 @@ class Active extends BaseUsers
 				}
 
 				$this->baseUrl->redirect('moderation/users/active');
+				// no break
 			case 'block':
 				self::checkFormSecurityTokenRedirectOnError('moderation/users/active', 'moderation_users_active', 't');
 				User::block($uid);
diff --git a/src/Module/Moderation/Users/Blocked.php b/src/Module/Moderation/Users/Blocked.php
index 3c2577f7f0..04230dbd8a 100644
--- a/src/Module/Moderation/Users/Blocked.php
+++ b/src/Module/Moderation/Users/Blocked.php
@@ -124,7 +124,7 @@ class Blocked extends BaseUsers
 	private function processGetActions(): void
 	{
 		$action = (string) ($this->parameters['action'] ?? '');
-		$uid = (int) ($this->parameters['uid'] ?? 0);
+		$uid    = (int) ($this->parameters['uid'] ?? 0);
 
 		if ($uid === 0) {
 			return;
@@ -148,6 +148,7 @@ class Blocked extends BaseUsers
 					$this->systemMessages->addNotice($this->t('You can\'t remove yourself'));
 				}
 				$this->baseUrl->redirect('moderation/users/blocked');
+				// no break
 			case 'unblock':
 				self::checkFormSecurityTokenRedirectOnError('/moderation/users/blocked', 'moderation_users_blocked', 't');
 				User::block($uid, false);
diff --git a/src/Module/Moderation/Users/Index.php b/src/Module/Moderation/Users/Index.php
index 26d71efd60..6162e7b58f 100644
--- a/src/Module/Moderation/Users/Index.php
+++ b/src/Module/Moderation/Users/Index.php
@@ -136,7 +136,7 @@ class Index extends BaseUsers
 	private function processGetActions(): void
 	{
 		$action = (string) ($this->parameters['action'] ?? '');
-		$uid = (int) ($this->parameters['uid'] ?? 0);
+		$uid    = (int) ($this->parameters['uid'] ?? 0);
 
 		if ($uid === 0) {
 			return;
@@ -161,11 +161,13 @@ class Index extends BaseUsers
 				}
 
 				$this->baseUrl->redirect('moderation/users');
+				// no break
 			case 'block':
 				self::checkFormSecurityTokenRedirectOnError('moderation/users', 'moderation_users', 't');
 				User::block($uid);
 				$this->systemMessages->addNotice($this->t('User "%s" blocked', $user['username']));
 				$this->baseUrl->redirect('moderation/users');
+				// no break
 			case 'unblock':
 				self::checkFormSecurityTokenRedirectOnError('moderation/users', 'moderation_users', 't');
 				User::block($uid, false);