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

[BC] Remove need of setter in ClassMethods hydrator #2426

Closed
wants to merge 4 commits into from
Closed

[BC] Remove need of setter in ClassMethods hydrator #2426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7aa8669
Remove need of setter
bakura10 Sep 26, 2012
ffa86f3
Simplfy code
bakura10 Sep 26, 2012
fedba93
Toto
bakura10 Sep 26, 2012
81dc8c1
Updated tests
bakura10 Sep 27, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 3 additions & 9 deletions library/Zend/Stdlib/Hydrator/ClassMethods.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,13 @@ public function extract($object)
if (!preg_match('/^(get|has|is)[A-Z]\w*/', $method)) {
continue;
}

$attribute = $method;
if (preg_match('/^get/', $method)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can simplify :

$attribute = $method;
if (preg_match('/^get/', $method)) {
$attribute = substr($attribute, 3);
$attribute = lcfirst($attribute);
}

And remove the "else"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, done.

// setter verification
$setter = preg_replace('/^get/', 'set', $method);
$attribute = substr($method, 3);
$attribute = lcfirst($attribute);
} else {
// setter verification
$setter = 'set' . ucfirst($method);
$attribute = $method;
}
if (!in_array($setter, $methods)) {
continue;
}

if ($this->underscoreSeparatedKeys) {
$attribute = preg_replace_callback('/([A-Z])/', $transform, $attribute);
}
Expand Down
29 changes: 15 additions & 14 deletions tests/ZendTest/Stdlib/HydratorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,20 +123,6 @@ public function testHydratorClassMethodsCamelCase()
$this->assertEquals($test->hasBar(), false);
}

public function testHydratorClassMethodsCamelCaseWithSetterMissing()
{
$hydrator = new ClassMethods(false);
$datas = $hydrator->extract($this->classMethodsCamelCaseMissing);
$this->assertTrue(isset($datas['fooBar']));
$this->assertEquals($datas['fooBar'], '1');
$this->assertFalse(isset($datas['fooBarBaz']));
$this->assertFalse(isset($datas['foo_bar']));
$test = $hydrator->hydrate(array('fooBar' => 'foo'), $this->classMethodsCamelCaseMissing);
$this->assertSame($this->classMethodsCamelCaseMissing, $test);
$this->assertEquals($test->getFooBar(), 'foo');
$this->assertEquals($test->getFooBarBaz(), '2');
}

public function testHydratorClassMethodsUnderscore()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should to update the test instead of removing no ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not really understand it to be honest. I can't understand the use case nor the test, so I can't really update it :/.

{
$hydrator = new ClassMethods(true);
Expand Down Expand Up @@ -202,4 +188,19 @@ public function testHydratorClassMethodsDefaultBehaviorIsConvertUnderscoreToCame
$this->assertEquals($test->getFooBar(), 'foo');
$this->assertEquals($test->getFooBarBaz(), 'bar');
}

public function testHydratorClassMethodsCamelCaseWithSetterMissing()
{
$hydrator = new ClassMethods(false);

$datas = $hydrator->extract($this->classMethodsCamelCaseMissing);
$this->assertTrue(isset($datas['fooBar']));
$this->assertEquals($datas['fooBar'], '1');
$this->assertTrue(isset($datas['fooBarBaz']));
$this->assertFalse(isset($datas['foo_bar']));
$test = $hydrator->hydrate(array('fooBar' => 'foo', 'fooBarBaz' => 1), $this->classMethodsCamelCaseMissing);
$this->assertSame($this->classMethodsCamelCaseMissing, $test);
$this->assertEquals($test->getFooBar(), 'foo');
$this->assertEquals($test->getFooBarBaz(), '2');
}
}