Skip to content

Commit

Permalink
fix: handle numeric key with camel case source key modifier
Browse files Browse the repository at this point in the history
Co-authored-by: Nathan Boiron <nathan.boiron@gmail.com>
  • Loading branch information
magnetik and Mopolo committed Mar 1, 2022
1 parent b7a7d22 commit b8a18fe
Show file tree
Hide file tree
Showing 2 changed files with 128 additions and 5 deletions.
15 changes: 10 additions & 5 deletions src/Mapper/Source/Modifier/CamelCaseKeys.php
Expand Up @@ -11,24 +11,24 @@

/**
* @api
* @implements IteratorAggregate<string, mixed>
* @implements IteratorAggregate<mixed>
*/
final class CamelCaseKeys implements IteratorAggregate
{
/** @var array<string, mixed> */
/** @var array<mixed> */
private array $source;

/**
* @param iterable<string, mixed> $source
* @param iterable<mixed> $source
*/
public function __construct(iterable $source)
{
$this->source = $this->replace($source);
}

/**
* @param iterable<string, mixed> $source
* @return array<string, mixed>
* @param iterable<mixed> $source
* @return array<mixed>
*/
private function replace(iterable $source): array
{
Expand All @@ -39,6 +39,11 @@ private function replace(iterable $source): array
$value = $this->replace($value);
}

if (! is_string($key)) {
$result[$key] = $value;
continue;
}

$camelCaseKey = $this->camelCaseKeys($key);

if (isset($result[$camelCaseKey])) {
Expand Down
118 changes: 118 additions & 0 deletions tests/Unit/Mapper/Source/Modifier/CamelCaseKeysTest.php
@@ -0,0 +1,118 @@
<?php

declare(strict_types=1);

namespace CuyZ\Valinor\Tests\Unit\Mapper\Source\Modifier;

use CuyZ\Valinor\Mapper\Source\Modifier\CamelCaseKeys;
use PHPUnit\Framework\TestCase;

final class CamelCaseKeysTest extends TestCase
{
public function test_replace_space(): void
{
$source = new CamelCaseKeys(['some key' => 'foo']);

self::assertSame(['someKey' => 'foo'], iterator_to_array($source));
}

public function test_replace_dash(): void
{
$source = new CamelCaseKeys(['some-key' => 'foo']);

self::assertSame(['someKey' => 'foo'], iterator_to_array($source));
}

public function test_replace_underscore(): void
{
$source = new CamelCaseKeys(['some_key' => 'foo']);

self::assertSame(['someKey' => 'foo'], iterator_to_array($source));
}

public function test_root_path_is_mapped(): void
{
$source = new CamelCaseKeys(['level-one' => 'bar']);

self::assertSame(['levelOne' => 'bar'], iterator_to_array($source));
}

public function test_sub_path_is_mapped(): void
{
$source = new CamelCaseKeys([
'level-one' => [
'level-two' => 'foo',
],
]);

self::assertSame([
'levelOne' => [
'levelTwo' => 'foo',
],
], iterator_to_array($source));
}

public function test_root_iterable_path_is_mapped(): void
{
$source = new CamelCaseKeys([
['level-one' => 'foo'],
['level-one' => 'bar'],
]);

self::assertSame([
['levelOne' => 'foo'],
['levelOne' => 'bar'],
], iterator_to_array($source));
}

public function test_sub_iterable_numeric_path_is_mapped(): void
{
$source = new CamelCaseKeys([
'level-one' => [
['level-two' => 'bar'],
['level-two' => 'buz'],
],
]);

self::assertSame([
'levelOne' => [
['levelTwo' => 'bar'],
['levelTwo' => 'buz'],
],
], iterator_to_array($source));
}

public function test_sub_iterable_string_path_is_mapped(): void
{
$source = new CamelCaseKeys([
'level-one' => [
'level-two-a' => ['level-three' => 'bar'],
'level-two-b' => ['level-three' => 'buz'],
],
]);

self::assertSame([
'levelOne' => [
'levelTwoA' => ['levelThree' => 'bar'],
'levelTwoB' => ['levelThree' => 'buz'],
],
], iterator_to_array($source));
}

public function test_path_with_sub_paths_are_mapped(): void
{
$source = new CamelCaseKeys([
'level-one' => [
['level-two' => 'bar'],
['level-two' => 'buz'],
],
]);

self::assertSame([
'levelOne' => [
['levelTwo' => 'bar'],
['levelTwo' => 'buz'],
],
], iterator_to_array($source));
}
}

0 comments on commit b8a18fe

Please sign in to comment.