Update version to 4.0.0 and bump WordPress compatibility to 6.8

Author: ajaydsouza

README.md

@@ -1,4 +1,4 @@
-# Contextual Related Posts
+# Contextual Related Posts
 
 [![WordPress Plugin Version](https://github.com/WebberZone/contextual-related-posts/blob/master/wporg-assets/banner-1544x500.png)](https://wordpress.org/plugins/contextual-related-posts/)
 
@@ -10,7 +10,7 @@
 
 __Requires:__ 6.3
 
-__Tested up to:__ 6.7
+__Tested up to:__ 6.8
 
 __Requires PHP:__ 7.4
 

contextual-related-posts.php

@@ -15,7 +15,7 @@
  * Plugin Name: Contextual Related Posts
  * Plugin URI:  https://webberzone.com/plugins/contextual-related-posts/
  * Description: Display related posts on your website or in your feed. Increase reader retention and reduce bounce rates.
- * Version:     4.0.0-RC1
+ * Version:     4.0.0
  * Author:      WebberZone
  * Author URI:  https://webberzone.com
  * License:     GPL-2.0+
@@ -36,7 +36,7 @@
  * @since 2.9.3
  */
 if ( ! defined( 'CRP_VERSION' ) ) {
-	define( 'CRP_VERSION', '4.0.0-beta1' );
+	define( 'CRP_VERSION', '4.0.0' );
 }
 
 

includes/class-main.php

@@ -9,11 +9,9 @@
 
 use WebberZone\Contextual_Related_Posts\Admin\Activator;
 use WebberZone\Contextual_Related_Posts\Frontend\Display;
-
 if ( ! defined( 'WPINC' ) ) {
 	exit;
 }
-
 /**
  * Main plugin class.
  *
@@ -72,15 +70,6 @@ final class Main {
 	 */
 	public Frontend\Language_Handler $language;
 
-	/**
-	 * Pro modules.
-	 *
-	 * @since 3.5.0
-	 *
-	 * @var Pro\Pro|null
-	 */
-	public ?Pro\Pro $pro = null;
-
 	/**
 	 * Gets the instance of the class.
 	 *
@@ -93,7 +82,6 @@ public static function get_instance(): self {
 			self::$instance = new self();
 			self::$instance->init();
 		}
-
 		return self::$instance;
 	}
 
@@ -116,9 +104,7 @@ private function init(): void {
 		$this->styles     = new Frontend\Styles_Handler();
 		$this->shortcodes = new Frontend\Shortcodes();
 		$this->blocks     = new Frontend\Blocks\Blocks();
-
 		$this->hooks();
-
 		if ( is_admin() ) {
 			$this->admin = new Admin\Admin();
 			if ( is_multisite() ) {
@@ -140,8 +126,12 @@ public function hooks(): void {
 		add_filter( 'the_excerpt_rss', array( $this, 'content_filter' ), \crp_get_option( 'content_filter_priority', 10 ) );
 		add_filter( 'the_content_feed', array( $this, 'content_filter' ), \crp_get_option( 'content_filter_priority', 10 ) );
 		add_action( 'parse_query', array( $this, 'parse_query' ) );
-
-		add_action( 'activated_plugin', array( $this, 'activated_plugin' ), 10, 2 );
+		add_action(
+			'activated_plugin',
+			array( $this, 'activated_plugin' ),
+			10,
+			2
+		);
 		add_action( 'pre_current_active_plugins', array( $this, 'plugin_deactivated_notice' ) );
 	}
 
@@ -160,8 +150,9 @@ public function initiate_plugin(): void {
 	 * @since 3.5.0
 	 */
 	public function register_widgets(): void {
-		register_widget( '\WebberZone\Contextual_Related_Posts\Frontend\Widgets\Related_Posts_Widget' );
+		register_widget( '\\WebberZone\\Contextual_Related_Posts\\Frontend\\Widgets\\Related_Posts_Widget' );
 	}
+
 	/**
 	 * Function to register our new routes from the controller.
 	 *
@@ -210,25 +201,20 @@ public function activated_plugin( string $plugin, bool $network_wide ): void {
 		if ( ! in_array( $plugin, array( 'contextual-related-posts/contextual-related-posts.php', 'contextual-related-posts-pro/contextual-related-posts.php' ), true ) ) {
 			return;
 		}
-
 		Activator::activation_hook( $network_wide );
-
 		$plugin_to_deactivate  = 'contextual-related-posts/contextual-related-posts.php';
 		$deactivated_notice_id = '1';
-
 		// If we just activated the free version, deactivate the pro version.
 		if ( $plugin === $plugin_to_deactivate ) {
 			$plugin_to_deactivate  = 'contextual-related-posts-pro/contextual-related-posts.php';
 			$deactivated_notice_id = '2';
 		}
-
 		if ( is_multisite() && is_network_admin() ) {
 			$active_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
 			$active_plugins = array_keys( $active_plugins );
 		} else {
 			$active_plugins = (array) get_option( 'active_plugins', array() );
 		}
-
 		foreach ( $active_plugins as $plugin_basename ) {
 			if ( $plugin_to_deactivate === $plugin_basename ) {
 				set_transient( 'crp_deactivated_notice_id', $deactivated_notice_id, 1 * HOUR_IN_SECONDS );
@@ -248,18 +234,19 @@ public function plugin_deactivated_notice(): void {
 		if ( ! in_array( $deactivated_notice_id, array( 1, 2 ), true ) ) {
 			return;
 		}
-
 		$message = __( "Contextual Related Posts and Contextual Related Posts PRO should not be active at the same time. We've automatically deactivated Contextual Related Posts.", 'contextual-related-posts' );
 		if ( 2 === $deactivated_notice_id ) {
 			$message = __( "Contextual Related Posts and Contextual Related Posts PRO should not be active at the same time. We've automatically deactivated Contextual Related Posts PRO.", 'contextual-related-posts' );
 		}
-
 		?>
 			<div class="updated" style="border-left: 4px solid #ffba00;">
-				<p><?php echo esc_html( $message ); ?></p>
+				<p>
+					<?php
+					echo esc_html( $message );
+					?>
+				</p>
 			</div>
 			<?php
-
 			delete_transient( 'crp_deactivated_notice_id' );
 	}
 }

includes/load-freemius.php

@@ -20,7 +20,6 @@ function crp_freemius() {
 		if ( ! defined( 'WP_FS__PRODUCT_15040_MULTISITE' ) ) {
 			define( 'WP_FS__PRODUCT_15040_MULTISITE', true );
 		}
-
 		// Include Freemius SDK.
 		require_once dirname( __DIR__ ) . '/vendor/freemius/start.php';
 		$crp_freemius = \fs_dynamic_init(
@@ -30,7 +29,7 @@ function crp_freemius() {
 				'premium_slug'   => 'contextual-related-posts-pro',
 				'type'           => 'plugin',
 				'public_key'     => 'pk_4aec305b9c97637276da2e55b723f',
-				'is_premium'     => true,
+				'is_premium'     => false,
 				'premium_suffix' => 'Pro',
 				'has_addons'     => false,
 				'has_paid_plans' => true,
@@ -40,7 +39,7 @@ function crp_freemius() {
 					'support' => false,
 					'network' => true,
 					'parent'  => array(
-						'slug' => is_multisite() ? 'crp_options_page' : 'options-general.php',
+						'slug' => ( is_multisite() ? 'crp_options_page' : 'options-general.php' ),
 					),
 				),
 				'is_live'        => true,
@@ -66,9 +65,6 @@ function crp_freemius_get_plugin_icon() {
  */
 function crp_freemius_uninstall() {
 	require_once dirname( __DIR__ ) . '/uninstaller.php';
-	if ( crp_freemius()->can_use_premium_code__premium_only() ) {
-		\WebberZone\Contextual_Related_Posts\Pro\Pro::uninstall_pro();
-	}
 }
 
 // Init Freemius.

readme.txt

@@ -4,7 +4,7 @@ Contributors: webberzone, ajay
 Donate link: https://wzn.io/donate-crp
 Stable tag: 4.0.0
 Requires at least: 6.3
-Tested up to: 6.7
+Tested up to: 6.8
 Requires PHP: 7.4
 License: GPLv2 or later