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

wants to merge 3 commits into


None yet

5 participants

pscheit commented Oct 3, 2012

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



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:


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 commented Oct 4, 2012

and please also add a test for this

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:
before merging

@stof stof commented on an outdated diff Oct 5, 2012
@@ -104,6 +104,16 @@ public function testAnnotationsWithVarType()
$this->assertInstanceOf('Doctrine\Tests\Common\Annotations\Fixtures\AnnotationTargetAll', $barAnnot[0]->annotation);
+ public function testAtInDescription()
+ {
+ $reader = $this->getReader();
+ $class = new ReflectionClass('Doctrine\Tests\Common\Annotations\Fixtures\ClassWithAtInDescriptionAndAnnotation');
+ $this->assertEquals(1,count($fooAnnot = $reader->getPropertyAnnotations($class->getProperty('foo'))));
stof Oct 5, 2012 Doctrine member

could you use assertCount here ?
and a space is missing after the comma

@Ocramius Ocramius added a commit to Ocramius/annotations that referenced this pull request Dec 3, 2013
@Ocramius Ocramius Re-introducing hotfix for DCOM-118 as of @pscheit's PR 3ffadc4
@Ocramius Ocramius referenced this pull request in doctrine/annotations Dec 3, 2013

[WIP] DCOM-118 - DCOM-121 #17

Ocramius commented Dec 3, 2013

I ported this PR to doctrine/annotations#17

@Ocramius Ocramius closed this Dec 3, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment