Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10579 from justinshreve/add-meta-data-keys 

Fix array key/meta id logic in WC_Data's meta handling
This commit is contained in:
Mike Jolley 2016-03-22 14:14:07 +00:00
parent a259bd3841 705213d4f5
commit 2b3083ae2f
2 changed files with 54 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
includes/abstracts/abstract-wc-data.php
View File

@ -140,14 +140,14 @@ abstract class WC_Data {
* @return mixed * @return mixed
*/ */
public function get_meta( $key = '', $single = true ) { public function get_meta( $key = '', $single = true ) {
$meta_ids = array_keys( wp_list_pluck( $this->_meta_data, 'key' ), $key ); $array_keys = array_keys( wp_list_pluck( $this->_meta_data, 'key' ), $key );
$value = ''; $value = '';
if ( $meta_ids ) { if ( $array_keys ) {
if ( $single ) { if ( $single ) {
$value = $this->_meta_data[ current( $meta_ids ) ]->value; $value = $this->_meta_data[ current( $array_keys ) ]->value;
} else { } else {
$value = array_intersect_key( $this->_meta_data, array_flip( $meta_ids ) ); $value = array_intersect_key( $this->_meta_data, array_flip( $array_keys ) );
} }
} }
@ -161,12 +161,13 @@ abstract class WC_Data {
*/ */
public function set_meta_data( $data ) { public function set_meta_data( $data ) {
if ( ! empty( $data ) && is_array( $data ) ) { if ( ! empty( $data ) && is_array( $data ) ) {
foreach ( $data as $meta_id => $meta ) { foreach ( $data as $meta ) {
$meta = (array) $meta; $meta = (array) $meta;
if ( isset( $meta['key'], $meta['value'] ) ) { if ( isset( $meta['key'], $meta['value'], $meta['meta_id'] ) ) {
$this->_meta_data[ $meta_id ] = (object) array( $this->_meta_data[] = (object) array(
'key' => $meta['key'], 'key' => $meta['key'],
'value' => $meta['value'], 'value' => $meta['value'],
'meta_id' => $meta['meta_id'],
); );
} }
} }
@ -182,10 +183,10 @@ abstract class WC_Data {
*/ */
public function add_meta_data( $key, $value, $unique = false ) { public function add_meta_data( $key, $value, $unique = false ) {
if ( $unique ) { if ( $unique ) {
$meta_ids = array_keys( wp_list_pluck( $this->_meta_data, 'key' ), $key ); $array_keys = array_keys( wp_list_pluck( $this->_meta_data, 'key' ), $key );
$this->_meta_data = array_diff_key( $this->_meta_data, array_fill_keys( $meta_ids, '' ) ); $this->_meta_data = array_diff_key( $this->_meta_data, array_fill_keys( $array_keys, '' ) );
} }
$this->_meta_data[ 'new-' . sizeof( $this->_meta_data ) ] = (object) array( $this->_meta_data[] = (object) array(
'key' => $key, 'key' => $key,
'value' => $value, 'value' => $value,
); );
@ -199,10 +200,15 @@ abstract class WC_Data {
* @param int $meta_id * @param int $meta_id
*/ */
public function update_meta_data( $key, $value, $meta_id = '' ) { public function update_meta_data( $key, $value, $meta_id = '' ) {
if ( $meta_id && isset( $this->_meta_data[ $meta_id ] ) ) { $array_key = '';
$this->_meta_data[ $meta_id ] = (object) array( if ( $meta_id ) {
'key' => $key, $array_key = array_keys( wp_list_pluck( $this->_meta_data, 'meta_id' ), $meta_id );
'value' => $value, }
if ( $array_key ) {
$this->_meta_data[ current( $array_key ) ] = (object) array(
'key' => $key,
'value' => $value,
'meta_id' => $meta_id,
); );
} else { } else {
$this->add_meta_data( $key, $value, true ); $this->add_meta_data( $key, $value, true );
@ -215,8 +221,8 @@ abstract class WC_Data {
* @param array $key Meta key * @param array $key Meta key
*/ */
public function delete_meta_data( $key ) { public function delete_meta_data( $key ) {
$meta_ids = array_keys( wp_list_pluck( $this->_meta_data, 'key' ), $key ); $array_keys = array_keys( wp_list_pluck( $this->_meta_data, 'key' ), $key );
$this->_meta_data = array_diff_key( $this->_meta_data, array_fill_keys( $meta_ids, '' ) ); $this->_meta_data = array_diff_key( $this->_meta_data, array_fill_keys( $array_keys, '' ) );
} }
/** /**
@ -254,8 +260,11 @@ abstract class WC_Data {
if ( in_array( $meta->meta_key, $this->get_internal_meta_keys() ) ) { if ( in_array( $meta->meta_key, $this->get_internal_meta_keys() ) ) {
continue; continue;
} }
$this->_meta_data[] = (object) array(
$this->_meta_data[ $meta->{$db_info['meta_id_field']} ] = (object) array( 'key' => $meta->meta_key, 'value' => $meta->meta_value ); 'key' => $meta->meta_key,
'value' => $meta->meta_value,
'meta_id' => $meta->{ $db_info['meta_id_field'] },
);
} }
if ( ! empty ( $this->_cache_group ) ) { if ( ! empty ( $this->_cache_group ) ) {
@ -278,12 +287,14 @@ abstract class WC_Data {
" ) ); " ) );
$set_meta_ids = array(); $set_meta_ids = array();
foreach ( $this->_meta_data as $meta_id => $meta ) { foreach ( $this->_meta_data as $array_key => $meta ) {
if ( 'new' === substr( $meta_id, 0, 3 ) ) { if ( empty( $meta->meta_id ) ) {
$set_meta_ids[] = add_metadata( $this->_meta_type, $this->get_id(), $meta->key, $meta->value, false ); $new_meta_id = add_metadata( $this->_meta_type, $this->get_id(), $meta->key, $meta->value, false );
$set_meta_ids[] = $new_meta_id;
$this->_meta_data[ $array_key ]->meta_id = $new_meta_id;
} else { } else {
update_metadata_by_mid( $this->_meta_type, $meta_id, $meta->value, $meta->key ); update_metadata_by_mid( $this->_meta_type, $meta->meta_id, $meta->value, $meta->key );
$set_meta_ids[] = absint( $meta_id ); $set_meta_ids[] = absint( $meta->meta_id );
} }
} }

19
tests/unit-tests/crud/meta.php
View File

@ -94,7 +94,11 @@ class Meta extends \WC_Unit_Test_Case {
", $object_id ) ); ", $object_id ) );
foreach ( $raw_metadata as $meta ) { foreach ( $raw_metadata as $meta ) {
$metadata[ $meta->meta_id ] = (object) array( 'key' => $meta->meta_key, 'value' => $meta->meta_value ); $metadata[] = (object) array(
'key' => $meta->meta_key,
'value' => $meta->meta_value,
'meta_id' => $meta->meta_id,
);
} }
$object = new \WC_Mock_WC_data(); $object = new \WC_Mock_WC_data();
@ -197,4 +201,17 @@ class Meta extends \WC_Unit_Test_Case {
$this->assertEquals( 'val2', $object->get_meta( 'test_meta_key_2' ) ); $this->assertEquals( 'val2', $object->get_meta( 'test_meta_key_2' ) );
} }
/**
* Test adding meta data/updating meta data just added without keys colliding when changing
* data before a save.
*/
function test_add_meta_data_overwrite_before_save() {
$object = new \WC_Mock_WC_data;
$object->add_meta_data( 'test_field_0', 'another field', true );
$object->add_meta_data( 'test_field_1', 'another field', true );
$object->add_meta_data( 'test_field_2', 'val1', true );
$object->update_meta_data( 'test_field_0', 'another field 2' );
$this->assertEquals( 'val1', $object->get_meta( 'test_field_2' ) );
}
} }