[2.0] Validate mapping files against schema #1814
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alcaeus
changed the title
alcaeus
changed the title
malarzm
requested changes
Jun 15, 2018
| $document->load($filename); | ||
|
|
||
| try { | ||
| $previousUseErrors = libxml_use_internal_errors(true); |
There was a problem hiding this comment.
Moving this outside of the try block should be safe and satisfy PHPStan
There's no point enforcing a specific order of elements, so we replace sequence with choice for more flexibility.
alcaeus
force-pushed
the
validate-mapping-files-against-schema
branch
from
ca7348e to
4e73b85
Compare
malarzm
approved these changes
Jul 24, 2018
alcaeus
added a commit
to alcaeus/mongodb-odm
that referenced
this pull request
Jan 9, 2019
Merged
alcaeus
added a commit
to alcaeus/mongodb-odm
that referenced
this pull request
Jan 10, 2019
alcaeus
added a commit
to alcaeus/mongodb-odm
that referenced
this pull request
Jan 10, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
With this change, invalid XML mapping files are no longer accepted by the XML driver. It also replaces the pesky
sequenceelement in the schema withchoice, allowing fields in any order the user wants to map them. This mirrors a change done in ORM a while ago.Last but not least, this removes leftover handling for the
idattribute in thefieldmapping that should have been removed in #1807.When backporting this feature to 1.3, we have to introduce a strict mode for mapping files that is disabled by default. When disabled, it will trigger a deprecation warning to inform the user that it will throw exceptions in 2.0; when enabled, it will behave like the driver in 2.0 and throw exceptions on invalid mapping files.