Skip to content

Fix 361 master#363

Closed
Aerendir wants to merge 26 commits intodoctrine:1.10.xfrom
Aerendir:fix-361-master
Closed

Fix 361 master#363
Aerendir wants to merge 26 commits intodoctrine:1.10.xfrom
Aerendir:fix-361-master

Conversation

@Aerendir
Copy link
Copy Markdown
Contributor

@Aerendir Aerendir commented Sep 23, 2020

Fix #361.

alcaeus and others added 26 commits April 2, 2020 10:24
…5dbb2d10e81.70202124

Merge release 1.10.1 into master
Update website metadata for master branch
Set x-patch version to branches in website config
Use ::class constants instead of strings to ease future refactorings
`string` is wrong as it can also be `null` or an `array`. Merging this (and tagging a new bugfix release) would help me with doctrine/mongodb-odm#1803 :)
The second argument is supposed to be the Annotation you want to get,
the property name is already contained in $property.
…d691dafbbb7.85922000

Merge release 1.10.2 into master
…c2b6cd8eea0.40752417

Merge release 1.10.3 into master
…295487aede7.72510405

Merge release 1.10.4 into master
@SenseException
Copy link
Copy Markdown
Member

This PR contains commits of other developers and cannot be merged against master. Your PR was possibly created from another branch than master. I guess you used the same state of #362?

If #362 gets merged, there will be an upmerge at a later time that applys your changes to master, so you won't need this PR to master anymore.

@Aerendir Aerendir deleted the fix-361-master branch September 24, 2020 13:00
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.

[Feature] Add annotation @suppress to AnnotationReader

10 participants