Update code with ProxyQueryInterface generic #1687
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
VincentLanglet
force-pushed
the
proxyQueryGenerics
branch
from
dc9cab6 to
726c277
Compare
VincentLanglet
force-pushed
the
proxyQueryGenerics
branch
from
726c277 to
472545f
Compare
| @@ -156,14 +156,15 @@ public function getBaseDatagrid(AdminInterface $admin, array $values = []): Data | |||
| if (!$query instanceof ProxyQueryInterface) { | |||
| throw new \TypeError(sprintf('The admin query MUST implement %s.', ProxyQueryInterface::class)); | |||
| } | |||
| /** @phpstan-var ProxyQueryInterface<object> $query */ | |||
There was a problem hiding this comment.
Is this one necessary? Isnt the admin->createQuery returning already with the generic applied?
There was a problem hiding this comment.
It's considered as a
Sonata\AdminBundle\Datagrid\ProxyQueryInterface&Sonata\DoctrineORMAdminBundle\Datagrid\ProxyQueryInterface<object>
And I have the error:
Method Sonata\DoctrineORMAdminBundle\Builder\DatagridBuilder::getBaseDatagrid() should return
Sonata\AdminBundle\Datagrid\DatagridInterface<Sonata\DoctrineORMAdminBundle\Datagrid\ProxyQueryInterface<object>> but returns
Sonata\AdminBundle\Datagrid\Datagrid<Sonata\DoctrineORMAdminBundle\Datagrid\ProxyQueryInterface>.
| /** | ||
| * @param ProxyQueryInterface<object> $query | ||
| */ | ||
| private function handleModel(ProxyQueryInterface $query, string $alias, FilterData $data): void |
There was a problem hiding this comment.
isnt this change a bc break?
There was a problem hiding this comment.
The class is final.
jordisala1991
approved these changes
Aug 22, 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.
Subject
I am targeting this branch, because {reason}.
Closes #{put_issue_number_here}.
Changelog