DevKit updates for 4.x branch #779
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
jordisala1991
force-pushed
the
4.x-dev-kit
branch
6 times, most recently
from
9e293e3 to
41fb6f9
Compare
jordisala1991
force-pushed
the
4.x-dev-kit
branch
from
41fb6f9 to
a43cb2b
Compare
| @@ -57,9 +60,6 @@ public function __clone() | |||
| $this->queryBuilder = clone $this->queryBuilder; | |||
| } | |||
|
|
|||
| /** | |||
| * @return Iterator<object> | |||
There was a problem hiding this comment.
wdyt about this alternative @VincentLanglet ? the typehint for execute is already on the parent and it is already iterable so I don't think we need to add this.
There was a problem hiding this comment.
That's a solution until doctrine/mongodb-odm#2457 indeed.
| @@ -119,8 +119,8 @@ public function testExecuteAllowsSorting(): void | |||
| $proxyQuery->setSortBy([], ['fieldName' => 'name']); | |||
| $proxyQuery->setSortOrder('DESC'); | |||
|
|
|||
| /** @var array{array{name: string}} $result */ | |||
| $result = $proxyQuery->execute()->toArray(); | |||
| /** @var iterable<array{name: string}> $result */ | |||
There was a problem hiding this comment.
If you typehint the ProxyQuery as ProxyQuery<array{name: string}> you won't have to typehint the result.
| @@ -143,23 +143,26 @@ public function testExecuteAllowsSortingWithEmbedded(): void | |||
| $proxyQuery->setSortBy([['fieldName' => 'embeddedDocument']], ['fieldName' => 'position']); | |||
| $proxyQuery->setSortOrder('DESC'); | |||
|
|
|||
| /** @var array{array{name: string}} $result */ | |||
| $result = $proxyQuery->execute()->toArray(); | |||
| /** @var iterable<array{name: string}> $result */ | |||
|
The changelog from #778 should be added to this PR |
|
Done |
VincentLanglet
approved these changes
Aug 29, 2022
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.
Changelog