# By Matthew Weier O'Phinney (7) and others
# Via Matthew Weier O'Phinney (63) and others
* 'develop' of git://github.com/zendframework/zf2: (40 commits)
Fix tests for php <5.4
Find traits with TokenArrayScanner
Added test for issue #4989
Fixed failing tests
Renamed interface and extract HydrationInterface
[#4979] CS fixes
[#4969] CS fixes
[#4931] CS fixes
[#4912] Re-add removed method
Revert "Revert "Merge branch 'superdweebie-rand-bugfix'""
Correction for inverted version checks
change of version checks to use PHP_VERSION_ID constant.
Aligned method naming to zf style
Fixed method names
Zend\Navigation currently uses only one text domain for translating page labels. This commit adds the new option key "textdomain" to Navigation and its (translatable) view helpers. If the option is present, it is used during translation. If the key is not present, the old behavior is applied.
Added unit test for should not convert to array recursively if model is traversable
PartialLoop helper: prevent convert traversable model to array recursively