Merged in feature/314-dev-dev01 (pull request #24)

auto-patch  314-dev-dev01-2024-01-25T04_09_02

* auto-patch  314-dev-dev01-2024-01-25T04_09_02

wp/wp-content/plugins/wordpress-seo/admin/ajax/class-yoast-plugin-conflict-ajax.php

@@ -33,6 +33,8 @@ class Yoast_Plugin_Conflict_Ajax {
 
 	/**
 	 * Handles the dismiss notice request.
+	 *
+	 * @return void
 	 */
 	public function dismiss_notice() {
 		check_ajax_referer( 'dismiss-plugin-conflict' );
@@ -89,6 +91,8 @@ class Yoast_Plugin_Conflict_Ajax {
 	 * Storing the conflicting plugins as an user option in the database.
 	 *
 	 * @param string $plugin_section Plugin conflict type (such as Open Graph or sitemap).
+	 *
+	 * @return void
 	 */
 	private function save_dismissed_conflicts( $plugin_section ) {
 		$dismissed_conflicts = $this->get_dismissed_option();
@@ -102,6 +106,8 @@ class Yoast_Plugin_Conflict_Ajax {
 	 * Loop through the plugins to compare them with the already stored dismissed plugin conflicts.
 	 *
 	 * @param array $posted_plugins Plugin set to check.
+	 *
+	 * @return void
 	 */
 	public function compare_plugins( array $posted_plugins ) {
 		foreach ( $posted_plugins as $posted_plugin ) {
@@ -113,6 +119,8 @@ class Yoast_Plugin_Conflict_Ajax {
 	 * Check if plugin is already dismissed, if not store it in the array that will be saved later.
 	 *
 	 * @param string $posted_plugin Plugin to check against dismissed conflicts.
+	 *
+	 * @return void
 	 */
 	private function compare_plugin( $posted_plugin ) {
 		if ( ! in_array( $posted_plugin, $this->dismissed_conflicts, true ) ) {