Fixed some suppressed psalm errors.

colinmurphy · colinmurphy · commit 0128d2c9643f · 2025-10-31T14:24:27.000Z
diff --git a/plugins/wpgraphql-logging/src/Admin/Settings/Fields/Field/AbstractSettingsField.php b/plugins/wpgraphql-logging/src/Admin/Settings/Fields/Field/AbstractSettingsField.php
@@ -57,29 +57,36 @@ public function should_render_for_tab( string $tab_key ): bool {
 	 * @param string               $section The section ID.
 	 * @param string               $page    The page URI.
 	 * @param array<string, mixed> $args    The field arguments.
+	 *
+	 * @psalm-suppress InvalidArgument
 	 */
 	public function add_settings_field( string $section, string $page, array $args ): void {
+		$args['class'] = $this->css_class;
 		add_settings_field(
 			$this->get_id(),
 			$this->title,
 			[ $this, 'render_field_callback' ],
 			$page,
 			$section,
-			[
-				'class' => $this->css_class,
-			]
+			$args
 		);
 	}
 
 	/**
 	 * Callback function to render the field.
 	 *
 	 * @param array<string, mixed> $args The field arguments.
+	 *
+	 * @throws \Exception If the tab key or settings key is empty.
 	 */
 	public function render_field_callback( array $args ): void {
 		$tab_key      = (string) ( $args['tab_key'] ?? '' );
 		$settings_key = (string) ( $args['settings_key'] ?? '' );
 
+		if ( '' === $tab_key || '' === $settings_key ) {
+			throw new \Exception( 'Tab key or settings key is empty' );
+		}
+
 		$config_helper = ConfigurationHelper::get_instance();
 		$option_value  = $config_helper->get_config();
 
diff --git a/plugins/wpgraphql-logging/src/Admin/Settings/Menu/MenuPage.php b/plugins/wpgraphql-logging/src/Admin/Settings/Menu/MenuPage.php
@@ -103,7 +103,6 @@ public function registration_callback(): void {
 			set_query_var( $query_var, $args );
 		}
 
-        // phpcs:ignore WordPressVIPMinimum.Files.IncludingFile.UsingVariable -- $this->template is validated and defined within the class
-		include_once $this->template;
+		include_once $this->template; // @phpcs:ignore WordPressVIPMinimum.Files.IncludingFile.UsingVariable
 	}
 }
diff --git a/plugins/wpgraphql-logging/src/Admin/View/Download/DownloadLogService.php b/plugins/wpgraphql-logging/src/Admin/View/Download/DownloadLogService.php
@@ -56,7 +56,7 @@ public function generate_csv( int $log_id ): void {
 		if ( ! is_resource( $output ) ) {
 			wp_die( esc_html__( 'Failed to create CSV output.', 'wpgraphql-logging' ) );
 		}
-		$writer = Writer::createFromStream( $output );
+		$writer = Writer::from( $output );
 
 		$headers = $this->get_headers( $log );
 		$content = $this->get_content( $log );
diff --git a/plugins/wpgraphql-logging/src/Admin/View/List/ListTable.php b/plugins/wpgraphql-logging/src/Admin/View/List/ListTable.php
@@ -76,7 +76,7 @@ public function prepare_items(): void {
 
 		$per_page     = $this->get_items_per_page( 'logs_per_page', self::DEFAULT_PER_PAGE );
 		$current_page = $this->get_pagenum();
-		$request      = $_REQUEST ?? [];
+		$request      = ( ! empty( $_REQUEST ) ? $_REQUEST : [] );
 		$where        = $this->process_where( $request );
 		$total_items  = $this->log_service->count_entities_by_where( $where );
 
@@ -135,17 +135,15 @@ public function process_bulk_action(): void {
 		$nonce_action = 'bulk-' . esc_attr( $this->_args['plural'] );
 		$nonce_value  = isset( $_REQUEST['_wpnonce'] ) && is_string( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['_wpnonce'] ) ) : '';
 
-		$nonce = is_string( $nonce_value ) ? $nonce_value : '';
-
-		$nonce_result = wp_verify_nonce( $nonce, $nonce_action );
+		$nonce_result = wp_verify_nonce( $nonce_value, $nonce_action );
 		if ( false === $nonce_result ) {
 			wp_die( esc_html__( 'Nonce verification failed!', 'wpgraphql-logging' ) );
 		}
 
 		$deleted_count = 0;
 
 		// WordPress sometimes sends 'delete' for selected items.
-		if ( in_array( $action, [ 'delete', 'bulk_delete' ], true ) && ! empty( $_REQUEST['log'] ) ) {
+		if ( in_array( $action, [ 'delete', 'bulk_delete' ], true ) && isset( $_REQUEST['log'] ) && '' !== $_REQUEST['log'] ) {
 			$ids = array_map( 'absint', (array) $_REQUEST['log'] );
 			// Remove redundant empty check since array_map always returns array.
 			foreach ( $ids as $id ) {
@@ -171,7 +169,7 @@ public function process_bulk_action(): void {
 
 		foreach ( $filter_keys as $key ) {
 			$value = isset( $_REQUEST[ $key ] ) && is_string( $_REQUEST[ $key ] ) ? sanitize_text_field( wp_unslash( $_REQUEST[ $key ] ) ) : null;
-			if ( ! empty( $value ) ) {
+			if ( null !== $value && '' !== $value ) {
 				$preserved_filters[ $key ] = $value;
 			}
 		}
@@ -394,7 +392,7 @@ public function get_memory_usage(WordPressDatabaseEntity $item): string {
 	public function get_request_headers(WordPressDatabaseEntity $item): string {
 		$extra           = $item->get_extra();
 		$request_headers = $extra['request_headers'] ?? [];
-		if ( empty( $request_headers ) || ! is_array( $request_headers ) ) {
+		if ( ! is_array( $request_headers ) ) {
 			return '';
 		}
 
diff --git a/plugins/wpgraphql-logging/src/Admin/ViewLogsPage.php b/plugins/wpgraphql-logging/src/Admin/ViewLogsPage.php
@@ -245,11 +245,7 @@ protected function get_post_value(string $key): ?string {
 		if ( ! is_string( $value ) || '' === $value ) {
 			return null;
 		}
-		$value = wp_unslash( $value );
-		if ( ! is_string( $value ) ) {
-			return null;
-		}
-		return sanitize_text_field( $value );
+		return sanitize_text_field( wp_unslash( $value ) );
 	}
 
 	/**
diff --git a/plugins/wpgraphql-logging/src/Events/QueryActionLogger.php b/plugins/wpgraphql-logging/src/Events/QueryActionLogger.php
@@ -89,9 +89,9 @@ public function log_pre_request( ?string $query, ?string $operation_name, ?array
 	 */
 	public function log_graphql_before_execute( Request $request ): void {
 		try {
-			/** @var \GraphQL\Server\OperationParams $params */
+			/** @var \GraphQL\Server\OperationParams|null $params */
 			$params = $request->params;
-			if ( null === $params || ! \is_object( $params ) ) {
+			if ( ! is_object( $params ) ) {
 				return;
 			}
 			$query = $params->query;
diff --git a/plugins/wpgraphql-logging/src/Logger/Database/WordPressDatabaseEntity.php b/plugins/wpgraphql-logging/src/Logger/Database/WordPressDatabaseEntity.php
@@ -197,12 +197,12 @@ public function get_query(): ?string {
 		}
 
 		$request = $context['request'] ?? null;
-		if ( empty( $request ) || ! is_array( $request ) ) {
+		if ( ! is_array( $request ) ) {
 			return $query;
 		}
 
 		$params = $request['params'] ?? null;
-		if ( empty( $params ) || ! is_array( $params ) ) {
+		if ( ! is_array( $params ) ) {
 			return $query;
 		}
 
diff --git a/plugins/wpgraphql-logging/src/Logger/Database/WordPressDatabaseLogService.php b/plugins/wpgraphql-logging/src/Logger/Database/WordPressDatabaseLogService.php
@@ -242,7 +242,7 @@ protected function prepare_sql(string $sql, array $where_conditions): string {
 		$safe_operators  = $this->get_safe_operators();
 		$allowed_columns = $this->get_allowed_columns();
 		foreach ( $where_conditions as $column => $condition ) {
-			if ( ! is_array( $condition ) || ! isset( $condition['column'] ) || ! isset( $condition['value'] ) || ! isset( $condition['operator'] ) ) {
+			if ( ! isset( $condition['column'] ) || ! isset( $condition['value'] ) || ! isset( $condition['operator'] ) ) {
 				continue;
 			}
 
diff --git a/plugins/wpgraphql-logging/src/Logger/Handlers/WordPressDatabaseHandler.php b/plugins/wpgraphql-logging/src/Logger/Handlers/WordPressDatabaseHandler.php
@@ -34,8 +34,8 @@ protected function write( LogRecord $record ): void {
 				$level->value,
 				$level->name,
 				$record->message,
-				$record->context ?? [],
-				$record->extra ?? []
+				$record->context,
+				$record->extra
 			);
 		} catch ( Throwable $e ) {
 			do_action( 'wpgraphql_logging_write_database_error', $e, $record );
diff --git a/plugins/wpgraphql-logging/src/Logger/Processors/DataSanitizationProcessor.php b/plugins/wpgraphql-logging/src/Logger/Processors/DataSanitizationProcessor.php
@@ -90,7 +90,7 @@ protected function get_custom_rules(): array {
 		];
 
 		foreach ( $fields as $action => $field_string ) {
-			if ( empty( $field_string ) || ! is_string( $field_string ) ) {
+			if ( ! is_string( $field_string ) || '' === trim( $field_string ) ) {
 				continue;
 			}
 
@@ -124,7 +124,7 @@ protected function apply_rule(array &$data, string $key, string $rule): void {
 
 		$keys     = explode( '.', $key );
 		$last_key = array_pop( $keys );
-		$current  = &$this->navigate_to_parent( $data, $keys );
+		$current  = $this->navigate_to_parent( $data, $keys );
 
 		if ( null === $current || ! array_key_exists( $last_key, $current ) ) {
 			return;
diff --git a/plugins/wpgraphql-logging/src/Logger/Processors/RequestHeadersProcessor.php b/plugins/wpgraphql-logging/src/Logger/Processors/RequestHeadersProcessor.php
@@ -29,7 +29,7 @@ private function get_headers(): array {
 			}
 			$header_key             = substr( $key, 5 );
 			$header_key             = str_replace( '_', '-', $header_key );
-			$header_key             = ucwords( strtolower( sanitize_text_field( (string) $header_key ) ), '-' );
+			$header_key             = ucwords( strtolower( sanitize_text_field( $header_key ) ), '-' );
 			$headers[ $header_key ] = sanitize_text_field( $value );
 		}
 
diff --git a/plugins/wpgraphql-logging/src/Logger/Rules/IpRestrictionsRule.php b/plugins/wpgraphql-logging/src/Logger/Rules/IpRestrictionsRule.php
@@ -25,9 +25,10 @@ class IpRestrictionsRule implements LoggingRuleInterface {
 	public function passes(array $config, ?string $query_string = null): bool {
 
 		$ip_restrictions = $config[ BasicConfigurationTab::IP_RESTRICTIONS ] ?? '';
-		if ( empty( $ip_restrictions ) ) {
+		if ( ! is_string( $ip_restrictions ) || '' === trim( $ip_restrictions ) ) {
 			return true;
 		}
+
 		$allowed_ips = array_map( 'trim', explode( ',', $ip_restrictions ) );
 		if ( ! isset( $_SERVER['REMOTE_ADDR'] ) ) { // @phpcs:ignore WordPressVIPMinimum.Variables.ServerVariables.UserControlledHeaders
 			return false;

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,6 @@ public function registration_callback(): void {`
`103`	`103`	`set_query_var( $query_var, $args );`
`104`	`104`	`}`
`105`	`105`
`106`		`- // phpcs:ignore WordPressVIPMinimum.Files.IncludingFile.UsingVariable -- $this->template is validated and defined within the class`
`107`		`- include_once $this->template;`
	`106`	`+ include_once $this->template; // @phpcs:ignore WordPressVIPMinimum.Files.IncludingFile.UsingVariable`
`108`	`107`	`}`
`109`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function generate_csv( int $log_id ): void {`
`56`	`56`	`if ( ! is_resource( $output ) ) {`
`57`	`57`	`wp_die( esc_html__( 'Failed to create CSV output.', 'wpgraphql-logging' ) );`
`58`	`58`	`}`
`59`		`- $writer = Writer::createFromStream( $output );`
	`59`	`+ $writer = Writer::from( $output );`
`60`	`60`
`61`	`61`	`$headers = $this->get_headers( $log );`
`62`	`62`	`$content = $this->get_content( $log );`
Original file line number	Diff line number	Diff line change
`@@ -245,11 +245,7 @@ protected function get_post_value(string $key): ?string {`
`245`	`245`	`if ( ! is_string( $value ) \|\| '' === $value ) {`
`246`	`246`	`return null;`
`247`	`247`	`}`
`248`		`- $value = wp_unslash( $value );`
`249`		`- if ( ! is_string( $value ) ) {`
`250`		`- return null;`
`251`		`- }`
`252`		`- return sanitize_text_field( $value );`
	`248`	`+ return sanitize_text_field( wp_unslash( $value ) );`
`253`	`249`	`}`
`254`	`250`
`255`	`251`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -197,12 +197,12 @@ public function get_query(): ?string {`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`$request = $context['request'] ?? null;`
`200`		`- if ( empty( $request ) \|\| ! is_array( $request ) ) {`
	`200`	`+ if ( ! is_array( $request ) ) {`
`201`	`201`	`return $query;`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`$params = $request['params'] ?? null;`
`205`		`- if ( empty( $params ) \|\| ! is_array( $params ) ) {`
	`205`	`+ if ( ! is_array( $params ) ) {`
`206`	`206`	`return $query;`
`207`	`207`	`}`
`208`	`208`
Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ protected function prepare_sql(string $sql, array $where_conditions): string {`
`242`	`242`	`$safe_operators = $this->get_safe_operators();`
`243`	`243`	`$allowed_columns = $this->get_allowed_columns();`
`244`	`244`	`foreach ( $where_conditions as $column => $condition ) {`
`245`		`- if ( ! is_array( $condition ) \|\| ! isset( $condition['column'] ) \|\| ! isset( $condition['value'] ) \|\| ! isset( $condition['operator'] ) ) {`
	`245`	`+ if ( ! isset( $condition['column'] ) \|\| ! isset( $condition['value'] ) \|\| ! isset( $condition['operator'] ) ) {`
`246`	`246`	`continue;`
`247`	`247`	`}`
`248`	`248`