Run inspections and clean-up.

Author: sheabunge

src/php/admin-menus/class-settings-menu.php

@@ -2,7 +2,6 @@
 
 namespace Code_Snippets;
 
-use WP_Error;
 use const Code_Snippets\Settings\CACHE_KEY;
 use const Code_Snippets\Settings\OPTION_GROUP;
 use const Code_Snippets\Settings\OPTION_NAME;

src/php/admin-menus/class-welcome-menu.php

@@ -2,9 +2,6 @@
 
 namespace Code_Snippets;
 
-use Code_Snippets\Cloud\Cloud_Search_List_Table;
-use function Code_Snippets\Settings\get_setting;
-
 /**
  * This class handles the welcome menu.
  *

src/php/class-contextual-help.php

@@ -44,8 +44,18 @@ public function __construct( string $screen_name ) {
 	public function load() {
 		$this->screen = get_current_screen();
 
-		if ( method_exists( $this, "load_{$this->screen_name}_help" ) ) {
-			call_user_func( array( $this, "load_{$this->screen_name}_help" ) );
+		switch ( $this->screen_name ) {
+			case 'manage':
+				$this->load_manage_help();
+				break;
+
+			case 'edit':
+				$this->load_edit_help();
+				break;
+
+			case 'import':
+				$this->load_import_help();
+				break;
 		}
 
 		$this->load_help_sidebar();

src/php/class-data-item.php

@@ -96,15 +96,13 @@ public function get_fields(): array {
 	 * @return array<string, mixed>
 	 */
 	public function get_modified_fields(): array {
-		$modified_fields = [];
-
-		foreach ( $this->get_fields() as $field => $value ) {
-			if ( $value && $value !== $this->default_values[ $field ] ) {
-				$modified_fields[ $field ] = $value;
-			}
-		}
-
-		return $modified_fields;
+		return array_filter(
+			$this->get_fields(),
+			function ( $value, $field ) {
+				return $value && $value !== $this->default_values[ $field ];
+			},
+			ARRAY_FILTER_USE_BOTH
+		);
 	}
 
 	/**

src/php/class-list-table.php

@@ -666,11 +666,10 @@ public static function required_form_fields( string $context = 'main' ) {
 	 *
 	 * @param int    $id     Snippet ID.
 	 * @param string $action Action to perform.
-	 * @param string $scope  Snippet scope; used for cache busting CSS and JS snippets.
 	 *
 	 * @return bool|string Result of performing action
 	 */
-	private function perform_action( int $id, string $action, string $scope = '' ) {
+	private function perform_action( int $id, string $action ) {
 		switch ( $action ) {
 
 			case 'activate':
@@ -880,7 +879,13 @@ public function no_items() {
 	 * @return void
 	 */
 	private function fetch_shared_network_snippets() {
+		/**
+		 * Table data.
+		 *
+		 * @var $snippets array<string, Snippet[]>
+		 */
 		global $snippets;
+
 		$ids = get_site_option( 'shared_network_snippets' );
 
 		if ( ! is_multisite() || ! $ids ) {
@@ -891,7 +896,6 @@ private function fetch_shared_network_snippets() {
 			$limit = count( $snippets['all'] );
 
 			for ( $i = 0; $i < $limit; $i++ ) {
-				/** Snippet @var Snippet $snippet */
 				$snippet = &$snippets['all'][ $i ];
 
 				if ( in_array( $snippet->id, $ids, true ) ) {
@@ -1014,10 +1018,12 @@ function ( Snippet $snippet ) use ( $type ) {
 		}
 
 		// Count the totals for each section.
-		$totals = array();
-		foreach ( $snippets as $type => $list ) {
-			$totals[ $type ] = count( $list );
-		}
+		$totals = array_map(
+			function ( $list ) {
+				return count( $list );
+			},
+			$snippets
+		);
 
 		// If the current status is empty, default to all.
 		if ( empty( $snippets[ $status ] ) ) {

src/php/class-upgrade.php

@@ -216,12 +216,11 @@ private function get_sample_content(): array {
 			),
 		);
 
-		$snippets = array();
-
-		foreach ( $snippets_data as $sample_name => $snippet_data ) {
-			$snippets[ $sample_name ] = new Snippet( $snippet_data );
-		}
-
-		return $snippets;
+		return array_map(
+			function ( $snippet_data ) {
+				return new Snippet( $snippet_data );
+			},
+			$snippets_data
+		);
 	}
 }

src/php/cloud/class-cloud-api.php

@@ -4,7 +4,6 @@
 
 use Code_Snippets\Snippet;
 use WP_Error;
-use function Code_Snippets\code_snippets;
 use function Code_Snippets\get_snippet_by_cloud_id;
 use function Code_Snippets\get_snippets;
 use function Code_Snippets\save_snippet;
@@ -70,43 +69,6 @@ public static function get_cloud_api_url(): string {
 			: self::get_cloud_url() . 'api/v1/';
 	}
 
-	/**
-	 * Retrieve cloud settings.
-	 *
-	 * @return array
-	 */
-	private static function get_cloud_settings(): array {
-		static $settings = null;
-
-		if ( ! is_null( $settings ) ) {
-			return $settings;
-		}
-
-		$settings = wp_cache_get( self::CLOUD_SETTINGS_CACHE_KEY );
-		if ( $settings ) {
-			return $settings;
-		}
-
-		$settings = get_option( self::CLOUD_SETTINGS_CACHE_KEY );
-
-		// Check if the settings exist in the database if not create defaults.
-		if ( false === $settings ) {
-			$settings = [
-				'cloud_token'    => '',
-				'local_token'    => '',
-				'token_verified' => false,
-				'code_verifier'  => '',
-				'code_challenge' => '',
-				'state'          => '',
-			];
-
-			update_option( self::CLOUD_SETTINGS_CACHE_KEY, $settings );
-		}
-
-		wp_cache_set( self::CLOUD_SETTINGS_CACHE_KEY, $settings );
-		return $settings;
-	}
-
 	/**
 	 * Retrieve the cloud local token.
 	 *
@@ -335,6 +297,8 @@ public static function get_cloud_snippet_revision( string $cloud_id ): ?string {
 	 * @param string     $action   The action to be performed: 'download' or 'update'.
 	 *
 	 * @return array<string, string|bool> Result of operation: an array with `success` and `error_message` keys.
+	 *
+	 * @noinspection PhpUnusedParameterInspection
 	 */
 	public function download_or_update_snippet( int $cloud_id, string $source, string $action ): array {
 		$cloud_id = intval( $cloud_id );

src/php/cloud/class-cloud-search-list-table.php

@@ -41,7 +41,11 @@ class Cloud_Search_List_Table extends WP_Plugin_Install_List_Table {
 	 * Class constructor.
 	 */
 	public function __construct() {
-		// Declare global variable due to undeclared warning.
+		/**
+		 * Declare global variable due to undeclared warning.
+		 *
+		 * @noinspection PhpUnusedLocalVariableInspection
+		 */
 		global $tab;
 
 		parent::__construct(

src/php/settings/settings-fields.php

@@ -8,8 +8,6 @@
 
 namespace Code_Snippets\Settings;
 
-use function Code_Snippets\code_snippets;
-
 /**
  * Retrieve the default setting values
  *
@@ -211,8 +209,8 @@ function get_settings_fields(): array {
 			'default'    => true,
 			'codemirror' => 'styleActiveLine',
 		],
-		
-		'keymap'                => [
+
+		'keymap' => [
 			'name'       => __( 'Keymap', 'code-snippets' ),
 			'type'       => 'select',
 			'desc'       => __( 'The set of keyboard shortcuts to use in the code editor.', 'code-snippets' ),
@@ -232,7 +230,7 @@ function get_settings_fields(): array {
 			'default'    => 'default',
 			'options'    => get_editor_theme_list(),
 			'codemirror' => 'theme',
-		],		
+		],
 	];
 
 	$fields = apply_filters( 'code_snippets_settings_fields', $fields );

src/php/settings/settings.php

@@ -9,7 +9,6 @@
 namespace Code_Snippets\Settings;
 
 use Code_Snippets\Welcome_API;
-use Code_Snippets\Welcome_Menu;
 use function Code_Snippets\clean_snippets_cache;
 use function Code_Snippets\code_snippets;