From ec490409ea7c34f674b42c7be023d3616201c799 Mon Sep 17 00:00:00 2001
From: vedanshujain <vedanshu.jain.2012@gmail.com>
Date: Tue, 15 Oct 2019 15:15:34 +0530
Subject: [PATCH] Refactor to use constant so that we have easy way to reset
 admin notice version

---
 includes/admin/class-wc-admin-notices.php     | 34 ++++++++++++-------
 ...tml-notice-wp-php-minimum-requirements.php |  2 +-
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/includes/admin/class-wc-admin-notices.php b/includes/admin/class-wc-admin-notices.php
index 84116f1dd21..471945f1908 100644
--- a/includes/admin/class-wc-admin-notices.php
+++ b/includes/admin/class-wc-admin-notices.php
@@ -8,6 +8,14 @@
 
 defined( 'ABSPATH' ) || exit;
 
+/**
+ * Name for notice for showing minimum version requirements. Change value to invalidate previous dismissals when requirement changes in future.
+ * Last changed in 3.8.
+ *
+ * @since 3.8.0.
+ */
+define( 'WC_PHP_MIN_REQUIREMENTS_NOTICE', 'wp_php_min_requirements_3_8' );
+
 /**
  * WC_Admin_Notices Class.
  */
@@ -26,16 +34,16 @@ class WC_Admin_Notices {
 	 * @var array
 	 */
 	private static $core_notices = array(
-		'install'                   => 'install_notice',
-		'update'                    => 'update_notice',
-		'template_files'            => 'template_file_check_notice',
-		'legacy_shipping'           => 'legacy_shipping_notice',
-		'no_shipping_methods'       => 'no_shipping_methods_notice',
-		'regenerating_thumbnails'   => 'regenerating_thumbnails_notice',
-		'regenerating_lookup_table' => 'regenerating_lookup_table_notice',
-		'no_secure_connection'      => 'secure_connection_notice',
-		'wc_admin'                  => 'wc_admin_feature_plugin_notice',
-		'wp_php_min_requirements'   => 'wp_php_min_requirements_notice',
+		'install'                      => 'install_notice',
+		'update'                       => 'update_notice',
+		'template_files'               => 'template_file_check_notice',
+		'legacy_shipping'              => 'legacy_shipping_notice',
+		'no_shipping_methods'          => 'no_shipping_methods_notice',
+		'regenerating_thumbnails'      => 'regenerating_thumbnails_notice',
+		'regenerating_lookup_table'    => 'regenerating_lookup_table_notice',
+		'no_secure_connection'         => 'secure_connection_notice',
+		'wc_admin'                     => 'wc_admin_feature_plugin_notice',
+		WC_PHP_MIN_REQUIREMENTS_NOTICE => 'wp_php_min_requirements_notice',
 	);
 
 	/**
@@ -380,7 +388,7 @@ class WC_Admin_Notices {
 	 */
 	public static function add_min_version_notice() {
 		if ( version_compare( phpversion(), WC_NOTICE_MIN_PHP_VERSION, '<' ) || version_compare( get_bloginfo( 'version' ), WC_NOTICE_MIN_WP_VERSION, '<' ) ) {
-			self::add_notice( 'wp_php_min_requirements' );
+			self::add_notice( WC_PHP_MIN_REQUIREMENTS_NOTICE );
 		}
 	}
 
@@ -391,8 +399,8 @@ class WC_Admin_Notices {
 	 * @return void
 	 */
 	public static function wp_php_min_requirements_notice() {
-		if ( apply_filters( 'woocommerce_hide_php_wp_nag', get_user_meta( get_current_user_id(), 'dismissed_wp_php_min_requirements_notice', true ) ) ) {
-			self::remove_notice( 'wp_php_min_requirements' );
+		if ( apply_filters( 'woocommerce_hide_php_wp_nag', get_user_meta( get_current_user_id(), 'dismissed_' . WC_PHP_MIN_REQUIREMENTS_NOTICE . '_notice', true ) ) ) {
+			self::remove_notice( WC_PHP_MIN_REQUIREMENTS_NOTICE );
 			return;
 		}
 
diff --git a/includes/admin/views/html-notice-wp-php-minimum-requirements.php b/includes/admin/views/html-notice-wp-php-minimum-requirements.php
index e39a6cdf005..e5201104fdb 100644
--- a/includes/admin/views/html-notice-wp-php-minimum-requirements.php
+++ b/includes/admin/views/html-notice-wp-php-minimum-requirements.php
@@ -8,7 +8,7 @@
 defined( 'ABSPATH' ) || exit;
 ?>
 <div id="message" class="updated woocommerce-message">
-	<a class="woocommerce-message-close notice-dismiss" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc-hide-notice', 'wp_php_min_requirements' ), 'woocommerce_hide_notices_nonce', '_wc_notice_nonce' ) ); ?>"><?php esc_html_e( 'Dismiss', 'woocommerce' ); ?></a>
+	<a class="woocommerce-message-close notice-dismiss" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc-hide-notice', WC_PHP_MIN_REQUIREMENTS_NOTICE ), 'woocommerce_hide_notices_nonce', '_wc_notice_nonce' ) ); ?>"><?php esc_html_e( 'Dismiss', 'woocommerce' ); ?></a>
 
 	<p>
 		<?php