Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DCOM-118] fix for issue #195 #198

Closed
wants to merge 3 commits into from
Closed

Conversation

pscheit
Copy link

@pscheit pscheit commented Oct 3, 2012

I'm sorry, i have no idea why i got here now 23 commits .. i tried but no success.

@doctrinebot
Copy link

Hello,

thank you for positing this Pull Request. I have automatically opened an issue on our Jira Bug Tracker for you with the details of this Pull-Request. See the Link:

http://doctrine-project.org/jira/browse/DCOM-121

@stof
Copy link
Member

stof commented Oct 4, 2012

you have 23 commits becasuse you started your feature branch based on the 2.3 branch instead of master.
Here is the way to fix it:

git checkout doclexingfail

# save a reference to the current state of the feature branch
git branch tmp

# reset the feature branch to master
git fetch upstream
git reset --hard upstream/master

# cherry-pick the meaningful commit for the feature
git cherry-pick f1516fb

# IMPORTANT: at this point, check that the feature branch is working properly with your changes

# update the PR by forcing the push
git push origin doclexingfail --force

@stof
Copy link
Member

stof commented Oct 4, 2012

and please also add a test for this

@pscheit
Copy link
Author

pscheit commented Oct 5, 2012

thx for the help, cherry pick was the command i didn't find.
The test was alreay in Seldaeks commit.

please read:
http://doctrine-project.org/jira/browse/DCOM-118
before merging

$reader = $this->getReader();
$class = new ReflectionClass('Doctrine\Tests\Common\Annotations\Fixtures\ClassWithAtInDescriptionAndAnnotation');

$this->assertEquals(1,count($fooAnnot = $reader->getPropertyAnnotations($class->getProperty('foo'))));
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 use assertCount here ?
and a space is missing after the comma

@Ocramius
Copy link
Member

Ocramius commented Dec 3, 2013

I ported this PR to doctrine/annotations#17

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants