Repository navigation
Conversation
This file contains hidden or 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
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.
Fixes #1324
Problem
When a query chain contains a dynamic
where{Column}()/orWhere{Column}()call on an EloquentBuilderor a model scope called through an EloquentRelation(e.g.,$user->posts()->published()->paginate()),EloquentBuilderExtension::getMethodReturnType()returnsnull. Because unresolved method calls resolve toNeverType, subsequent calls in the chain (such aspaginate()) also resolve tonever, causing paginated resource collections to lose theirlinksandmetapagination envelope in the generated OpenAPI specification.Solution
where/orWherecalls onBuilder: Return the current builder instance when awhere{Column}ororWhere{Column}call (that is not an explicitBuildermethod) is invoked on aBuilder.Relation: InforwardRelationCallToRelatedModelBuilder(), delegate method return type resolution to$builderType->getMethodReturnType(...)(which already runsEloquentBuilderExtensionfor the related model's builder, including local scopes and dynamic where calls) instead of bailing out early when the method is not directly defined on the builder class, and returnnullonly if the resolved return type isUnknownTypeorNeverType.