Skip to content
This repository has been archived by the owner on Jan 31, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/stdlib-hydrator-class-methods-has-support' into …
Browse files Browse the repository at this point in the history 
…releases/2.0.1
  • Loading branch information
@weierophinney
weierophinney committed Aug 30, 2012
136 parents a2df21b + 4de87f2 + 7c259ec + a22bdcb + 448f428 + 084ad9f + 9414e5a + 489be93 + cb39e7e + 54a28dc + c9c769e + dda791d + 70d382a + 8bbad0e + 9321185 + 7ab35a6 + b93694e + 3ea7087 + 0fe3d3a + bd5e189 + d1cba17 + 8d75392 + 3fb5b55 + 6cb0ccb + 30aa565 + 8409977 + 8074ba0 + 8f92486 + 94860d1 + 05d33c4 + 425826b + f0e91f0 + e31468f + 7d2af87 + 2e4dc80 + 19d128f + 1b9e4b2 + 1c46483 + fdda3f2 + 595fcd1 + 213395c + 8e514a8 + 2f30186 + bb4ed65 + 132d5b6 + 030ff33 + f2f20f3 + a50e133 + 4c554ee + dbfb1b8 + ccab83f + 00b350f + 78945d0 + f0e5f4b + ceb7d8c + 9e124d1 + 3de5912 + b6a974a + 10a6438 + cb6c1e7 + 18afd6c + 3baf1bd + c800904 + f52dcb8 + 126ccb2 + e7d6206 + e2d24ab + ec1abfc + 290ea90 + 9f4ca1b + edaa760 + c4c0c95 + d21f055 + 5b18029 + e6b97af + 010fb36 + 64c7b8d + 636523e + 4cc2cd6 + e34098a + 16367cd + 943c77f + 8226e5b + 0b47726 + 3cd8a03 + cc4782c + 9c653a6 + 656dbe5 + 9bce1ba + 7dc18ca + 861130d + 2d2ffbd + 4f413a5 + 2e1067a + 1d082e4 + e8aeb79 + b562091 + ff2fdc3 + 4aa72c0 + 1bb67ac + cd015c8 + 5e89910 + 0c21258 + dd54faf + 57f9063 + b88ce2e + af68643 + 06cd3b4 + 2c71b71 + ee02c35 + 9456314 + 5a77a7b + e98a077 + 738f2e6 + cb1e63c + 736df07 + d0a0154 + 990523c + 78687de + a5b6e79 + 6e9dfe9 + e201a1c + d9b45ef + 76222ad + 16d67da + 1ab2258 + b81d711 + ed2e9bc + 61efe82 + f353ea5 + 1f02519 + 58c1fe8 + ed502d9 + 2defba6 + 4885013 + 4c923be commit 5ecbc99
Show file tree
Hide file tree
Showing 4 changed files with 87 additions and 16 deletions.
29 changes: 13 additions & 16 deletions src/Hydrator/ClassMethods.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,31 +58,28 @@ public function extract($object)
};
$attributes = array();
$methods = get_class_methods($object);

foreach ($methods as $method) {
if (preg_match('/^get[A-Z]\w*/', $method)) {
if (!preg_match('/^(get|has|is)[A-Z]\w*/', $method)) {
continue;
}
if (preg_match('/^get/', $method)) {
// setter verification
$setter = preg_replace('/^get/', 'set', $method);
if (!in_array($setter, $methods)) {
continue;
}
$attribute = substr($method, 3);
$attribute = lcfirst($attribute);
if ($this->underscoreSeparatedKeys) {
$attribute = preg_replace_callback('/([A-Z])/', $transform, $attribute);
}
$attributes[$attribute] = $this->extractValue($attribute, $object->$method());
} elseif (preg_match('/^is[A-Z]\w*/', $method)) {
} else {
// setter verification
$setter = 'set' . ucfirst($method);
if (!in_array($setter, $methods)) {
continue;
}
$attribute = $method;
if ($this->underscoreSeparatedKeys) {
$attribute = preg_replace_callback('/([A-Z])/', $transform, $attribute);
}
$attributes[$attribute] = $this->extractValue($attribute, $object->$method());
}
if (!in_array($setter, $methods)) {
continue;
}
if ($this->underscoreSeparatedKeys) {
$attribute = preg_replace_callback('/([A-Z])/', $transform, $attribute);
}
$attributes[$attribute] = $this->extractValue($attribute, $object->$method());
}

return $attributes;
Expand Down
22 changes: 22 additions & 0 deletions test/HydratorTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,14 @@ public function testInitiateValues()
$this->assertEquals($this->classMethodsCamelCase->getFooBarBaz(), '2');
$this->assertEquals($this->classMethodsCamelCase->getIsFoo(), true);
$this->assertEquals($this->classMethodsCamelCase->isBar(), true);
$this->assertEquals($this->classMethodsCamelCase->getHasFoo(), true);
$this->assertEquals($this->classMethodsCamelCase->hasBar(), true);
$this->assertEquals($this->classMethodsUnderscore->getFooBar(), '1');
$this->assertEquals($this->classMethodsUnderscore->getFooBarBaz(), '2');
$this->assertEquals($this->classMethodsUnderscore->getIsFoo(), true);
$this->assertEquals($this->classMethodsUnderscore->isBar(), true);
$this->assertEquals($this->classMethodsUnderscore->getHasFoo(), true);
$this->assertEquals($this->classMethodsUnderscore->hasBar(), true);
}

public function testHydratorReflection()
Expand Down Expand Up @@ -95,12 +99,18 @@ public function testHydratorClassMethodsCamelCase()
$this->assertEquals($datas['isFoo'], true);
$this->assertTrue(isset($datas['isBar']));
$this->assertEquals($datas['isBar'], true);
$this->assertTrue(isset($datas['hasFoo']));
$this->assertEquals($datas['hasFoo'], true);
$this->assertTrue(isset($datas['hasBar']));
$this->assertEquals($datas['hasBar'], true);
$test = $hydrator->hydrate(
array(
'fooBar' => 'foo',
'fooBarBaz' => 'bar',
'isFoo' => false,
'isBar' => false,
'hasFoo' => false,
'hasBar' => false,
),
$this->classMethodsCamelCase
);
Expand All @@ -109,6 +119,8 @@ public function testHydratorClassMethodsCamelCase()
$this->assertEquals($test->getFooBarBaz(), 'bar');
$this->assertEquals($test->getIsFoo(), false);
$this->assertEquals($test->isBar(), false);
$this->assertEquals($test->getHasFoo(), false);
$this->assertEquals($test->hasBar(), false);
}

public function testHydratorClassMethodsCamelCaseWithSetterMissing()
Expand Down Expand Up @@ -139,12 +151,20 @@ public function testHydratorClassMethodsUnderscore()
$this->assertTrue(isset($datas['is_bar']));
$this->assertFalse(isset($datas['isBar']));
$this->assertEquals($datas['is_bar'], true);
$this->assertTrue(isset($datas['has_foo']));
$this->assertFalse(isset($datas['hasFoo']));
$this->assertEquals($datas['has_foo'], true);
$this->assertTrue(isset($datas['has_bar']));
$this->assertFalse(isset($datas['hasBar']));
$this->assertEquals($datas['has_bar'], true);
$test = $hydrator->hydrate(
array(
'foo_bar' => 'foo',
'foo_bar_baz' => 'bar',
'is_foo' => false,
'is_bar' => false,
'has_foo' => false,
'has_bar' => false,
),
$this->classMethodsUnderscore
);
Expand All @@ -153,6 +173,8 @@ public function testHydratorClassMethodsUnderscore()
$this->assertEquals($test->getFooBarBaz(), 'bar');
$this->assertEquals($test->getIsFoo(), false);
$this->assertEquals($test->isBar(), false);
$this->assertEquals($test->getHasFoo(), false);
$this->assertEquals($test->hasBar(), false);
}

public function testHydratorClassMethodsIgnoresInvalidValues()
Expand Down
26 changes: 26 additions & 0 deletions test/TestAsset/ClassMethodsCamelCase.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ class ClassMethodsCamelCase

protected $isBar = true;

protected $hasFoo = true;

protected $hasBar = true;

public function getFooBar()
{
return $this->fooBar;
Expand Down Expand Up @@ -63,4 +67,26 @@ public function setIsBar($value)
$this->isBar = $value;
return $this;
}

public function getHasFoo()
{
return $this->hasFoo;
}

public function setHasFoo($value)
{
$this->hasFoo = $value;
return $this;
}

public function hasBar()
{
return $this->hasBar;
}

public function setHasBar($value)
{
$this->hasBar = $value;
return $this;
}
}
26 changes: 26 additions & 0 deletions test/TestAsset/ClassMethodsUnderscore.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ class ClassMethodsUnderscore

protected $is_bar = true;

protected $has_foo = true;

protected $has_bar = true;

public function getFooBar()
{
return $this->foo_bar;
Expand Down Expand Up @@ -63,4 +67,26 @@ public function setIsBar($value)
$this->is_bar = $value;
return $this;
}

public function getHasFoo()
{
return $this->has_foo;
}

public function setHasFoo($value)
{
$this->has_foo = $value;
return $this;
}

public function hasBar()
{
return $this->has_bar;
}

public function setHasBar($value)
{
$this->has_bar = $value;
return $this;
}
}

0 comments on commit 5ecbc99

Please sign in to comment.