From 524f37a78891077c04b6d49b96dac29978e8c04c Mon Sep 17 00:00:00 2001
From: Nathaniel Fenton <nathinabob@gmail.com>
Date: Thu, 27 May 2021 16:49:46 +0100
Subject: [PATCH 1/2] fix: return -1, 0, 1 from uksort and uasort callbacks

---
 archive-template.php          | 2 +-
 dt-contacts/access-module.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/archive-template.php b/archive-template.php
index 65a2b55f6c..09f3b75dac 100644
--- a/archive-template.php
+++ b/archive-template.php
@@ -459,7 +459,7 @@ class="second-bar show-for-small-only center list-actions-bar"><!--  /* MOBILE V
                                             if ( isset( $b["show_in_table"] ) ){
                                                 $b_order = is_numeric( $b["show_in_table"] ) ? $b["show_in_table"] : 90;
                                             }
-                                            return $a_order > $b_order;
+                                            return $a_order <=> $b_order;
                                         });
                                         foreach ( $post_settings["fields"] as $field_key => $field_value ){
                                             if ( ( isset( $field_value["show_in_table"] ) && $field_value["show_in_table"] ) ){
diff --git a/dt-contacts/access-module.php b/dt-contacts/access-module.php
index 4e3f237d6c..2994972eba 100644
--- a/dt-contacts/access-module.php
+++ b/dt-contacts/access-module.php
@@ -348,7 +348,7 @@ public function dt_custom_fields_settings( $fields, $post_type ){
 
             //order overall status options
             uksort( $declared_fields["overall_status"]["default"], function ( $a, $b ) use ( $fields ){
-                return array_search( $a, array_keys( $fields["overall_status"]["default"] ) ) > array_search( $b, array_keys( $fields["overall_status"]["default"] ) );
+                return array_search( $a, array_keys( $fields["overall_status"]["default"] ) ) <=> array_search( $b, array_keys( $fields["overall_status"]["default"] ) );
             } );
             $fields = $declared_fields;
         }

From 96ea022b59ae8a5c46dc088550d9e0b3b02bf160 Mon Sep 17 00:00:00 2001
From: Nathaniel Fenton <nathinabob@gmail.com>
Date: Thu, 27 May 2021 17:16:39 +0100
Subject: [PATCH 2/2] fix: deprecated parameter order from PHP8

---
 .../posts-to-posts/vendor/scribu/scb-framework/Cron.php     | 6 +++++-
 .../posts-to-posts/vendor/scribu/scb-framework/Forms.php    | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dt-core/libraries/posts-to-posts/vendor/scribu/scb-framework/Cron.php b/dt-core/libraries/posts-to-posts/vendor/scribu/scb-framework/Cron.php
index 27341bf1bd..4cdc553107 100644
--- a/dt-core/libraries/posts-to-posts/vendor/scribu/scb-framework/Cron.php
+++ b/dt-core/libraries/posts-to-posts/vendor/scribu/scb-framework/Cron.php
@@ -21,7 +21,11 @@ class scbCron {
 	 *
 	 * @return void
 	 */
-	public function __construct( $file = false, $args ) {
+	public function __construct( $file = false, $args = array() ) {
+
+		if ( empty( $args ) ) {
+			return;
+		}
 
 		// Set time & schedule
 		if ( isset( $args['time'] ) ) {
diff --git a/dt-core/libraries/posts-to-posts/vendor/scribu/scb-framework/Forms.php b/dt-core/libraries/posts-to-posts/vendor/scribu/scb-framework/Forms.php
index 241c485789..f84b4b72c1 100644
--- a/dt-core/libraries/posts-to-posts/vendor/scribu/scb-framework/Forms.php
+++ b/dt-core/libraries/posts-to-posts/vendor/scribu/scb-framework/Forms.php
@@ -62,7 +62,7 @@ public static function form_table( $rows, $formdata = null ) {
 	 *
 	 * @return string
 	 */
-	public static function form( $inputs, $formdata = null, $nonce ) {
+	public static function form( $inputs, $formdata = null, $nonce = 'update_options' ) {
 		$output = '';
 		foreach ( $inputs as $input ) {
 			$output .= self::input( $input, $formdata );
@@ -1045,4 +1045,3 @@ public function validate( $value ) {
 		return call_user_func( $this->sanitize, $value, $this );
 	}
 }
-