Fix/con 530 phpcs

constant-contact-forms.php

@@ -45,7 +45,7 @@
  * @param string $class_name Name of the class being requested.
  * @return null
  */
-function constant_contact_autoload_classes( string $class_name ) {
+function constant_contact_autoload_classes( string $class_name ): null {
 	if ( ! str_starts_with( $class_name, 'ConstantContact_' ) ) {
 		return null;
 	}
@@ -114,6 +114,8 @@ class Constant_Contact {
 	/**
 	 * Singleton instance of plugin.
 	 *
+	 * @todo Leave off the class delcaration. It's causing fatal errors.
+	 *
 	 * @since 1.0.0
 	 * @var Constant_Contact
 	 */
@@ -590,11 +592,19 @@ public function ajax_save_clear_first_form() {
 	public function __get( $field ) {
 		return match ( $field ) {
 			'version' => self::VERSION,
-			'basename', 'path', 'url' => $this->$field,
 			default => throw new Exception( 'Invalid ' . __CLASS__ . ' property: ' . $field ),
 		};
 	}
 
+	/**
+	 * Basename getter
+	 * @since NEXT
+	 * @return string
+	 */
+	public function get_basename(): string {
+		return $this->basename;
+	}
+
 	/**
 	 * Admin getter
 	 * @since 2.11.0

includes/class-admin-pages.php

@@ -21,17 +21,19 @@ class ConstantContact_Admin_Pages {
 	 * Parent plugin class.
 	 *
 	 * @since 1.0.0
-	 * @var object
+	 *
+	 * @var Constant_Contact
 	 */
-	protected $plugin;
+	protected Constant_Contact $plugin;
 
 	/**
 	 * Constructor.
 	 *
 	 * @since 1.0.0
-	 * @param object $plugin Plugin parent.
+	 *
+	 * @param Constant_Contact $plugin Plugin parent.
 	 */
-	public function __construct( $plugin ) {
+	public function __construct( Constant_Contact $plugin ) {
 		$this->plugin = $plugin;
 		$this->hooks();
 	}
@@ -41,7 +43,7 @@ public function __construct( $plugin ) {
 	 *
 	 * @since 1.0.0
 	 */
-	public function hooks() {
+	public function hooks(): void {
 		add_action( 'admin_enqueue_scripts', [ $this, 'styles' ] );
 	}
 
@@ -50,7 +52,7 @@ public function hooks() {
 	 *
 	 * @since 1.0.0
 	 */
-	public function styles() {
+	public function styles(): void {
 		wp_enqueue_style( 'constant-contact-forms-admin' );
 		wp_enqueue_script( 'ctct_form' );
 	}
@@ -60,7 +62,7 @@ public function styles() {
 	 *
 	 * @since 1.0.0
 	 */
-	public function about_page() {
+	public function about_page(): void {
 
 		$auth_link = '';
 		$new_link  = '';
@@ -139,8 +141,8 @@ public function about_page() {
 
 				<div class="ctct-section">
 					<div class="ctct-button-actions">
-						<a href="post-new.php?post_type=ctct_forms" class="button button-primary"><?php esc_html_e( 'Add contact form', 'constant-contact-forms' ); ?></a>
-						<a href="edit.php?post_type=ctct_lists" class="button"><?php esc_html_e( 'View lists', 'constant-contact-forms' ); ?></a>
+						<a href="<?php echo esc_url( admin_url( 'post-new.php?post_type=ctct_forms' ) ); ?>" class="button button-primary"><?php esc_html_e( 'Add contact form', 'constant-contact-forms' ); ?></a>
+						<a href="<?php echo esc_url( admin_url( 'edit.php?post_type=ctct_lists' ) ); ?>" class="button"><?php esc_html_e( 'View lists', 'constant-contact-forms' ); ?></a>
 					</div>
 				</div>
 
@@ -170,7 +172,7 @@ public function about_page() {
 	 *
 	 * @since 1.0.1
 	 */
-	public function license_page() {
+	public function license_page(): void {
 		$license_text = $this->plugin->get_license_text();
 		?>
 		<h2><?php esc_attr_e( 'Constant Contact Forms - License', 'constant-contact-forms' ); ?></h2>

includes/class-admin.php

@@ -55,15 +55,15 @@ class ConstantContact_Admin {
 	 * @since 1.0.0
 	 * @var object
 	 */
-	protected $plugin;
+	protected Constant_Contact $plugin;
 
 	/**
 	 * Parent plugin class.
 	 *
 	 * @since 1.0.0
 	 * @var object
 	 */
-	protected $basename;
+	protected string $basename;
 
 	/**
 	 * The parent menu page slug.
@@ -92,7 +92,7 @@ public function __construct( Constant_Contact $plugin, string $basename ) {
 	 *
 	 * @since 1.0.0
 	 */
-	public function hooks() {
+	public function hooks(): void {
 
 		add_action( 'current_screen', [ $this, 'current_screen' ] );
 		add_action( 'admin_init', [ $this, 'init' ] );
@@ -104,7 +104,7 @@ public function hooks() {
 		add_filter( 'manage_ctct_lists_posts_columns', [ $this, 'set_custom_lists_columns' ] );
 		add_action( 'manage_ctct_lists_posts_custom_column', [ $this, 'custom_lists_columns' ], 10, 2 );
 
-		add_filter( 'plugin_action_links_' . $this->basename, [ $this, 'add_social_links' ] );
+		add_filter( 'plugin_action_links_' . $this->basename, [ $this, 'add_custom_links' ] );
 
 		add_action( 'admin_enqueue_scripts', [ $this, 'scripts' ] );
 	}
@@ -117,7 +117,7 @@ public function hooks() {
 	 * @since 1.11.0
 	 * @author Darren Cooney <darren.cooney@webdevstudios.com>
 	 */
-	public function current_screen( WP_Screen $screen ) {
+	public function current_screen( WP_Screen $screen ): void {
 		if ( constant_contact()->is_constant_contact() ) {
 			add_action( 'in_admin_header', [ $this, 'admin_page_toolbar' ] );
 		}
@@ -131,7 +131,7 @@ public function current_screen( WP_Screen $screen ) {
 	 * @since 1.11.0
 	 * @author Darren Cooney <darren.cooney@webdevstudios.com>
 	 */
-	public function admin_page_toolbar() {
+	public function admin_page_toolbar(): void {
 
 		global $submenu, $submenu_file, $plugin_page;
 
@@ -215,7 +215,7 @@ public function admin_page_toolbar() {
 					echo wp_kses( '</ul>', [ 'ul' => [] ] );
 				}
 				?>
-				<a href="edit.php?post_type=ctct_forms&page=ctct_options_connect" class="ctct-status ctct-<?php echo esc_attr( $api_status ); ?>" title="<?php echo esc_attr( $connect_alt ); ?>">
+				<a href="<?php echo esc_url( admin_url( 'edit.php?post_type=ctct_forms&page=ctct_options_connect' ) ); ?>" class="ctct-status ctct-<?php echo esc_attr( $api_status ); ?>" title="<?php echo esc_attr( $connect_alt ); ?>">
 					<?php echo esc_html( $connect_title ); ?>
 				</a>
 			</div>
@@ -227,7 +227,7 @@ public function admin_page_toolbar() {
 	 *
 	 * @since 1.0.0
 	 */
-	public function init() {
+	public function init(): void {
 		register_setting( $this->key, $this->key );
 	}
 
@@ -236,7 +236,7 @@ public function init() {
 	 *
 	 * @since 1.0.0
 	 */
-	public function add_options_page() {
+	public function add_options_page(): void {
 
 		add_submenu_page(
 			$this->parent_menu_slug,
@@ -270,7 +270,7 @@ public function add_options_page() {
 	 *
 	 * @since 1.0.0
 	 */
-	public function admin_page_display() {
+	public function admin_page_display(): void {
 
 		/**
 		 * Fires before the Constant Contact admin page display.
@@ -321,12 +321,12 @@ public function admin_page_display() {
 	 *
 	 * @since 1.0.0
 	 *
-	 * @throws Exception Throws an exception if the field is invalid.
-	 *
 	 * @param string $field Field to retrieve.
-	 * @return mixed Field value or exception is thrown.
+	 *
+	 * @return mixed     Field value or exception is thrown.
+	 * @throws Exception Throws an exception if the field is invalid.
 	 */
-	public function __get( $field ) {
+	public function __get( string $field ) {
 
 		$field = esc_attr( $field );
 
@@ -370,7 +370,7 @@ public function set_custom_columns( array $columns ) : array {
 	 *
 	 * @return void
 	 */
-	public function custom_columns( string $column, int $post_id ) {
+	public function custom_columns( string $column, int $post_id ): void {
 		$post_id = absint( $post_id );
 
 		if ( ! $post_id ) {
@@ -511,7 +511,7 @@ public function set_custom_lists_columns( array $columns ) : array {
 	 *
 	 * @return void
 	 */
-	public function custom_lists_columns( string $column, int $post_id ) {
+	public function custom_lists_columns( string $column, int $post_id ): void {
 
 		$post_id = absint( $post_id );
 
@@ -544,11 +544,7 @@ public function custom_lists_columns( string $column, int $post_id ) {
 	 *
 	 * @return array
 	 */
-	public function add_social_links( $links ): array {
-
-		if ( ! is_array( $links ) ) {
-			return $links;
-		}
+	public function add_custom_links( array $links ): array {
 
 		$add_links[] = $this->get_admin_link( esc_html__( 'Settings', 'constant-contact-forms' ), 'settings_general' );
 
@@ -608,7 +604,7 @@ public function get_admin_link( string $text, string $link_slug = '', $add_form
 	 * @param array $extra_localizations Optional. An array of arrays of `[ $handle, $name, $data ]` passed to wp_localize_script.
 	 * @return void
 	 */
-	public function scripts( $extra_localizations = [] ) {
+	public function scripts( $extra_localizations = [] ): void {
 
 		global $pagenow;
 
@@ -662,9 +658,6 @@ public function scripts( $extra_localizations = [] ) {
 			wp_enqueue_script( 'ctct_form' );
 		}
 
-		$current_screen = get_current_screen();
-		$is_block       = is_object( $current_screen ) ? $current_screen->is_block_editor : true;
-
 		/**
 		 * Filters the allowed pages to enqueue the ctct_form script on.
 		 *
@@ -721,15 +714,3 @@ public function get_associated_list_by_id( string $list_id ) {
 		return [];
 	}
 }
-
-/**
- * Wrapper function around cmb2_get_option.
- *
- * @since 1.0.0
- *
- * @param string $key Options array key.
- * @return mixed Option value.
- */
-function constantcontact_get_option( $key = '' ) {
-	return cmb2_get_option( constant_contact()->get_admin()->key, $key );
-}

includes/class-api-utility.php

@@ -172,7 +172,7 @@ public function obfuscate_api_data_item( string $data_item ): string {
 	 * @param string $access_token
 	 * @return array
 	 */
-	public function parse_access_token_data( string $access_token ) {
+	public function parse_access_token_data( string $access_token ): array {
 		if ( empty( $access_token ) ) {
 			return [];
 		}