Skip to content

Commit

Permalink
Group_Shipping_Items::parse_form_values more percise handling
Browse files Browse the repository at this point in the history
  • Loading branch information
Ivan Kerin committed Nov 1, 2013
1 parent 4b198c1 commit 3cd6de7
Show file tree
Hide file tree
Showing 2 changed files with 192 additions and 16 deletions.
134 changes: 130 additions & 4 deletions classes/Kohana/Group/Shipping/Items.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,149 @@ class Kohana_Group_Shipping_Items {
protected $_shipping_for_method;
protected $_existing_shipping_items;

/**
* Modified to take wildcard positions into account.
*
* Gets a value from an array using a dot separated path.
*
* // Get the value of $array['foo']['bar']
* $value = Arr::path($array, 'foo.bar');
*
* Using a wildcard "*" will search intermediate arrays and return an array.
*
* // Get the values of "color" in theme
* $colors = Arr::path($array, 'theme.*.color');
*
* // Using an array of keys
* $colors = Arr::path($array, array('theme', '*', 'color'));
*
* @param array $array array to search
* @param mixed $path key path string (delimiter separated) or array of keys
* @param mixed $default default value if the path is not set
* @param string $delimiter key path delimiter
* @return mixed
*/
public static function arr_path($array, $path, $default = NULL, $delimiter = NULL)
{
if ( ! Arr::is_array($array))
{
// This is not an array!
return $default;
}

if (is_array($path))
{
// The path has already been separated into keys
$keys = $path;
}
else
{
if (array_key_exists($path, $array))
{
// No need to do extra processing
return $array[$path];
}

if ($delimiter === NULL)
{
// Use the default delimiter
$delimiter = Arr::$delimiter;
}

// Remove starting delimiters and spaces
$path = ltrim($path, "{$delimiter} ");

// Remove ending delimiters, spaces, and wildcards
$path = rtrim($path, "{$delimiter} *");

// Split the keys by delimiter
$keys = explode($delimiter, $path);
}

do
{
$key = array_shift($keys);

if (ctype_digit($key))
{
// Make the key an integer
$key = (int) $key;
}

if (isset($array[$key]))
{
if ($keys)
{
if (Arr::is_array($array[$key]))
{
// Dig down into the next part of the path
$array = $array[$key];
}
else
{
// Unable to dig deeper
break;
}
}
else
{
// Found the path requested
return $array[$key];
}
}
elseif ($key === '*')
{
// Handle wildcards

$values = array();
foreach ($array as $index => $arr)
{
if ($value = Arr::path($arr, implode('.', $keys)))
{
$values[$index] = $value;
}
}

if ($values)
{
// Found the values requested
return $values;
}
else
{
// Unable to dig deeper
break;
}
}
else
{
// Unable to dig deeper
break;
}
}
while ($keys);

// Unable to find the value requested
return $default;
}

public static function parse_form_values(array $array, $path)
{
if (strpos($path, '*') !== FALSE)
{
$paths = Arr::path($array, $path);
$paths = self::arr_path($array, $path);

if ($paths)
{
foreach (Arr::path($array, $path) as $i => $items)
foreach ($paths as $i => $items)
{
Group_Shipping_Items::set_array_values($array, str_replace('*', $i, $path), $items);
}
}
}
else
{
Group_Shipping_Items::set_array_values($array, $path, Arr::path($array, $path));
Group_Shipping_Items::set_array_values($array, $path, self::arr_path($array, $path));
}

return $array;
Expand Down
74 changes: 62 additions & 12 deletions tests/tests/Group/Shipping/ItemsTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@ public function data_test_parse_values()
),
),
),
// Test 2
// Test 3
array(
// Value 2
// Value 3
array(
'id' => 10,
'store_purchases' => array(
Expand All @@ -129,7 +129,7 @@ public function data_test_parse_values()
),
),
'store_purchases.items',
// Expected 2
// Expected 3
array(
'id' => 10,
'store_purchases' => array(
Expand All @@ -146,13 +146,63 @@ public function data_test_parse_values()
),
),
),
// Test 4
array(
// Value 4
array(
'id' => 10,
'store_purchases' => array(
array(
'id' => 12535,
'shipping' => array(
'id' => 12435,
),
),
array(
'id' => 12536,
'shipping' => array(
'id' => 12436,
'items' => array(
0 => '0%5Bshipping_group_id%5D=395731&0%5Bid%5D=15237',
1 => '0%5Bshipping_group_id%5D=395421&0%5Bid%5D=15238',
),
),
),
),
),
'store_purchases.*.shipping.items',
// Expected 4
array(
'id' => 10,
'store_purchases' => array(
array(
'id' => 12535,
'shipping' => array(
'id' => 12435,
),
),
array(
'id' => 12536,
'shipping' => array(
'id' => 12436,
'items' => array(
array(
'id' => '15237',
'shipping_group_id' => '395731',
),
array(
'id' => '15238',
'shipping_group_id' => '395421',
),
),
),
),
),
),
),
);
}





/**
* @dataProvider data_test_parse_values
* @covers Group_Shipping_Items::parse_form_values
Expand All @@ -161,7 +211,7 @@ public function data_test_parse_values()
public function test_parse_values($value, $path, $expected)
{
$result = Group_Shipping_Items::parse_form_values($value, $path);

$this->assertEquals($expected, $result);
}

Expand Down Expand Up @@ -368,10 +418,10 @@ public function test_form_value()
parse_str($value, $value);

$expected = array(
array('id' => 5, 'shipping_group_id' => 11),
array('id' => 6, 'shipping_group_id' => 12),
array('purchase_item_id' => 3, 'shipping_group_id' => 13),
);
array('id' => 5, 'shipping_group_id' => 11),
array('id' => 6, 'shipping_group_id' => 12),
array('purchase_item_id' => 3, 'shipping_group_id' => 13),
);

$this->assertEquals($expected, $value);
}
Expand Down

0 comments on commit 3cd6de7

Please sign in to comment.