From b64e97776dc48aed6a54e14a89b575956778869a Mon Sep 17 00:00:00 2001
From: Andy Fragen <andy@thefragens.com>
Date: Thu, 17 Jul 2025 15:43:38 -0700
Subject: [PATCH] Fix code standards issues (#171)

Signed-off-by: Andy Fragen <andy@thefragens.com>
---
 inc/settings/namespace.php | 5 ++---
 inc/upgrades/namespace.php | 4 ++--
 phpcs.xml.dist             | 4 ++++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/inc/settings/namespace.php b/inc/settings/namespace.php
index 4fb883b..d7561db 100644
--- a/inc/settings/namespace.php
+++ b/inc/settings/namespace.php
@@ -8,7 +8,6 @@
 namespace FAIR\Settings;
 
 use const FAIR\Avatars\AVATAR_SRC_SETTING_KEY;
-/* phpcs:disable Squiz.PHP.EmbeddedPhp.ContentBeforeOpen, Squiz.PHP.EmbeddedPhp.ContentAfterOpen, Squiz.PHP.EmbeddedPhp.ContentBeforeEnd */
 
 /**
  * Bootstrap.
@@ -89,9 +88,9 @@ function save_multisite_avatar_settings() {
  *
  * @param  array $args  The args passed from the `add_settings_field` call or our own.
  *
- * @return HTML
+ * @return void
  */
-function site_avatar_source_field( $args ) {
+function site_avatar_source_field( $args ) : void {
 
 	// The rest of the table markup is there, so begin with the select.
 	echo '<select id="' . esc_attr( $args['field_id'] ) . '" name="' . esc_attr( $args['field_name'] ) . '" aria-describedby="fair-avatar-source-description">';
diff --git a/inc/upgrades/namespace.php b/inc/upgrades/namespace.php
index fcf7183..1af8d3b 100644
--- a/inc/upgrades/namespace.php
+++ b/inc/upgrades/namespace.php
@@ -7,9 +7,9 @@
 
 namespace FAIR\Upgrades;
 
-use const FAIR\VERSION;
-use const FAIR\PLUGIN_FILE;
 use const FAIR\Avatars\AVATAR_SRC_SETTING_KEY;
+use const FAIR\PLUGIN_FILE;
+use const FAIR\VERSION;
 
 /**
  * Bootstrap.
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 19b7a08..8b6bfb5 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -74,4 +74,8 @@
 		<exclude-pattern>inc/icons/svg\.php</exclude-pattern>
 		<exclude-pattern>tests/phpunit/bootstrap\.php</exclude-pattern>
 	</rule>
+
+	<rule ref="Squiz.PHP.EmbeddedPhp">
+		<exclude-pattern>inc/settings/namespace\.php</exclude-pattern>
+	</rule>
 </ruleset>