Merge 2.19.x into 3.1.x #11416
Merged
Merge 2.19.x into 3.1.x #11416
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
Page: https://www.doctrine-project.org/projects/doctrine-orm/en/2.19/reference/dql-doctrine-query-language.html#query-result-formats Follow-up of doctrine#11359 The table I suggested is probably not working, since the text for each method is too long. And what I really wanted is to make it more *scanable*. So I tried boldfacing - if this doesn't work, I'll try something else. Questions: 1. This section here is basically the same as https://www.doctrine-project.org/projects/doctrine-orm/en/2.10/reference/dql-doctrine-query-language.html#hydration-modes ! So I'll try to merge them (in another PR), OK? I think the list is a better format (more scanable) - since those methods all work the same, there's no need for a full-blown code sample for each, IMO. 2. `getSingleColumnResult()` is missing.
See doctrine/collections#368 for the same issue in doctrine/collections which has been fixed there. The issue happens when using ->contains(). Running psalm emits > InvalidArgument - Argument 1 of Doctrine\ORM\PersistentCollection::contains > expects > TMaybeContained:fn-doctrine\common\collections\readablecollection::contains > as mixed, but … provided. Solution: we should either not define @template TMaybeContained or re-define the complete psalm docblock from ReadableCollection. Repairing the docblock necessitates an update to the psalm baseline: one "known issue" is no longer an issue and thus removed.
[Documentation] Query Result Formats
Fix psalm errors: remove override of template type
Page: https://www.doctrine-project.org/projects/doctrine-orm/en/2.19/reference/dql-doctrine-query-language.html#query-result-formats As announced in doctrine#11372 (comment), I merged the (mostly) identical sections. * I changed the `const`s from `Query` to `AbstractQuery` * I deleted this - mainly cause I didn't find a nice place for it: > In parentheses are the constants of the ``Query`` class which you can use with the general-purpose method ``Query::execute(array $params = [], $hydrationMode = Query::HYDRATE_OBJECT)``.
[Documentation] Merging "Query Result Formats" with "Hydration Modes"
* Improve getClassMetadata phpdoc * Update baseline
* 2.19.x: Fix BIGINT validation (doctrine#11414) Fix templated phpdoc return type (doctrine#11407) [Documentation] Merging "Query Result Formats" with "Hydration Modes" Fix psalm errors: remove override of template type Update dql-doctrine-query-language.rst Adding `NonUniqueResultException` [Documentation] Query Result Formats
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.
No description provided.