Skip to content

Feature/con 507 code review updates redo #822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tw2113 merged 7 commits into from
Apr 13, 2026
Merged

Feature/con 507 code review updates redo #822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cf78ad4
re-merge API utility updates so far
tw2113 Mar 19, 2026
be195e6
handle api class and moved previous methods
tw2113 Mar 19, 2026
b1edcc8
move previously deprecated function to appropriate file
tw2113 Mar 19, 2026
2b1d4da
misc phpcs
tw2113 Mar 19, 2026
c513a2d
re-merge method order reorganization
tw2113 Mar 19, 2026
fbf6448
fix up changes from other merged PRs
tw2113 Apr 13, 2026
8e8a2d2
Merge branch 'release2180' into feature/CON-507-code-review-updates-redo
tw2113 Apr 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 46 additions & 32 deletions constant-contact-forms.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
* @param string $class_name Name of the class being requested.
* @return null
*/
function constant_contact_autoload_classes( $class_name ) {
function constant_contact_autoload_classes( string $class_name ) {
if ( ! str_starts_with( $class_name, 'ConstantContact_' ) ) {
return;
return null;
}

$filename = strtolower(
Expand All @@ -59,6 +59,8 @@ function constant_contact_autoload_classes( $class_name ) {
);

Constant_Contact::include_file( $filename );

return null;
}
spl_autoload_register( 'constant_contact_autoload_classes' );

Expand Down Expand Up @@ -309,6 +311,13 @@ class Constant_Contact {
*/
private ConstantContact_Health $health;

/**
* An instance of the ConstantContact_API_Utility class.
* @since NEXT
* @var ConstantContact_API_Utility
*/
private ConstantContact_API_Utility $utility;

/**
* Option name for where we store the timestamp of when the plugin was activated.
*
Expand All @@ -333,7 +342,7 @@ class Constant_Contact {
*
* @return Constant_Contact A single instance of this class.
*/
public static function get_instance() {
public static function get_instance(): Constant_Contact {
if ( null === self::$single_instance ) {
self::$single_instance = new self();
}
Expand Down Expand Up @@ -385,7 +394,7 @@ protected function __construct() {
*
* @since 1.0.1
*/
public function minimum_version() {
public function minimum_version(): void {
echo '<div id="message" class="notice is-dismissible error"><p>' . esc_html__( 'Constant Contact Forms requires PHP 7.4 or higher. Your hosting provider or website administrator should be able to assist in updating your PHP version.', 'constant-contact-forms' ) . '</p></div>';
}

Expand All @@ -395,7 +404,8 @@ public function minimum_version() {
* @since 1.0.0
*/
public function plugin_classes() {
$this->api = new ConstantContact_API( $this );
$this->utility = new ConstantContact_API_Utility( $this );
$this->api = new ConstantContact_API( $this );
if ( class_exists( 'FLBuilder' ) ) {
// Load if Beaver Builder is active.
$this->beaver_builder = new ConstantContact_Beaver_Builder( $this );
Expand Down Expand Up @@ -429,7 +439,7 @@ public function plugin_classes() {
*
* @since 1.0.0
*/
public function admin_plugin_classes() {
public function admin_plugin_classes(): void {
$this->admin = new ConstantContact_Admin( $this, $this->basename );
$this->admin_pages = new ConstantContact_Admin_Pages( $this );
$this->block = new ConstantContact_Block( $this );
Expand All @@ -442,7 +452,7 @@ public function admin_plugin_classes() {
*
* @return void
*/
public function hooks() {
public function hooks(): void {
if ( ! $this->meets_php_requirements() ) {
add_action( 'admin_notices', [ $this, 'minimum_version' ] );
return;
Expand Down Expand Up @@ -471,7 +481,7 @@ public function hooks() {
*
* @since 1.0.0
*/
public function activate() {
public function activate(): void {
update_option( self::$activated_date_option, time() );
}

Expand All @@ -482,7 +492,7 @@ public function activate() {
*
* @return void
*/
public function deactivate() {
public function deactivate(): void {

if ( ! $this->meets_php_requirements() ) {
return;
Expand Down Expand Up @@ -511,7 +521,7 @@ public function deactivate() {
*
* @since 1.6.0
*/
public function uninstall() {
public function uninstall(): void {
$uninstaller = new ConstantContact_Uninstall();
$uninstaller->run();
}
Expand All @@ -532,7 +542,7 @@ public function meets_php_requirements() : bool {
*
* @since 1.0.0
*/
public function init() {
public function init(): void {
$this->init_debug_log();
}

Expand All @@ -543,7 +553,7 @@ public function init() {
*
* @return void
*/
protected function init_debug_log() {
protected function init_debug_log(): void {

if ( ! constant_contact_debugging_enabled() ) {
return;
Expand All @@ -558,7 +568,7 @@ protected function init_debug_log() {
*
* @since 1.0.0
*/
public function load_libs() {
public function load_libs(): void {

// Load what we can, automagically.
require_once $this->dir( 'vendor_prefixed/autoload.php' );
Expand Down Expand Up @@ -610,16 +620,11 @@ public function ajax_save_clear_first_form() {
* @return mixed
*/
public function __get( $field ) {
switch ( $field ) {
case 'version':
return self::VERSION;
case 'basename':
case 'path':
case 'url':
return $this->$field;
default:
throw new Exception( 'Invalid ' . __CLASS__ . ' property: ' . $field );
}
return match ( $field ) {
'version' => self::VERSION,
'basename', 'path', 'url' => $this->$field,
default => throw new Exception( 'Invalid ' . __CLASS__ . ' property: ' . $field ),
};
}

/**
Expand Down Expand Up @@ -848,6 +853,15 @@ public function get_updates(): ConstantContact_Updates {
return $this->updates;
}

/**
* API Utility getter.
* @return ConstantContact_API_Utility
* @since NEXT
*/
public function get_api_utility(): ConstantContact_API_Utility {
return $this->utility;
}

/**
* Include a file from the classes directory.
*
Expand All @@ -857,7 +871,7 @@ public function get_updates(): ConstantContact_Updates {
* @param bool $include_class Whether or ot to include the class.
* @return bool Result of include call.
*/
public static function include_file( string $filename, bool $include_class = true ) {
public static function include_file( string $filename, bool $include_class = true ): bool {

// By default, all files are named 'class-something.php'.
if ( $include_class ) {
Expand All @@ -883,7 +897,7 @@ public static function include_file( string $filename, bool $include_class = tru
*/
public static function dir( string $path = '' ) : string {
static $dir;
$dir = $dir ? $dir : trailingslashit( __DIR__ );
$dir = $dir ?: trailingslashit( __DIR__ );
return $dir . $path;
}

Expand All @@ -897,7 +911,7 @@ public static function dir( string $path = '' ) : string {
*/
public static function url( string $path = '' ) : string {
static $url;
$url = $url ? $url : trailingslashit( plugin_dir_url( __FILE__ ) );
$url = $url ?: trailingslashit( plugin_dir_url( __FILE__ ) );
return $url . $path;
}

Expand All @@ -908,7 +922,7 @@ public static function url( string $path = '' ) : string {
*
* @return string License text.
*/
public function get_license_text() {
public function get_license_text(): string {
$license = self::url( self::LICENSE_FILE );
$license_content = wp_remote_get( $license );

Expand All @@ -927,7 +941,7 @@ public function get_license_text() {
* @param array $classes Existing body classes.
* @return array Amended body classes.
*/
public function body_classes( $classes = [] ) : array {
public function body_classes( array $classes = [] ) : array {
$theme = wp_get_theme()->get_template();
$classes[] = "ctct-{$theme}"; // Prefixing for user knowledge of source.

Expand All @@ -939,7 +953,7 @@ public function body_classes( $classes = [] ) : array {
*
* @since 1.4.0
*/
public function register_admin_assets() {
public function register_admin_assets(): void {

wp_register_style(
'constant-contact-forms-admin',
Expand All @@ -954,7 +968,7 @@ public function register_admin_assets() {
*
* @since 1.4.0
*/
public function register_front_assets() {
public function register_front_assets(): void {

if ( constant_contact_disable_frontend_css() ) {
return;
Expand Down Expand Up @@ -1013,7 +1027,7 @@ public function is_constant_contact() : bool {
*
* @return Constant_Contact Singleton instance of plugin class.
*/
function constant_contact() {
function constant_contact(): Constant_Contact {
return Constant_Contact::get_instance();
}

Expand All @@ -1022,7 +1036,7 @@ function constant_contact() {
*
* @since 1.6.0
*/
function constant_contact_uninstall() {
function constant_contact_uninstall(): void {
$instance = Constant_Contact::get_instance();
$instance->uninstall();
}
2 changes: 1 addition & 1 deletion includes/class-admin-pages.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public function about_page() {
$new_link = '';

if ( ! constant_contact()->get_api()->is_connected() ) {
$new_link = constant_contact()->get_api()->get_signup_link();
$new_link = constant_contact()->get_api_utility()->get_signup_link();
$auth_link = admin_url( 'edit.php?post_type=ctct_forms&page=ctct_options_connect' );
}
?>
Expand Down
Loading