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

[WIP] Update library/Zend/Stdlib/Hydrator/ClassMethods.php #3754

Closed
wants to merge 10 commits into from
Closed

[WIP] Update library/Zend/Stdlib/Hydrator/ClassMethods.php #3754

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
51a60c6
Update library/Zend/Stdlib/Hydrator/ClassMethods.php
mabuzagu Feb 12, 2013
51d0989
Update library/Zend/Stdlib/Hydrator/ClassMethods.php
mabuzagu Feb 18, 2013
9a976bc
Merge branch 'hotfix/4216'
weierophinney Apr 12, 2013
f135beb
Fixing classMethods Hydrator to work for TitleCase properties
mabuzagu Apr 14, 2013
764febe
Added TestAssest for ClassMethods Hydrator
mabuzagu Apr 14, 2013
e175de7
Merge branch 'patch-1' of https://github.com/mabuzagu/zf2 into ZendHy…
Apr 15, 2013
435f67e
Trimmed trailing whitespaces
Apr 15, 2013
a64c9d7
Converted identation from tabs to spaces
Apr 15, 2013
225e638
Fixed CS issues
Apr 15, 2013
1c18199
Merge pull request #1 from wryck7/ZendHydrator
mabuzagu Apr 15, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions library/Zend/Stdlib/Hydrator/ClassMethods.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,19 @@ public function extract($object)
$attribute = $method;
if (preg_match('/^get/', $method)) {
$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());


if(property_exists($object, $attribute)) {
$attributes[$attribute] = $this->extractValue($attribute, $object->$method());
} else {
Copy link
Member

Choose a reason for hiding this comment

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

Could you perhaps correct the indenting here (and the line above this, and the block below as well)? If it all looks okay in your editor, please make sure you use spaces. Not tabs. (we try to adhere to PSR2, which uses 4 spaces per tab: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md )

Thanks!

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. Will do

$attribute = lcfirst($attribute);
$attributes[$attribute] = $this->extractValue($attribute, $object->$method());
}
}

return $attributes;
Expand Down