Merge branch 'release/1.18' into develop

languages/yoast-test-helper.pot

@@ -2,9 +2,9 @@
 # This file is distributed under the GPL v3.
 msgid ""
 msgstr ""
-"Project-Id-Version: Yoast Test Helper 1.18-RC5\n"
+"Project-Id-Version: Yoast Test Helper 1.18-RC6\n"
 "Report-Msgid-Bugs-To: https://github.com/yoast/yoast-test-helper/issues\n"
-"POT-Creation-Date: 2023-09-15 09:21:35+00:00\n"
+"POT-Creation-Date: 2023-11-25 17:35:44+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

package.json

@@ -19,6 +19,6 @@
   },
   "dependencies": {},
   "yoast": {
-    "pluginVersion": "1.18-RC5"
+    "pluginVersion": "1.18-RC6"
   }
 }

readme.txt

@@ -2,8 +2,8 @@
 Contributors: yoast, joostdevalk, omarreiss, jipmoors, herregroen
 Tags: Yoast, Yoast SEO, development
 Requires at least: 6.2
-Tested up to: 6.3
-Stable tag: 1.18-RC5
+Tested up to: 6.4
+Stable tag: 1.18-RC6
 Requires PHP: 7.2.5
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -46,11 +46,12 @@ Enhancements:
 Bugfixes:
 
 * Fixes a bug where the DB versions for Local SEO and News SEO would not be updated correctly.
+* Fixes some small bugs that could result in PHP notices/warnings/errors.
 
 Other:
 
 * Removes the checkbox to enable the feature flag for the structured data blocks.
-* Sets the WordPress tested up to version to 6.3.
+* Sets the WordPress tested up to version to 6.4.
 * Sets minimum WordPress version to 6.2.
 * Drops compatibility with PHP 5.6, 7.0 and 7.1.
 

src/admin-notifications.php

@@ -20,7 +20,7 @@ class Admin_Notifications implements Integration {
 	 * @return void
 	 */
 	public function add_hooks() {
-		\add_action( 'Yoast\WP\Test_Helper\notification', [ $this, 'add_notification' ], 10, 2 );
+		\add_action( 'Yoast\WP\Test_Helper\notification', [ $this, 'add_notification' ] );
 		\add_action( 'Yoast\WP\Test_Helper\notifications', [ $this, 'display_notifications' ] );
 	}
 

src/admin-page.php

@@ -44,7 +44,7 @@ public function add_assets() {
 		\wp_enqueue_style(
 			'yoast-test-admin-style',
 			\plugin_dir_url( \YOAST_TEST_HELPER_FILE ) . 'assets/css/admin.css',
-			null,
+			[],
 			\YOAST_TEST_HELPER_VERSION
 		);
 		\wp_enqueue_script( 'masonry' );

src/downgrader.php

@@ -151,7 +151,7 @@ protected function downgrade( $target_version ) {
 				$adapter->remove_version( $version );
 				$adapter->commit_transaction();
 			} catch ( Exception $e ) {
-				$this->adapter->rollback_transaction();
+				$adapter->rollback_transaction();
 
 				throw new Exception(
 					\sprintf(

src/feature-toggler.php

@@ -36,7 +36,7 @@ public function __construct( Option $option ) {
 	 * @return void
 	 */
 	public function add_hooks() {
-		\add_action( 'wpseo_enable_feature', [ $this, 'enable_features' ] );
+		\add_filter( 'wpseo_enable_feature', [ $this, 'enable_features' ] );
 
 		\add_action(
 			'admin_post_yoast_seo_feature_toggler',

src/plugin-toggler.php

@@ -394,7 +394,7 @@ private function activate_plugin( $group, $plugin ) {
 		}
 
 		$plugin_path = $this->plugin_groups[ $group ][ $plugin ];
-		\activate_plugin( \plugin_basename( $plugin_path ), null, false, true );
+		\activate_plugin( \plugin_basename( $plugin_path ), '', false, true );
 	}
 
 	/**
@@ -431,6 +431,8 @@ private function verify_nonce() {
 		if ( isset( $_GET['ajax_nonce'] ) && \wp_verify_nonce( $_GET['ajax_nonce'], 'yoast-plugin-toggle' ) ) {
 			return true;
 		}
+
+		return false;
 	}
 
 	/**

yoast-test-helper.php

@@ -8,7 +8,7 @@
  *
  * @wordpress-plugin
  * Plugin Name: Yoast Test Helper
- * Version:     1.18-RC5
+ * Version:     1.18-RC6
  * Plugin URI:  https://github.com/yoast/yoast-test-helper
  * Description: Utility to provide testing features for Yoast plugins.
  * Author:      Team Yoast
@@ -35,7 +35,7 @@
 
 define( 'YOAST_TEST_HELPER_FILE', __FILE__ );
 define( 'YOAST_TEST_HELPER_DIR', dirname( YOAST_TEST_HELPER_FILE ) );
-define( 'YOAST_TEST_HELPER_VERSION', '1.18-RC5' );
+define( 'YOAST_TEST_HELPER_VERSION', '1.18-RC6' );
 
 if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
 	require __DIR__ . '/vendor/autoload.php';