Update library/Zend/Code/Generator/PropertyGenerator.php #3491

Closed
wants to merge 1 commit into
from

Conversation

Projects
None yet
3 participants
Contributor

vahid-sohrabloo commented Jan 19, 2013

DocBlockGenerator::fromReflection Accepts DocBlockReflection but string given

@vahid-sohrabloo vahid-sohrabloo Update library/Zend/Code/Generator/PropertyGenerator.php
DocBlockGenerator::fromReflection Accepts DocBlockReflection but string given
a6eec5a
Member

Maks3w commented Jan 19, 2013

@vahid-sohrabloo Take a look to http://blog.evan.pro/keeping-a-clean-github-fork-part-1 to see how to have different branches for different things

Also please add a test case to avoid regressions

@weierophinney weierophinney added a commit that referenced this pull request Jan 21, 2013

@weierophinney weierophinney [#3491] Added test
- Added test to demonstrate that docblock for property is now retrieved
de46b92

@weierophinney weierophinney added a commit that referenced this pull request Jan 21, 2013

@weierophinney weierophinney Merge branch 'hotfix/3491' into develop
Forward port #3491

Conflicts:
	tests/ZendTest/Code/Generator/PropertyGeneratorTest.php
b4c68bd
Owner

weierophinney commented Jan 21, 2013

I've written a test, and cherry-picked the original commit to master (as it applies against master as well).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment