Proposed v3.2.4

CHANGELOG.md

@@ -1,5 +1,17 @@
 # CHANGELOG
 
+##### 3.2.4
+* [NEW] Plugin now officially supports ACF v6!
+* [NEW] Tested up to PHP 8.2.
+* [BUG] Fixed 'Notice: Trying to get property ID of non-object' when enqueueing font files on non-objects. ( WP Support )
+* [BUG] Fixed 'Warning: failed to open stream: HTTP request failed' when bad API Key supplied, or other API connection issues. #27
+* [NEW] Admin Settings - checks and help messages for Google API Key/connection issues.
+* [NEW] Admin Settings - description and link provided for getting Google Fonts API key.
+* [NEW] Admin Settings - checks to make sure ACF is installed and activated.
+* [UPDATE] Translation string and textdomain updates to get plugin translation-ready (coming next release).
+* [UPDATE] Added a few minor additional checks for some variables to prevent possible errors in the future.
+* [UPDATE] Minor code cleanup for readability. 
+
 ##### 3.2.3
 * Added new font-weight values
 

README.md

@@ -3,12 +3,17 @@
 A Typography Add-on for the Advanced Custom Fields Plugin.
 
   - Requires at least: WP 3.5.0
-  - Tested up to: WP 6.0
-  - Stable: 3.2.3
-  - Latest: 3.2.3
+  - Tested up to: WP 6.0.3
+  - Tested up to: PHP 8.2
+  - Tested up to: ACF 6.0
+  - Stable: 3.2.4
+  - Latest: 3.2.4
 
 ## Description
 Typography field type for "Advanced Custom Fields" plugin that lets you add different text properties e.g. Font Size, Font Family, Font Color etc.
+
+If you want any kind of font/typography features within ACF, this is the plugin for you! There's nothing else like it!
+
 ### Supported Subfields
 * Font Size
 * Font Family
@@ -55,6 +60,7 @@ the_typography_sub_field( $selector, $property, [$format_value] );
 ## Compatibility
 
 This ACF field type is compatible with:
+* ACF plugin v4, v5 & v6
 * Free and paid versions of the ACF plugin
 
 ## Installation
@@ -63,4 +69,4 @@ This ACF field type is compatible with:
 - Google API Key is required for Google Fonts. Please add one by going to `WordPress Admin Dashboard > Settings > ACF Typography Settings`
 
 ## Changelog
-See changelog on [CHANGELOG.md](CHANGELOG.md) file.
+See changelog on [CHANGELOG.md](CHANGELOG.md) file.

acf-typography.php

@@ -4,11 +4,12 @@
 Plugin Name: Advanced Custom Fields: Typography Field
 Plugin URI: https://wordpress.org/plugins/acf-typography-field
 Description: A Typography Add-on for the Advanced Custom Fields Plugin.
-Version: 3.2.3
+Version: 3.2.4
 Author: Mujahid Ishtiaq
 Author URI: https://github.com/mujahidi
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
+Text Domain: acf-typography
 */
 
 // exit if accessed directly
@@ -17,86 +18,93 @@
 $acft_options = get_option( 'acft_settings' );
 
 if( $acft_options && $acft_options['google_key'] )
-	define('YOUR_API_KEY', $acft_options['google_key']);
+	define( 'YOUR_API_KEY', $acft_options['google_key'] );
 
 // check if class already exists
 if( !class_exists('acf_plugin_Typography') ) :
 
 	class acf_plugin_Typography {
-
-		/*
-		*  __construct
-		*
-		*  This function will setup the class functionality
-		*
-		*  @type	function
-		*  @date	17/02/2016
-		*  @since	1.0.0
-		*
-		*  @param	n/a
-		*  @return	n/a
-		*/
-
-		function __construct() {
-
-			// vars
-			$this->settings = array(
-				'version'	=> '3.2.2',
-				'url'		=> plugin_dir_url( __FILE__ ),
-				'path'		=> plugin_dir_path( __FILE__ )
-			);
-
-			// include files
-			require plugin_dir_path( __FILE__ ) . 'includes/api-template.php';
-			require plugin_dir_path( __FILE__ ) . 'includes/admin_settings.php';
-			require plugin_dir_path( __FILE__ ) . 'includes/functions.php';
 
-			// include field
-			add_action('acf/include_field_types', 	array($this, 'include_field_types')); // v5
-			add_action('acf/register_fields', 		array($this, 'include_field_types')); // v4
-			add_action('acf/field_group/admin_enqueue_scripts', array($this, 'field_group_admin_enqueue_scripts'));
-
-		}
-
+			var $settings; // php8.2 compatibility (deprecated dynamic properties)
 
-		/*
-		*  include_field_types
-		*
-		*  This function will include the field type class
-		*
-		*  @type	function
-		*  @date	17/02/2016
-		*  @since	1.0.0
-		*
-		*  @param	$version (int) major ACF version. Defaults to false
-		*  @return	n/a
-		*/
-
-		function include_field_types( $version = false ) {
+			/*
+			*  __construct
+			*
+			*  This function will setup the class functionality
+			*
+			*  @type	function
+			*  @date	17/02/2016
+			*  @since	1.0.0
+			*
+			*  @param	n/a
+			*  @return	n/a
+			*/
 
-			// support empty $version
-			if( !$version ) $version = 4;
+			function __construct() {
+
+					// vars
+					$this->settings = array(
+						'version'	=> '3.2.4',
+						'url'		=> plugin_dir_url( __FILE__ ),
+						'path'		=> plugin_dir_path( __FILE__ )
+					);
+
+					// include files
+					require plugin_dir_path( __FILE__ ) . 'includes/api-template.php';
+					require plugin_dir_path( __FILE__ ) . 'includes/admin_settings.php';
+					require plugin_dir_path( __FILE__ ) . 'includes/functions.php';
+
+					// include field
+					add_action('acf/include_field_types', array($this, 'include_field_types')); // v5, v6
+					add_action('acf/register_fields', array($this, 'include_field_types')); // v4
+					add_action('acf/field_group/admin_enqueue_scripts', array($this, 'field_group_admin_enqueue_scripts'));
+
+			}
 
 
-			// include
-			include_once('fields/acf-Typography-v' . $version . '.php');
+			/*
+			*  include_field_types
+			*
+			*  This function will include the field type class
+			*
+			*  @type	function
+			*  @date	17/02/2016
+			*  @since	1.0.0
+			*
+			*  @param	$version (int) major ACF version. Defaults to false
+			*  @return	n/a
+			*/
 
-		}
+			function include_field_types( $version = false ) {
+
+					/**
+					 * ACF currently does not check for, or use version 6.
+					 * It only checks for/uses v5 even when v6 installed/active.
+					 * Eventually they'll push for v6-specific fields.
+					 * Until then, we go ahead & specify the version ourselves.
+					 */
+					if ( get_option( 'acf_version' ) ) $version = explode( '.', get_option( 'acf_version' ) )[0];
+
+					// if version is any version other than 5 or 6, set version to 4
+					if ( !$version || !$version === 5 || !$version === 6 ) $version = 4;
+
+					// include
+					include_once('fields/acf-Typography-v' . $version . '.php');
+
+			}
 
-		function field_group_admin_enqueue_scripts(){
+			function field_group_admin_enqueue_scripts(){
 
-			wp_enqueue_script( 'acf-typography-fieldgroup-script', plugin_dir_url( __FILE__ ) . 'assets/js/admin-field-group.js', array(), $this->settings['version'] );
+					wp_enqueue_script( 'acf-typography-fieldgroup-script', plugin_dir_url( __FILE__ ) . 'assets/js/admin-field-group.js', array(), $this->settings['version'] );
 
-		}
+			}
 
 	}
 
-
 	// initialize
 	new acf_plugin_Typography();
 
-
 // class_exists check
 endif;
 
-?>
+?>