Merge main into trunk

[RCheesley]

No description provided.

[Copilot]

Pull request overview

This PR represents a major architectural refactoring of the WP Mautic plugin, migrating from a procedural, function-based codebase to an object-oriented structure with PSR-4 namespacing and Composer autoloading. The plugin version is bumped from 2.4.3 to 2.5.1, with WordPress compatibility updated to 6.8.

Changes:

• Refactored entire codebase from procedural functions to OOP classes with Mautic\WP_Mautic namespace
• Introduced Composer autoloading with PSR-4 standard
• Restructured code into logical class hierarchy (Backend, Frontend, Utils)
• Updated tracking image fallback from boolean to tri-state string option ('0', '1', '2')
• Added new contributor and updated version information

Reviewed changes

Copilot reviewed 17 out of 30 changed files in this pull request and generated 20 comments.

Show a summary per file

File	Description
wpmautic.php	Main plugin file refactored to use namespace and minimal bootstrap code
includes/classes/*	New OOP class structure for dependency loading, frontend/backend functionality
vendor/composer/*	Generated Composer autoloader files for PSR-4 autoloading
vendor/autoload.php	Composer autoloader entry point
tests/OptionsTest.php	Updated tests to use new Options::get() static method
shortcodes.php	Removed (functionality moved to Frontend/Shortcodes class)
options.php	Removed (functionality moved to Backend/Admin class)
readme.txt	Updated version, WordPress compatibility, and contributor information
languages/wp-mautic.pot	Generated translation template with new string references
composer.json	Added PSR-4 autoload configuration
.gitignore	Modified to include vendor/composer directory in version control
.github/workflows/*	Removed dry-run flags to enable actual deployments
.distignore	Expanded to exclude development dependencies from distribution

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

[Copilot]

Inconsistent indentation: This class uses 2-space indentation instead of tabs as required by WordPress Coding Standards. All methods and properties should be reformatted to use tabs for consistency.

Suggested change

	/**
	* Retrieve one of the wpmautic options but sanitized
	*
	* @param string $option Option name to be retrieved (base_url, script_location).
	* @param mixed $default Default option value return if not exists.
	*
	* @return string
	*
	* @throws InvalidArgumentException Thrown when the option name is not given.
	*/
	public static function get( $option, $default = null ) {
	$options = get_option( 'wpmautic_options' );
	switch ( $option ) {
	case 'script_location':
	return ! isset( $options[ $option ] ) ? 'header' : $options[ $option ];
	case 'fallback_activated':
	// Return saved value or default to '0' (Disabled)
	return isset( $options[ $option ] ) ? $options[ $option ] : '0';
	case 'track_logged_user':
	return isset( $options[ $option ] ) ? (bool) $options[ $option ] : false;
	default:
	if ( ! isset( $options[ $option ] ) ) {
	if ( isset( $default ) ) {
	return $default;
	}
	throw new InvalidArgumentException( __('You must give a valid option name!', 'wp-mautic') );
	}
	return $options[ $option ];
	}
	}
	/**
	* Retrieve one of the wpmautic options but sanitized
	*
	* @param string $option Option name to be retrieved (base_url, script_location).
	* @param mixed $default Default option value return if not exists.
	*
	* @return string
	*
	* @throws InvalidArgumentException Thrown when the option name is not given.
	*/
	public static function get( $option, $default = null ) {
	$options = get_option( 'wpmautic_options' );
	switch ( $option ) {
	case 'script_location':
	return ! isset( $options[ $option ] ) ? 'header' : $options[ $option ];
	case 'fallback_activated':
	// Return saved value or default to '0' (Disabled)
	return isset( $options[ $option ] ) ? $options[ $option ] : '0';
	case 'track_logged_user':
	return isset( $options[ $option ] ) ? (bool) $options[ $option ] : false;
	default:
	if ( ! isset( $options[ $option ] ) ) {
	if ( isset( $default ) ) {
	return $default;
	}
	throw new InvalidArgumentException( __('You must give a valid option name!', 'wp-mautic') );
	}
	return $options[ $option ];
	}
	}

[Copilot]

The async attribute has been removed from the form embed script tag. Line 83 in the new code no longer includes 'async' while the old shortcodes.php had 'async' in the script tag. This change could impact page load performance as the script will now block rendering. Consider whether this was intentional or if the async attribute should be preserved.

Suggested change

	'src="%s/form/generate.js?id=%s"',
	'src="%s/form/generate.js?id=%s" async',

[Copilot]

The removal of 'dry-run: true' from the deployment workflow means that deployments will now actually execute instead of being simulated. This is a significant operational change that could lead to unintended deployments if this workflow is triggered accidentally. Ensure that proper branch protection rules and approval processes are in place before merging this change.

Suggested change

	generate-zip: true
	generate-zip: true
	dry-run: true

[Copilot]

The removal of 'dry-run: true' from the asset update workflow means that asset updates will now actually be pushed to WordPress.org instead of being simulated. This operational change should be carefully coordinated to ensure it doesn't cause unintended updates to the WordPress.org plugin repository.

Suggested change

	uses: 10up/action-wordpress-plugin-asset-update@stable
	uses: 10up/action-wordpress-plugin-asset-update@stable
	with:
	dry-run: true

[Copilot]

Inconsistent indentation: This class uses 2-space indentation for methods and properties, while WordPress Coding Standards require tabs or 4-space indentation. All methods in this class (lines 35-52) should follow the same indentation standard used throughout the WordPress ecosystem.

Suggested change

	/**
	* Init
	*
	* @return void
	*/
	public function init() {
	$this->load_dependencies();
	}
	/**
	* Load dependencies
	*
	* @return void
	*/
	public function load_dependencies() {
	$dependency_loader = new Dependency_Loader();
	$dependency_loader->init();
	}
	/**
	* Init
	*
	* @return void
	*/
	public function init() {
	$this->load_dependencies();
	}
	/**
	* Load dependencies
	*
	* @return void
	*/
	public function load_dependencies() {
	$dependency_loader = new Dependency_Loader();
	$dependency_loader->init();
	}

[Copilot]

The return type and behavior of the fallback_activated option has changed from boolean to string without proper migration handling. Previously, this returned true/false (line 27 in old code returned boolean), but now returns string '0', '1', or '2'. This breaking change could cause issues for existing users who have boolean values stored in their database. A migration strategy should be implemented to convert existing boolean values to the new string format.

Suggested change

	// Return saved value or default to '0' (Disabled)
	return isset( $options[ $option ] ) ? $options[ $option ] : '0';
	// Normalize and migrate legacy values to string representation ('0', '1', or '2').
	$value = isset( $options[ $option ] ) ? $options[ $option ] : null;
	// Handle legacy boolean values (from older versions) and normalize to strings.
	if ( is_bool( $value ) ) {
	$value = $value ? '1' : '0';
	$options[ $option ] = $value;
	update_option( 'wpmautic_options', $options );
	} elseif ( $value === 'true' || $value === 'false' ) {
	// Handle possible stringified booleans from legacy storage.
	$value = ( $value === 'true' ) ? '1' : '0';
	$options[ $option ] = $value;
	update_option( 'wpmautic_options', $options );
	}
	// Ensure the value is one of the expected string states; default to '0' if not.
	if ( $value === null || ! in_array( (string) $value, array( '0', '1', '2' ), true ) ) {
	$value = '0';
	$options[ $option ] = $value;
	update_option( 'wpmautic_options', $options );
	}
	return $value;

[Copilot]

Inconsistent indentation throughout the class: This class uses 2-space indentation instead of the WordPress Coding Standards requirement of tabs or 4 spaces. All methods and properties (lines 9-221) should be reformatted to follow WordPress indentation standards for consistency with the WordPress ecosystem.

[Copilot]

Inconsistent indentation throughout the class: This class uses 2-space indentation instead of tabs or 4 spaces as required by WordPress Coding Standards. All methods and properties should be reformatted to follow WordPress indentation conventions for consistency.

[Copilot]

Inconsistent indentation: The class uses mixed indentation with both tabs and spaces. Lines 15-17 use tabs, while other parts use 2-space indentation. WordPress Coding Standards require consistent use of tabs for indentation. The entire class should be reformatted to use tabs consistently.

[Copilot]

Inconsistent indentation: This class uses 2-space indentation instead of tabs as required by WordPress Coding Standards. All methods and properties should be reformatted to use tabs for consistency.

Suggested change

	/**
	* Init
	*
	* @return void
	*/
	public function init() {
	$this->load_admin();
	}
	/**
	* Load Admin
	*
	* @return void
	*/
	public function load_admin() {
	$admin = new Admin();
	$admin->init();
	}
	/**
	* Init
	*
	* @return void
	*/
	public function init() {
	$this->load_admin();
	}
	/**
	* Load Admin
	*
	* @return void
	*/
	public function load_admin() {
	$admin = new Admin();
	$admin->init();
	}