version 3.1.8 released

Author: manchumahara

.github/workflows/deploy.yml

@@ -11,46 +11,125 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+
+      - name: Debug File List
+        run: ls -R
+
       - name: Install SVN (Subversion)
         run: |
           sudo apt-get update
           sudo apt-get install subversion
 
-      - name: WordPress Plugin Deploy
-        id: deploy
-        uses: 10up/action-wordpress-plugin-deploy@stable
-        with:
-          generate-zip: true
-
       - name: Find Readme File
         id: find_readme
         run: |
-          for file in README.txt README.md Readme.txt Readme.md readme.txt readme.md; do
+          for file in readme.txt Readme.txt README.txt README.md Readme.md readme.md; do
             if [ -f "$file" ]; then
-              echo "::set-output name=readme_file::$file"
+              echo "Readme file found: $file"
+              echo "readme_file=$file" >> $GITHUB_ENV
               break
             fi
           done
 
+          # Ensure the variable is available within the current step
+          source $GITHUB_ENV
+
+          if [ -z "$readme_file" ]; then
+            echo "::error::Readme file not found."
+            exit 1
+          fi
+
       - name: Extract Release Notes
         id: release_notes
         run: |
-          if [[ -z "${{ steps.find_readme.outputs.readme_file }}" ]]; then
-            echo "::error::Readme file not found."
+          changelog_section_start="== Changelog =="
+          readme_file="$readme_file"
+
+          # Extract the tag name from GITHUB_REF (plugin_version)
+          if [[ "$GITHUB_REF" == refs/tags/* ]]; then
+            plugin_version="${GITHUB_REF#refs/tags/}"
+            echo "DEBUG: Plugin latest version found: $plugin_version."
+          else
+            echo "::error::This workflow must be triggered by a tag push."
             exit 1
           fi
 
-          release_notes=$(grep '== Changelog ==' "${{ steps.find_readme.outputs.readme_file }}" | head -n -1 | tail -n +2)
-          echo "::set-output name=notes::$release_notes"
+          in_changelog=0
+          found_version=0
+          release_notes=""
+
+          echo "DEBUG: Starting to extract release notes from $readme_file for version $plugin_version."
+
+          while IFS= read -r line; do
+            echo "DEBUG: Processing line: $line"
+
+            # Start processing after the changelog header
+            if [[ "$line" == "$changelog_section_start" ]]; then
+              in_changelog=1
+              echo "DEBUG: Found changelog section header."
+              continue
+            fi
+
+            # Skip if not in changelog section
+            if [[ $in_changelog -eq 0 ]]; then
+              echo "DEBUG: Skipping line (not in changelog section)."
+              continue
+            fi
+
+            # Check for the current version header
+            if [[ "$line" == "= ${plugin_version} =" ]]; then
+              found_version=1
+              echo "DEBUG: Found version header for $plugin_version."
+              continue
+            fi
+
+            # Break if a new version header is found after the current version
+            if [[ $found_version -eq 1 ]] && echo "$line" | grep -qE '^= [0-9]+\.[0-9]+\.[0-9]+ =$'; then
+              echo "DEBUG: Found a new version header. Stopping collection."
+              break
+            fi
+
+            # Collect lines starting with '*' if we are in the current version section
+            if [[ $found_version -eq 1 ]] && echo "$line" | grep -qE '^\*'; then
+              echo "DEBUG: Found changelog entry: $line"
+              release_notes+="${line}\n"
+              continue
+            fi
+
+            # Log skipped lines in the current version section
+            if [[ $found_version -eq 1 ]]; then
+              echo "DEBUG: Skipping line (not a changelog entry): $line"
+            fi
+          done < "$readme_file"
+
+          if [[ -z "$release_notes" ]]; then
+            echo "::error::Failed to extract release notes for version ${plugin_version}."
+            exit 1
+          fi
+
+          echo "DEBUG: Successfully extracted release notes."
+          echo "DEBUG: Release notes content:"
+          echo -e "$release_notes"
+
+          # Write the release notes with actual line breaks
+          echo "RELEASE_NOTES<<EOF" >> $GITHUB_ENV
+          echo -e "$release_notes" >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV           
+
+      - name: WordPress Plugin Deploy
+        id: deploy
+        uses: 10up/action-wordpress-plugin-deploy@stable
+        with:
+          generate-zip: true
 
       - name: Create GitHub Release
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ github.ref_name }}
-          body: ${{ steps.release_notes.outputs.notes }}
+          body: ${{ env.RELEASE_NOTES }}
           files: ${{github.workspace}}/${{ github.event.repository.name }}.zip
 
 env:
   SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
   SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.txt

@@ -2,8 +2,8 @@
 Contributors: codeboxr, manchumahara
 Tags: currency converter,currency conversion,currency exchange,currency calculator,bitcoin
 Requires at least: 5.3
-Tested up to: 6.7.1
-Stable tag: 3.1.7
+Tested up to: 6.8
+Stable tag: 3.1.8
 PHP:7.4.*
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -95,6 +95,10 @@ How to install the plugin and get it working.
 == Screenshots ==
 
 == Changelog ==
+= 3.1.8 =
+* [updated] WordPress Core 6.8 compatible
+* [updated] Minor improvements and code structure refactor
+
 = 3.1.7 =
 * [fixed] Fixed miss spelled function name
 

admin/index.php

@@ -8,7 +8,7 @@
  * Plugin Name:       CBX Currency Converter
  * Plugin URI:        https://codeboxr.com/product/cbx-currency-converter-for-wordpress/
  * Description:       Currency Converter and rate display
- * Version:           3.1.7
+ * Version:           3.1.8
  * Author:            codeboxr
  * Author URI:        https://codeboxr.com
  * License:           GPL-2.0+
@@ -24,19 +24,24 @@
 }
 
 defined( 'CBCURRENCYCONVERTER_NAME' ) or define( 'CBCURRENCYCONVERTER_NAME', 'cbcurrencyconverter' );
-defined( 'CBCURRENCYCONVERTER_VERSION' ) or define( 'CBCURRENCYCONVERTER_VERSION', '3.1.7' );
+defined( 'CBCURRENCYCONVERTER_VERSION' ) or define( 'CBCURRENCYCONVERTER_VERSION', '3.1.8' );
 defined( 'CBCURRENCYCONVERTER_ROOT_PATH' ) or define( 'CBCURRENCYCONVERTER_ROOT_PATH', plugin_dir_path( __FILE__ ) );
 defined( 'CBCURRENCYCONVERTER_ROOT_URL' ) or define( 'CBCURRENCYCONVERTER_ROOT_URL', plugin_dir_url( __FILE__ ) );
 defined( 'CBCURRENCYCONVERTER_BASE_NAME' ) or define( 'CBCURRENCYCONVERTER_BASE_NAME', plugin_basename( __FILE__ ) );
 
 
+// Include the main class
+if ( ! class_exists( 'CBCurrencyConverter', false ) ) {
+	include_once CBCURRENCYCONVERTER_ROOT_PATH . 'includes/CBCurrencyConverter.php';
+}
+
 /**
  * Checking wp version
  *
  * @return bool
  */
-function cbcurrencyconverter_compatible_wp_version() {
-	if ( version_compare( $GLOBALS['wp_version'], '3.5', '<' ) ) {
+function cbcurrencyconverter_compatible_wp_version($version = '5.3' ) {
+	if ( version_compare( $GLOBALS['wp_version'], $version, '<' ) ) {
 		return false;
 	}
 
@@ -49,8 +54,8 @@ function cbcurrencyconverter_compatible_wp_version() {
  *
  * @return bool
  */
-function cbcurrencyconverter_compatible_php_version() {
-	if ( version_compare( PHP_VERSION, '7.4', '<=' ) ) {
+function cbcurrencyconverter_compatible_php_version($version = '7.4' ) {
+	if ( version_compare( PHP_VERSION, $version, '<=' ) ) {
 		return false;
 	}
 
@@ -59,41 +64,39 @@ function cbcurrencyconverter_compatible_php_version() {
 
 /**
  * The code that runs during plugin activation.
- * This action is documented in includes/class-cbcurrencyconverter-activator.php
+ * This action is documented in includes/CBCurrencyConverterActivator.php
  */
 function activate_cbcurrencyconverter() {
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-cbcurrencyconverter-activator.php';
-	CBCurrencyConverter_Activator::activate();
+	require_once plugin_dir_path( __FILE__ ) . 'includes/CBCurrencyConverterActivator.php';
+	CBCurrencyConverterActivator::activate();
 }//end method activate_cbcurrencyconverter
 
 /**
  * The code that runs during plugin deactivation.
- * This action is documented in includes/class-cbcurrencyconverter-deactivator.php
+ * This action is documented in includes/CBCurrencyConverterDeactivator.php
  */
 function deactivate_cbcurrencyconverter() {
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-cbcurrencyconverter-deactivator.php';
-	CBCurrencyConverter_Deactivator::deactivate();
-}
-
-/**
- * The code that runs during plugin uninstallatiom.
- * This action is documented in includes/class-cbcurrencyconverter-.php
- */
-/*function uninstall_cbcurrencyconverter() {
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-cbcurrencyconverter-uninstall.php';
-	CBCurrencyConverter_Uninstall::uninstall();
-}*/
+	require_once plugin_dir_path( __FILE__ ) . 'includes/CBCurrencyConverterDeactivator.php';
+	CBCurrencyConverterDeactivator::deactivate();
+}//end method deactivate_cbcurrencyconverter
 
 register_activation_hook( __FILE__, 'activate_cbcurrencyconverter' );
 register_deactivation_hook( __FILE__, 'deactivate_cbcurrencyconverter' );
-//register_uninstall_hook( __FILE__, 'uninstall_cbcurrencyconverter' );
+
 
 /**
- * The core plugin class that is used to define internationalization,
- * admin-specific hooks, and public-facing site hooks.
+ * Manually init the plugin
+ *
+ * @return CBCurrencyConverter|null
  */
-require plugin_dir_path( __FILE__ ) . 'includes/class-cbcurrencyconverter.php';
+function cbcurrencyconverter_core() { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
+	global $cbcurrencyconverter_core;
+	if ( ! isset( $cbcurrencyconverter_core ) ) {
+		$cbcurrencyconverter_core = run_cbcurrencyconverter_pro();
+	}
 
+	return $cbcurrencyconverter_core;
+}//end method cbcurrencyconverter_core
 
 /**
  * Begins execution of the plugin.
@@ -108,4 +111,4 @@ function run_cbcurrencyconverter() {
 	return CBCurrencyConverter::instance();
 }
 
-$GLOBALS['cbcurrencyconverter'] = run_cbcurrencyconverter();
+$GLOBALS['cbcurrencyconverter_core'] = run_cbcurrencyconverter();

assets/css/cbcurrencyconverter-admin.css

@@ -98,6 +98,24 @@ public static function instance() {
 		return self::$instance;
 	}//end method instance
 
+	/**
+	 * Cloning is forbidden.
+	 *
+	 * @since 3.1.7
+	 */
+	public function __clone() {
+		cbcurrencyconverter_doing_it_wrong( __FUNCTION__, esc_html__( 'Cloning is forbidden.', 'cbcurrencyconverter' ), '3.1.7' );
+	}//end method clone
+
+	/**
+	 * Unserializing instances of this class is forbidden.
+	 *
+	 * @since 3.1.7
+	 */
+	public function __wakeup() {
+		cbcurrencyconverter_doing_it_wrong( __FUNCTION__, esc_html__( 'Unserializing instances of this class is forbidden.', 'cbcurrencyconverter' ), '3.1.7' );
+	}//end method wakeup
+
 	/**
 	 * Get currency list
 	 *
@@ -116,8 +134,8 @@ public static function getCurrencyList() {
 	 *
 	 * - CBCurrencyConverter_Loader. Orchestrates the hooks of the plugin.
 	 * - CBCurrencyConverter_i18n. Defines internationalization functionality.
-	 * - CBCurrencyConverter_Admin. Defines all hooks for the admin area.
-	 * - CBCurrencyConverter_Public. Defines all hooks for the public side of the site.
+	 * - CBCurrencyConverterAdmin. Defines all hooks for the admin area.
+	 * - CBCurrencyConverterPublic. Defines all hooks for the public side of the site.
 	 *
 	 * Create an instance of the loader which will be used to register the hooks
 	 * with WordPress.
@@ -126,9 +144,9 @@ public static function getCurrencyList() {
 	 * @access   private
 	 */
 	private function load_dependencies() {
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/cbcurrencyconverter-tpl-loader.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-cbcurrencyconverter-setting.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-cbcurrencyconverter-helper.php';
+		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/Functions/cbcurrencyconverter-tpl-loader.php';
+		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/CBCurrencyconverterSetting.php';
+		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/Helpers/CBCurrencyConverterHelper.php';
 
 
 		//exchange api class
@@ -139,13 +157,13 @@ private function load_dependencies() {
 
 
 		//public and admin classes
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-cbcurrencyconverter-admin.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-cbcurrencyconverter-public.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/cbcurrencyconverter-functions.php';
+		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/CBCurrencyConverterAdmin.php';
+		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/CBCurrencyConverterPublic.php';
+		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/Functions/cbcurrencyconverter-functions.php';
 
 		//widget classes
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'widgets/gutenberg/class-cbcurrencyconverter-gutenbergwidget.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'widgets/classic_widgets/class-cbcurrencyconverter-widget.php';
+		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/Widgets/Blocks/CBCurrencyConverterGutenbergWidget.php';
+		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/Widgets/Classic/CBCurrencyConverterWidget.php';
 	}//end method load_dependencies
 
 
@@ -155,7 +173,7 @@ private function load_dependencies() {
 	 * @return void
 	 */
 	private function define_common_hooks() {
-		add_action( 'plugins_loaded', [ $this, 'load_plugin_textdomain' ] );
+		add_action( 'init', [ $this, 'load_plugin_textdomain' ] );
 	}//end method define_common_hooks
 
 	/**
@@ -168,7 +186,7 @@ private function define_common_hooks() {
 	private function define_admin_hooks() {
 		global $wp_version;
 
-		$plugin_admin     = new CBCurrencyConverter_Admin( $this->get_plugin_name(), $this->get_version() );
+		$plugin_admin     = new CBCurrencyConverterAdmin( $this->get_plugin_name(), $this->get_version() );
 		$gutenberg_widget = new CBCurrencyConverterGutenbergWidget( $this->get_plugin_name(), $this->get_version() );
 
 
@@ -212,7 +230,7 @@ private function define_admin_hooks() {
 	private function define_public_hooks() {
 		global $plugin_public;
 
-		$plugin_public = new CBCurrencyConverter_Public( $this->get_plugin_name(), $this->get_version() );
+		$plugin_public = new CBCurrencyConverterPublic( $this->get_plugin_name(), $this->get_version() );
 
 		add_action( 'wp_enqueue_scripts', [ $plugin_public, 'enqueue_styles' ] );
 		add_action( 'wp_enqueue_scripts', [ $plugin_public, 'enqueue_scripts' ] );