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.

Sign up for GitHub

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

Jump to bottom

Fix SchemaValidator with abstract child class in discriminator map #9096

Merged
merged 1 commit into from
Oct 6, 2021
Merged

Fix SchemaValidator with abstract child class in discriminator map #9096

merged 1 commit into from
Oct 6, 2021

Conversation

BenMorel
Copy link
Contributor

@BenMorel BenMorel commented Oct 5, 2021

Fixes #9095.

@BenMorel BenMorel mentioned this pull request Oct 5, 2021
Closed
@derrabus derrabus added this to the 2.10.2 milestone Oct 5, 2021
@derrabus derrabus added the Bug label Oct 5, 2021
@derrabus derrabus merged commit bbb68d0 into doctrine:2.10.x Oct 6, 2021
mehldau pushed a commit to mehldau/orm that referenced this pull request Oct 13, 2021
@BenMorel @mehldau
Fix SchemaValidator with abstract child class in discriminator map (d…
0eb25d7 
…octrine#9096)
@github-actions github-actions bot mentioned this pull request Oct 21, 2021
Merged
@olsavmic olsavmic mentioned this pull request Oct 21, 2021
Closed
olsavmic added a commit to olsavmic/orm that referenced this pull request Dec 17, 2021
@olsavmic
Revert "Fix SchemaValidator with abstract child class in discriminato…
3f07094 
…r map (doctrine#9096)"

This reverts commit bbb68d0.
beberlei pushed a commit that referenced this pull request Dec 18, 2021
@olsavmic
Revert "Fix SchemaValidator with abstract child class in discriminato…
5bf8140 
…r map (#9096)" (#9262)

This reverts commit bbb68d0.
derrabus added a commit that referenced this pull request Dec 20, 2021
@derrabus @andrew-demb
@olsavmic @beberlei
Merge 2.10.x into 2.11.x (#9276)
95d434d 
* Docs: consistency for FQCN, spacing, etc (#9232)

* Docs: consistent spacing, consistent array-style, consistent FQCN, avoid double escaped slashes, avoid double quotes if not necessary

* Docs: use special note block instead of markdown-based style

* Docs: Quote FQCN in table with backticks to be compatible with all render engines

* Drop all mentions API doc - it is not available anymore

* Add missed FQCN for code snippets

* Revert "Fix SchemaValidator with abstract child class in discriminator map (#9096)" (#9262)

This reverts commit bbb68d0.

* [docs] Fix wording for attributes=>parameters. (#9265)

Co-authored-by: Andrii Dembitskyi <andrew.dembitskiy@gmail.com>
Co-authored-by: olsavmic <molsavsky1@gmail.com>
Co-authored-by: Benjamin Eberlei <kontakt@beberlei.de>
derrabus added a commit to derrabus/orm that referenced this pull request Dec 26, 2021
@derrabus
Merge branch '2.11.x' into 3.0.x
47f931c 
* 2.11.x:
  Enable UnusedUse sniff again (doctrine#9267)
  Whitelist composer plugins used by this repository (doctrine#9286)
  Fix XML export for `change-tracking-policy` (doctrine#9285)
  Allow symfony/cache 6 (doctrine#9283)
  Put actual value instead of index inside $originalEntityData. (doctrine#9244)
  Fix return types of cache interfaces (doctrine#9271)
  Better explain limitations of DQL "DELETE" (doctrine#9281)
  Fix docblocks on nullable EM properties (doctrine#9273)
  Docs: use canonical order for phpdoc tags, add missed semicolon (doctrine#9190)
  Make PrimaryReadReplicaConnection enforcement explicit (doctrine#9239)
  Regenerate Psalm baseline (doctrine#9272)
  Improve compatibility with Doctrine DBAL 4 (doctrine#9266)
  [docs] Fix wording for attributes=>parameters. (doctrine#9265)
  Support for nesting attributes with PHP 8.1 (doctrine#9241)
  Revert "Fix SchemaValidator with abstract child class in discriminator map (doctrine#9096)" (doctrine#9262)
  Docs: consistency for FQCN, spacing, etc (doctrine#9232)
This was referenced Jan 12, 2023
Closed
Closed
Merged
mpdude added a commit to mpdude/doctrine2 that referenced this pull request Jan 17, 2023
@mpdude
Fix doctrine#9095 by re-applying doctrine#9096
c4622fd 
Since doctrine#10411 has been merged, no more need to specify all intermediate abstract entity classes.

Thus, we can relax the schema validator check as requested in doctrine#9095. The reasons given in doctrine#9142 no longer apply.
greg0ire pushed a commit to mpdude/doctrine2 that referenced this pull request Feb 5, 2023
@mpdude @greg0ire
Fix doctrine#9095 by re-applying doctrine#9096
6f6a761 
Since doctrine#10411 has been merged, no more need to specify all intermediate
abstract entity classes.

Thus, we can relax the schema validator check as requested in doctrine#9095. The
reasons given in doctrine#9142 no longer apply.

Fixes doctrine#9095
Closes doctrine#9096
greg0ire pushed a commit to mpdude/doctrine2 that referenced this pull request Feb 5, 2023
@mpdude @greg0ire
Fix doctrine#9095 by re-applying doctrine#9096
cde0fc6 
Since doctrine#10411 has been merged, no more need to specify all intermediate
abstract entity classes.

Thus, we can relax the schema validator check as requested in doctrine#9095. The
reasons given in doctrine#9142 no longer apply.

Fixes doctrine#9095
Closes doctrine#9096
greg0ire pushed a commit to mpdude/doctrine2 that referenced this pull request Feb 5, 2023
@mpdude @greg0ire
Fix doctrine#9095 by re-applying doctrine#9096
ee8269e 
Since doctrine#10411 has been merged, no more need to specify all intermediate
abstract entity classes.

Thus, we can relax the schema validator check as requested in doctrine#9095. The
reasons given in doctrine#9142 no longer apply.

Fixes doctrine#9095
greg0ire added a commit that referenced this pull request Feb 6, 2023
@greg0ire
Merge pull request #10420 from mpdude/fix-9095
5f169d9 
Fix #9095 by re-applying #9096
derrabus added a commit to derrabus/orm that referenced this pull request Feb 7, 2023
@derrabus
Merge branch '2.14.x' into 2.15.x
6c17e47 
* 2.14.x:
  Remove calls to assertObjectHasAttribute() (doctrine#10502)
  Remove calls to withConsecutive() (doctrine#10501)
  Use recognized array key
  Fix doctrine#9095 by re-applying doctrine#9096
  Use linebreaks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@derrabus derrabus derrabus approved these changes

@SenseException SenseException SenseException approved these changes

Assignees
No one assigned
Labels
Bug
Projects
None yet
Milestone
2.10.2
Development

Successfully merging this pull request may close these issues.

Regression: abstract entities in the middle of a hierarchy need to be part of discriminator map
3 participants
@BenMorel @SenseException @derrabus