Fix the merge conflicts

.editorconfig

@@ -1,5 +1,5 @@
-# This file is for unifying the coding style for different editors and IDEs.
-# It is based on https://core.trac.wordpress.org/browser/trunk/.editorconfig.
+# This file is for unifying the coding style for different editors and IDEs
+# It is based on https://core.trac.wordpress.org/browser/trunk/.editorconfig
 # See https://editorconfig.org for more information about the standard.
 
 # WordPress Coding Standards
@@ -14,12 +14,12 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 indent_style = tab
 
-[*.yml]
+[{*.yml,*.feature}]
 indent_style = space
 indent_size = 2
 
 [*.md]
 trim_trailing_whitespace = false
 
 [*.txt]
-end_of_line = crlf
+end_of_line = crlf

.github/workflows/behat-test.yml

@@ -0,0 +1,27 @@
+name: Behat Testing
+
+on:
+  push:
+    paths:
+      - '.github/workflows/behat-test.yml'
+      - '**.php'
+      - '**.feature'
+      - 'behat.yml'
+      - 'composer.json'
+  pull_request:
+    paths:
+      - '.github/workflows/behat-test.yml'
+      - '**.php'
+      - '**.feature'
+      - 'behat.yml'
+      - 'composer.json'
+    types:
+      - opened
+      - reopened
+      - synchronize
+
+  workflow_dispatch:
+
+jobs:
+  behat:
+    uses: automattic/wpvip-plugins-.github/.github/workflows/reusable-behat-test.yml@trunk

README.md

@@ -51,6 +51,12 @@ For support questions, feedback and ideas, please use the [WordPress.org forums]
 
 ## Upgrade Notice
 
+**0.9.8**
+PHP 8.2 compatible with various bug fixes
+
+**0.9.7**
+PHP 8 compatible now with various bug fixes
+
 **0.9.6**
 Fix bug around post save, bring Gutenberg to Calendar filters
 
@@ -122,6 +128,19 @@ New features, including story budget and editorial metadata, a completely rewrit
 
 ## Changelog
 
+**0.9.7 (August 26, 2022)**
+* Bug fix: Allow scheduled posts to be shifted around on calendar (https://github.com/Automattic/Edit-Flow/pull/614)
+* Bug fix: Add back unpublish status, small css tweak for statuses (https://github.com/Automattic/Edit-Flow/pull/613)
+* Enhancements: Renaming some frontend calendar configuration variable (https://github.com/Automattic/Edit-Flow/pull/615)
+* Bug fix: Swap join() with implode() for PHP 8 compatibility (https://github.com/Automattic/Edit-Flow/pull/627)
+* Enhancements: Give each attribute in Edit Flow settings page a different id (https://github.com/Automattic/Edit-Flow/pull/650)
+* Bug fix: Fix test_story_budget_set_number_days_filter_invalid in PHP 8.0 (https://github.com/Automattic/Edit-Flow/pull/644)
+* Bug fix: Allow updating post slugs in Quick Edit and Classic Editor with a different status from published (https://github.com/Automattic/Edit-Flow/pull/648)
+* Bug fix: Fix jQuery warnings as WordPress upgraded it from 1.12.4-wp to 3.5.1 (https://github.com/Automattic/Edit-Flow/pull/649)
+* Enhancements: Remove redundant jQuery selector #the-list a.editinline (https://github.com/Automattic/Edit-Flow/pull/668)
+* Enhancements: Remove redundant jQuery selector #toggle_details (https://github.com/Automattic/Edit-Flow/pull/669)
+* Bug fix: Fixes non-variable being passed by reference (https://github.com/Automattic/Edit-Flow/pull/667)
+
 **0.9.6 (April 26, 2020)**
 * Bug fix: Fix bug causing error on save button click for post after hovering over button (https://github.com/Automattic/Edit-Flow/pull/604)
 * Enhancements: Bring Gutenebrg to Calendar filters (https://github.com/Automattic/Edit-Flow/pull/603)

common/php/class-module.php

@@ -15,6 +15,10 @@ class EF_Module {
 		'private',
 	);
 
+	public $module_url;
+
+	public $module;
+
 	function __construct() {}
 
 	/**
@@ -437,7 +441,7 @@ function timesince( $original ) {
 			}
 		}
 
-		return sprintf( _n( "1 $name ago", "$count ${name}s ago", $count), $count);
+		return sprintf( _n( "1 $name ago", "$count {$name}s ago", $count), $count);
 	}
 
 	/**
@@ -461,7 +465,7 @@ function users_select_form( $selected = null, $args = null ) {
 		extract($parsed_args, EXTR_SKIP);
 
 		$args = array(
-			'who' => 'authors',
+			'capability' => 'publish_posts',
 			'fields' => array(
 				'ID',
 				'display_name',
@@ -478,7 +482,7 @@ function users_select_form( $selected = null, $args = null ) {
 
 		<?php if( !empty($users) ) : ?>
 			<ul class="<?php echo esc_attr( $list_class ) ?>">
-				<?php foreach( $users as $user ) : 
+				<?php foreach( $users as $user ) :
 					$checked = ( in_array($user->ID, $selected) ) ? 'checked="checked"' : '';
 					// Add a class to checkbox of current user so we know not to add them in notified list during notifiedMessage() js function
 					$current_user_class = ( get_current_user_id() == $user->ID ) ? 'class="post_following_list-current_user" ' : '';

edit_flow.php

@@ -4,7 +4,7 @@
 Plugin URI: http://editflow.org/
 Description: Remixing the WordPress admin for better editorial workflow options.
 Author: Daniel Bachhuber, Scott Bressler, Mohammad Jangda, Automattic, and others
-Version: 0.9.6
+Version: 0.9.8
 Author URI: http://editflow.org/
 
 Copyright 2009-2019 Mohammad Jangda, Daniel Bachhuber, Automattic, et al.
@@ -46,13 +46,14 @@ function _ef_print_php_version_admin_notice() {
 }
 
 // Define contants
-define( 'EDIT_FLOW_VERSION' , '0.9.6' );
+define( 'EDIT_FLOW_VERSION' , '0.9.8' );
 define( 'EDIT_FLOW_ROOT' , dirname(__FILE__) );
 define( 'EDIT_FLOW_FILE_PATH' , EDIT_FLOW_ROOT . '/' . basename(__FILE__) );
 define( 'EDIT_FLOW_URL' , plugins_url( '/', __FILE__ ) );
 define( 'EDIT_FLOW_SETTINGS_PAGE' , add_query_arg( 'page', 'ef-settings', get_admin_url( null, 'admin.php' ) ) );
 
 // Core class
+#[\AllowDynamicProperties]
 class edit_flow {
 
 	// Unique identified added as a prefix to all options
@@ -64,6 +65,25 @@ class edit_flow {
 	 */
 	private static $instance;
 
+	/**
+	 * Active modules.
+	 *
+	 * @var \stdClass
+	 */
+	public $modules;
+
+	/**
+	 * Number of active modules.
+	 *
+	 * @var int
+	 */
+	public $modules_count;
+
+	/**
+	 * @var EF_Module
+	 */
+	public $helpers;
+
 	/**
 	 * Main EditFlow Instance
 	 *