Skip to content

2.1.x #215

merged 1 commit into from Dec 11, 2011

3 participants


A regex replace over phpdoc annotations to use absolute (i.e. \Doctrine) namespace references, described in issue DDC-1025 -

This should fix code completion in multiple IDEs including PhpStorm.

@guilhermeblanco guilhermeblanco merged commit 3b259dc into doctrine:2.1.x Dec 11, 2011
Doctrine member

@beberlei I think I merged in 2.1 branch. Is it possible to cherry-pick for trunk?


Should I have requested a pull into master? Sorry for the mistake.

Doctrine member
stof commented Dec 11, 2011

@andrewmackrodt yeah, pull requests should be done to master and then @beberlei backports commit to the maintenance branches


I cherry picked the commit, resolved the conflicts and modified the new files in master: #216 - sorry for the inconvenience, the procedure is all covered very well in the contribute documentation.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.