Fixes for PHP 8.2 (#156)

* Fix dynamic properties declaration * fix spacing * Fix calling trait outside class * More fixes * More fixes * More fixes * More fixes * More fixes * More fixes * Update dependencies * More fixes * Version bump --------- Co-authored-by: xxsimoxx <[email protected]>
ClassicPress · Jul 6, 2023 · 5128931 · 5128931
1 parent ea869c4
commit 5128931
Show file tree

Hide file tree

Showing 40 changed files with 731 additions and 218 deletions.
diff --git a/classicpress-seo.php b/classicpress-seo.php
@@ -3,7 +3,7 @@
  * Plugin Name:          Classic SEO
  * Plugin URI:           https://github.com/ClassicPress/classicpress-seo
  * Description:          Classic SEO is the first SEO plugin built specifically to work with ClassicPress. The plugin contains many essential SEO tools to help optimize your website.
- * Version:              2.1.3
+ * Version:              2.2.0.alpha.0
  * Author:               ClassicPress
  * Author URI:           https://github.com/ClassicPress
  * License:              GPL v2 or later
@@ -34,7 +34,7 @@ class Classic_SEO {
 	 *
 	 * @var string
 	 */
-	public $version = '2.1.3';
+	public $version = '2.2.0';
 
 	/**
 	 * Classic SEO database version.

diff --git a/composer.lock b/composer.lock
diff --git a/includes/admin/class-admin.php b/includes/admin/class-admin.php
@@ -27,7 +27,7 @@
  */
 class Admin implements Runner {
 
-	use Hooker, Ajax;
+	use Hooker, Ajax, Conditional;
 
 	/**
 	 * Register hooks.
@@ -113,7 +113,7 @@ public function canonical_check_notice( $post_id ) {
 		$post_type  = get_post_type( $post_id );
 		$is_allowed = in_array( $post_type, Helper::get_allowed_post_types(), true );
 
-		if ( ! $is_allowed || Conditional::is_autosave() || Conditional::is_ajax() || isset( $_REQUEST['bulk_edit'] ) ) {
+		if ( ! $is_allowed || Admin::is_autosave() || Admin::is_ajax() || isset( $_REQUEST['bulk_edit'] ) ) {
 			return $post_id;
 		}
 

diff --git a/includes/admin/class-options.php b/includes/admin/class-options.php
@@ -22,6 +22,7 @@
 /**
  * Options class.
  */
+#[\AllowDynamicProperties]
 class Options {
 
 	use Hooker;

diff --git a/includes/class-cmb2.php b/includes/class-cmb2.php
@@ -24,6 +24,8 @@
  */
 class CMB2 {
 
+	use Conditional;
+
 	/**
 	 * Set field arguments based on type.
 	 *
@@ -99,7 +101,7 @@ public static function current_object_type() {
 			$type = 'term';
 		}
 
-		if ( Conditional::is_ajax() && 'add-tag' === Param::post( 'action' ) ) {
+		if ( CMB2::is_ajax() && 'add-tag' === Param::post( 'action' ) ) {
 			$type = 'term';
 		}
 
@@ -313,7 +315,7 @@ public static function sanitize_webmaster_tags( $value ) {
 
 		return $value;
 	}
-	
+
 	/**
 	 * Handles sanitization of advanced robots data.
 	 *

diff --git a/includes/class-installer.php b/includes/class-installer.php
@@ -24,7 +24,7 @@
  */
 class Installer {
 
-	use Hooker;
+	use Hooker, WordPress;
 
 	/**
 	 * Bind all events.
@@ -574,7 +574,7 @@ private function get_opening_hours() {
 	 * @return array
 	 */
 	private function get_excluded_roles() {
-		$roles = WordPress::get_roles();
+		$roles = Installer::get_roles();
 		unset( $roles['administrator'], $roles['editor'], $roles['author'] );
 
 		return $roles;

diff --git a/includes/class-metadata.php b/includes/class-metadata.php
@@ -14,6 +14,7 @@
 /**
  * Metadata class.
  */
+ #[\AllowDynamicProperties]
 abstract class Metadata {
 
 	/**
@@ -132,7 +133,7 @@ public function maybe_replace_vars( $key, $value, $object ) {
 		if ( ! in_array( $key, $need_replacements, true ) || ! is_string( $value ) || '' === $value ) {
 			return false;
 		}
-		
+
 		$value = \str_replace( [ '%seo_title%', '%seo_description%' ], [ '%title%', '%excerpt%' ], $value );
 
 		return Helper::replace_vars( $value, $object );

diff --git a/includes/class-post.php b/includes/class-post.php
@@ -20,6 +20,8 @@
  */
 class Post extends Metadata {
 
+	use Conditional;
+
 	/**
 	 * Type of object metadata is for (e.g., comment, post, or user).
 	 *
@@ -168,7 +170,7 @@ public static function is_shop_page() {
 	 * @return bool Whether the current page is a WooCommerce page.
 	 */
 	public static function is_woocommerce_page() {
-		if ( Conditional::is_woocommerce_active() || Conditional::is_classic_commerce_active() ) {
+		if ( Post::is_woocommerce_active() || Post::is_classic_commerce_active() ) {
 			return \is_cart() || \is_checkout() || \is_account_page();
 		}
 

diff --git a/includes/frontend/class-add-attributes.php b/includes/frontend/class-add-attributes.php
@@ -21,6 +21,7 @@
 /**
  * Add Attributes class.
  */
+#[\AllowDynamicProperties]
 class Add_Attributes {
 
 	use Hooker;

diff --git a/includes/helpers/class-conditional.php b/includes/helpers/class-conditional.php
@@ -20,7 +20,9 @@
  * Conditional class.
  */
 trait Conditional {
-
+
+	use WordPress;
+
 	/**
 	 * Check if whitelabel filter is active.
 	 *
@@ -43,7 +45,7 @@ public static function is_whitelabel() {
 	public static function is_ajax() {
 		return function_exists( 'wp_doing_ajax' ) ? wp_doing_ajax() : defined( 'DOING_AJAX' ) && DOING_AJAX;
 	}
-	
+
 	/**
 	 * Is CRON request
 	 *
@@ -52,7 +54,7 @@ public static function is_ajax() {
 	public static function is_cron() {
 		return function_exists( 'wp_doing_cron' ) ? wp_doing_cron() : defined( 'DOING_CRON' ) && DOING_CRON;
 	}
-	
+
 	/**
 	 * Is auto-saving
 	 *
@@ -61,7 +63,7 @@ public static function is_cron() {
 	public static function is_autosave() {
 		return defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE;
 	}
-	
+
 	/**
 	 * Is REST request
 	 *
@@ -103,8 +105,8 @@ public static function is_rest() {
 			0 === strpos( $current_url['path'], $rest_url['path'], 0 )
 		);
 	}
-	
-	
+
+
 	/**
 	 * Check if module is active.
 	 *
@@ -135,7 +137,7 @@ public static function is_configured( $value = null ) {
 		Helper::schedule_flush_rewrite();
 		update_option( $key, $value );
 	}
-	
+
 	/**
 	 * Check if the site is connected to the Classic SEO API.
 	 *
@@ -187,7 +189,7 @@ public static function is_score_enabled() {
 		 */
 		return apply_filters( 'cpseo/show_score', true );
 	}
-	
+
 	/**
 	 * Check if the request is heartbeat.
 	 *
@@ -196,7 +198,7 @@ public static function is_score_enabled() {
 	public static function is_heartbeat() {
 		return 'heartbeat' === Param::post( 'action' );
 	}
-	
+
 	/**
 	 * Check if the request is from frontend.
 	 *
@@ -215,22 +217,22 @@ public function is_frontend() {
 	 */
 	public static function is_woocommerce_active() {
 		// @codeCoverageIgnoreStart
-		$wp_filesystem = WordPress::get_filesystem();
-		
+		$wp_filesystem = self::get_filesystem();
+
 		if ( ! function_exists( 'is_plugin_active' ) ) {
 			include_once ABSPATH . 'wp-admin/includes/plugin.php';
 		}
 
 		/**
-		 * Check for additional proof that the real WC is installed and not the Classic Commerce compatibility plugin 
+		 * Check for additional proof that the real WC is installed and not the Classic Commerce compatibility plugin
 		 */
 		if( $wp_filesystem->exists( WP_PLUGIN_DIR . "/woocommerce/includes/class-woocommerce.php" ) && $wp_filesystem->exists( WP_PLUGIN_DIR . "/woocommerce/includes/admin/class-wc-admin.php" ) ) {
 			// @codeCoverageIgnoreEnd
 			return in_array( 'woocommerce/woocommerce.php', apply_filters( 'active_plugins', get_option( 'active_plugins' ) ) );
 		}
 		return false;
 	}
-	
+
 	/**
 	 * Is Classic Commerce Installed
 	 *

diff --git a/includes/helpers/class-wordpress.php b/includes/helpers/class-wordpress.php
@@ -344,7 +344,7 @@ private static function get_role_capabilities( $slug, $caps, &$data ) {
 			}
 		}
 	}
-	
+
 	/**
 	 * Set capabilities to role.
 	 *

diff --git a/includes/metaboxes/general.php b/includes/metaboxes/general.php
@@ -87,7 +87,7 @@
  * @param bool $return True to disable.
  */
 if ( false === $this->do_filter( 'primary_term', false ) ) {
-	$taxonomies = Helper::get_object_taxonomies( WordPress::get_post_type(), 'objects' );
+	$taxonomies = Helper::get_object_taxonomies( ( new class { use Wordpress; } )::get_post_type(), 'objects' );
 	$taxonomies = wp_filter_object_list( $taxonomies, array( 'hierarchical' => true ), 'and', 'name' );
 	foreach ( $taxonomies as $taxonomy ) {
 		$cmb->add_field( array(

diff --git a/includes/module/class-base.php b/includes/module/class-base.php
@@ -19,6 +19,7 @@
 /**
  * Base class.
  */
+#[\AllowDynamicProperties]
 class Base {
 
 	use Hooker;

diff --git a/includes/module/class-manager.php b/includes/module/class-manager.php
@@ -20,7 +20,7 @@
  */
 class Manager {
 
-	use Hooker;
+	use Hooker, Conditional;
 
 	/**
 	 * Holds modules.
@@ -40,7 +40,7 @@ class Manager {
 	 * The Constructor.
 	 */
 	public function __construct() {
-		if ( Conditional::is_heartbeat() ) {
+		if ( Manager::is_heartbeat() ) {
 			return;
 		}
 
@@ -193,7 +193,7 @@ public function setup_3rd_party( $modules ) {
 				'disabled_text' => esc_html__( 'Please activate ' . $ecom . ' plugin to use this module.', 'cpseo' ),
 			];
 		}
-		
+
 		if ( class_exists( 'ACF' ) ) {
 			$modules['acf'] = [
 				'title'         => esc_html__( 'ACF', 'cpseo' ),
@@ -244,9 +244,9 @@ public function display_form() {
 				<div class="col">
 
 					<div class="cpseo-box <?php echo $is_active ? 'active' : ''; ?>">
-					
+
 						<p style="float:right"><?php $module->the_link(); ?></p>
-						
+
 						<span class="dashicons <?php echo $module->get_icon(); ?>"></span>
 
 						<header>

diff --git a/includes/modules/404-monitor/class-monitor.php b/includes/modules/404-monitor/class-monitor.php
@@ -23,9 +23,10 @@
 /**
  * Monitor class.
  */
+#[\AllowDynamicProperties]
 class Monitor {
 
-	use Hooker, Ajax;
+	use Hooker, Ajax, Conditional;
 
 	/**
 	 * The Constructor.
@@ -37,7 +38,7 @@ public function __construct() {
 			$this->admin = new Admin;
 		}
 
-		if ( Conditional::is_ajax() ) {
+		if ( Monitor::is_ajax() ) {
 			$this->ajax( 'delete_log', 'delete_log' );
 		}
 

diff --git a/includes/modules/redirections/class-admin.php b/includes/modules/redirections/class-admin.php
@@ -28,7 +28,7 @@
  */
 class Admin extends Base {
 
-	use Ajax, Hooker;
+	use Ajax, Hooker, Conditional, WordPress;
 
 	/**
 	 * The Constructor.
@@ -89,7 +89,7 @@ private function load_metabox() {
 	 * Hooks for ajax.
 	 */
 	private function ajax_hooks() {
-		if ( ! Conditional::is_ajax() ) {
+		if ( ! Admin::is_ajax() ) {
 			return;
 		}
 
@@ -185,7 +185,7 @@ public function init() {
 			return;
 		}
 
-		$action = WordPress::get_request_action();
+		$action = Admin::get_request_action();
 		if ( false === $action || empty( $_REQUEST['redirection'] ) || 'edit' === $action ) {
 			return;
 		}
-Original file line number
+Diff line change
@@ Expand Up @@
     			}
     		}
     	}
     	/**
     	 * Set capabilities to role.
     	 *
@@ Expand Down @@