diff --git a/CHANGELOG.md b/CHANGELOG.md index 53c133908e..6c19ac8a53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 #### Fixed - [Fix paypal exception causing fatal on PHP7.4 (#1071)](https://github.com/eventespresso/cafe/pull/1071) + - [Remove mixed return and parameter type (available in PHP8) (#1073)](https://github.com/eventespresso/cafe/pull/1073) + - [Dont set type properties of ?EEM_Base (#1074)](https://github.com/eventespresso/cafe/pull/1074) + ### [5.0.13] diff --git a/PaymentMethods/PayPalCommerce/modules/EED_PayPalOnboard.module.php b/PaymentMethods/PayPalCommerce/modules/EED_PayPalOnboard.module.php index a294428d70..36521c1017 100644 --- a/PaymentMethods/PayPalCommerce/modules/EED_PayPalOnboard.module.php +++ b/PaymentMethods/PayPalCommerce/modules/EED_PayPalOnboard.module.php @@ -335,7 +335,7 @@ public static function updateOnboardingStatus(): void * @param mixed $paypal_pm * @return bool */ - public static function onboardingStatusResponseValid(array $data, mixed $paypal_pm): bool + public static function onboardingStatusResponseValid(array $data, $paypal_pm): bool { // Check that we have all the required parameters and the nonce is ok. if ($paypal_pm instanceof EE_Payment_Method diff --git a/PaymentMethods/PayPalCommerce/tools/extra_meta/PayPalExtraMetaManager.php b/PaymentMethods/PayPalCommerce/tools/extra_meta/PayPalExtraMetaManager.php index f50b01554f..6d90be5d1e 100644 --- a/PaymentMethods/PayPalCommerce/tools/extra_meta/PayPalExtraMetaManager.php +++ b/PaymentMethods/PayPalCommerce/tools/extra_meta/PayPalExtraMetaManager.php @@ -29,7 +29,7 @@ class PayPalExtraMetaManager * @param string $option_name * @return mixed */ - public static function getPmOption(EE_Payment_Method $paypal_pm, string $option_name): mixed + public static function getPmOption(EE_Payment_Method $paypal_pm, string $option_name) { $pp_meta_data = self::extraMeta($paypal_pm); $option_value = $pp_meta_data->getOption($option_name); diff --git a/core/EE_Capabilities.core.php b/core/EE_Capabilities.core.php index de6e094f6c..f15710b7a5 100644 --- a/core/EE_Capabilities.core.php +++ b/core/EE_Capabilities.core.php @@ -991,7 +991,10 @@ public function init_role_caps(bool $reset = false, array $caps_map = []) */ abstract class EE_Meta_Capability_Map { - protected ?EEM_Base $_model = null; + /** + * @var EEM_Base + */ + protected $_model = null; protected string $_model_name = ''; diff --git a/espresso.php b/espresso.php index 10dd3372db..6f97076f32 100644 --- a/espresso.php +++ b/espresso.php @@ -3,7 +3,7 @@ Plugin Name:Event Espresso Plugin URI: https://eventespresso.com/pricing/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=wordpress_plugins_page&utm_content=support_link Description: Manage events, sell tickets, and receive payments from your WordPress website. Reduce event administration time, cut-out ticketing fees, and own your customer data. | Extensions | Sales | Support - Version: 5.0.15.rc.000 + Version: 5.0.14.rc.005 Author: Event Espresso Author URI: http://eventespresso.com/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=wordpress_plugins_page&utm_content=support_link License: GPLv3 @@ -104,7 +104,7 @@ function espresso_minimum_php_version_error() */ function espresso_version(): string { - return apply_filters('FHEE__espresso__espresso_version', '5.0.15.rc.000'); + return apply_filters('FHEE__espresso__espresso_version', '5.0.14.rc.005'); } /**