This commit is contained in:
Mike Jolley 2017-02-14 19:23:57 +00:00
parent 17e8ea8236
commit e0d1cfc7b0
4 changed files with 146 additions and 9 deletions

View File

@ -23,7 +23,8 @@ abstract class WC_Deprecated_Hooks {
* Constructor. * Constructor.
*/ */
public function __construct() { public function __construct() {
array_walk( array_keys( $this->deprecated_hooks ), array( $this, 'hook_in' ) ); $new_hooks = array_keys( $this->deprecated_hooks );
array_walk( $new_hooks, array( $this, 'hook_in' ) );
} }
/** /**
@ -89,5 +90,5 @@ abstract class WC_Deprecated_Hooks {
* @param array $new_callback_args * @param array $new_callback_args
* @return mixed * @return mixed
*/ */
abstract function trigger_hook( $old_hook, $new_callback_args ); abstract protected function trigger_hook( $old_hook, $new_callback_args );
} }

View File

@ -201,13 +201,8 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
// If ID changed (new item saved to DB)... // If ID changed (new item saved to DB)...
if ( $item_id !== $item_key ) { if ( $item_id !== $item_key ) {
$this->items[ $item_group ][ $item_id ] = $item; $this->items[ $item_group ][ $item_id ] = $item;
unset( $this->items[ $item_group ][ $item_key ] );
// Fire an action for the new item in the database. This is used for firing legacy hooks in particular. unset( $this->items[ $item_group ][ $item_key ] );
do_action( 'woocommerce_order_item_created', $item, $this );
} else {
// Fire an action for the new item in the database. This is used for firing legacy hooks in particular.
do_action( 'woocommerce_order_item_updated', $item, $this );
} }
} }
} }

View File

@ -0,0 +1,141 @@
<?php
if ( ! defined( 'ABSPATH' ) ) {
exit;
}
/**
* Handles deprecation notices and triggering of legacy action hooks.
*
* @since 2.7.0
*/
class WC_Deprecated_Action_Hooks extends WC_Deprecated_Hooks {
/**
* Array of deprecated hooks we need to handle.
*
* @var array
*/
protected $deprecated_hooks = array(
'woocommerce_new_order_item' => array(
'woocommerce_order_add_shipping',
'woocommerce_order_add_coupon',
'woocommerce_order_add_tax',
'woocommerce_order_add_fee',
'woocommerce_add_shipping_order_item',
'woocommerce_add_order_item_meta',
'woocommerce_add_order_fee_meta',
),
'woocommerce_update_order_item' => array(
'woocommerce_order_edit_product',
'woocommerce_order_update_coupon',
'woocommerce_order_update_shipping',
'woocommerce_order_update_fee',
'woocommerce_order_update_tax',
),
);
/**
* Hook into the new hook so we can handle deprecated hooks once fired.
* @param string $hook_name
*/
public function hook_in( $hook_name ) {
add_action( $hook_name, array( $this, 'maybe_handle_deprecated_hook' ), -1000, 8 );
}
/**
* If the old hook is in-use, trigger it.
*
* @param string $new_hook
* @param string $old_hook
* @param array $new_callback_args
* @param mixed $return_value
* @return mixed
*/
public function handle_deprecated_hook( $new_hook, $old_hook, $new_callback_args, $return_value ) {
if ( has_action( $old_hook ) ) {
$this->display_notice( $old_hook, $new_hook );
$return_value = $this->trigger_hook( $old_hook, $new_callback_args );
}
return $return_value;
}
/**
* Fire off a legacy hook with it's args.
*
* @param string $old_hook
* @param array $new_callback_args
* @return mixed
*/
protected function trigger_hook( $old_hook, $new_callback_args ) {
switch ( $old_hook ) {
case 'woocommerce_order_add_shipping' :
case 'woocommerce_order_add_fee' :
$item_id = $new_callback_args[0];
$item = $new_callback_args[1];
$order_id = $new_callback_args[2];
if ( is_a( $item, 'WC_Order_Item_Shipping' ) || is_a( $item, 'WC_Order_Item_Fee' ) ) {
do_action( $old_hook, $order_id, $item_id, $item );
}
break;
case 'woocommerce_order_add_coupon' :
$item_id = $new_callback_args[0];
$item = $new_callback_args[1];
$order_id = $new_callback_args[2];
if ( is_a( $item, 'WC_Order_Item_Coupon' ) ) {
do_action( $old_hook, $order_id, $item_id, $item->get_code(), $item->get_discount(), $item->get_discount_tax() );
}
break;
case 'woocommerce_order_add_tax' :
$item_id = $new_callback_args[0];
$item = $new_callback_args[1];
$order_id = $new_callback_args[2];
if ( is_a( $item, 'WC_Order_Item_Tax' ) ) {
do_action( $old_hook, $order_id, $item_id, $item->get_rate_id(), $item->get_tax_total(), $item->get_shipping_tax_total() );
}
break;
case 'woocommerce_add_shipping_order_item' :
$item_id = $new_callback_args[0];
$item = $new_callback_args[1];
$order_id = $new_callback_args[2];
if ( is_a( $item, 'WC_Order_Item_Shipping' ) ) {
do_action( $old_hook, $order_id, $item_id, $item->legacy_package_key );
}
break;
case 'woocommerce_add_order_item_meta' :
$item_id = $new_callback_args[0];
$item = $new_callback_args[1];
$order_id = $new_callback_args[2];
if ( is_a( $item, 'WC_Order_Item_Product' ) ) {
do_action( $old_hook, $item_id, $item->legacy_values, $item->legacy_cart_item_key );
}
break;
case 'woocommerce_add_order_fee_meta' :
$item_id = $new_callback_args[0];
$item = $new_callback_args[1];
$order_id = $new_callback_args[2];
if ( is_a( $item, 'WC_Order_Item_Fee' ) ) {
do_action( $old_hook, $order_id, $item_id, $item->legacy_fee, $item->legacy_fee_key );
}
break;
case 'woocommerce_order_edit_product' :
$item_id = $new_callback_args[0];
$item = $new_callback_args[1];
$order_id = $new_callback_args[2];
if ( is_a( $item, 'WC_Order_Item_Product' ) ) {
do_action( $old_hook, $order_id, $item_id, $item, $item->get_product() );
}
break;
case 'woocommerce_order_update_coupon' :
case 'woocommerce_order_update_shipping' :
case 'woocommerce_order_update_fee' :
case 'woocommerce_order_update_tax' :
if ( ! is_a( $item, 'WC_Order_Item_Product' ) ) {
do_action( $old_hook, $order_id, $item_id, $item );
}
break;
default :
do_action_ref_array( $old_hook, $new_callback_args );
break;
}
}
}

View File

@ -84,6 +84,6 @@ class WC_Deprecated_Filter_Hooks extends WC_Deprecated_Hooks {
* @return mixed * @return mixed
*/ */
protected function trigger_hook( $old_hook, $new_callback_args ) { protected function trigger_hook( $old_hook, $new_callback_args ) {
apply_filters_ref_array( $old_hook, $new_callback_args ); return apply_filters_ref_array( $old_hook, $new_callback_args );
} }
} }