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.

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

Changed query building order to play nice with forwarded calls #101

Merged
merged 1 commit into from
May 4, 2021

Conversation

voydz
Copy link
Contributor

@voydz voydz commented Jan 19, 2021

PR for issue #100

May conflict with #93

This basically just changes the order of when internal search attributes and forwardedCalls being added to the query builder.

@voydz voydz changed the title Patch 1 Changed query building order to play nice with forwarded calls Jan 19, 2021
@freekmurze
Copy link
Member

Could you rebase this against the current master?

@voydz
Copy link
Contributor Author

voydz commented May 4, 2021

@freekmurze no problem

do not mind the force push 👀

I forgot to actually modify the added tests to reflect changes in #110

{"php":"8.0.5","version":"2.18.6","indent":" ","lineEnding":"\n","rules":{"blank_line_after_namespace":true,"braces":true,"class_definition":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"ordered_imports":{"sortAlgorithm":"alpha"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline_array":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true},"hashes":{"src\/Searchable.php":1242980759,"src\/Search.php":1813740488,"src\/SearchResultCollection.php":2567122850,"src\/SearchAspect.php":4127695379,"src\/SearchResult.php":2693161934,"src\/SearchableAttribute.php":3752884723,"src\/Exceptions\/InvalidSearchableModel.php":3300456690,"src\/Exceptions\/InvalidModelSearchAspect.php":2689367197,"src\/ModelSearchAspect.php":4153366588,"tests\/stubs\/Account.php":470375312,"tests\/stubs\/CustomNameSearchAspect.php":2380198170,"tests\/SearchResultTest.php":4266329428,"tests\/Models\/TestComment.php":2445821388,"tests\/Models\/TestModel.php":2013473586,"tests\/TestCase.php":517075324,"tests\/SearchAspectTest.php":830066418,"tests\/ModelSearchAspectTest.php":2803194365,"tests\/SearchTest.php":2850208164}}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file may be deleted an ignored

@freekmurze freekmurze merged commit 7272d8c into spatie:master May 4, 2021
@freekmurze
Copy link
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants