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

Fix deprecated optional being before required params #5941

Open
wants to merge 9 commits into
base: master
Choose a base branch
from

Conversation

paladox
Copy link
Contributor

@paladox paladox commented Jan 5, 2025

Fixes #5939

Summary by CodeRabbit

Summary by CodeRabbit

  • Code Changes
    • Updated method signature in EntityLookup interface to require explicit $subject parameter.
    • Updated method signature in ConditionBuilder class to require explicit $dataItem parameter.
    • Updated method signature in DescriptionBuilder class to require explicit $property parameter.
    • Updated method signature in QueryResultFactory class to require explicit $repositoryResult parameter.
    • Updated multiple method signatures in CachingSemanticDataLookup class to require explicit $dataItem parameter.
    • Updated method signatures in SemanticDataLookup class to require explicit $dataItem parameter.

Copy link
Contributor

coderabbitai bot commented Jan 5, 2025

Walkthrough

The pull request introduces changes to several method signatures across multiple classes, primarily focusing on the removal of default values for specific parameters. This modification enforces that certain parameters must now be explicitly provided when calling these methods, impacting how existing code interacts with these methods. The changes affect the getPropertyValues, findHierarchyMembers, prepareValue, newQueryResult, and various methods in the CachingSemanticDataLookup and SemanticDataLookup classes.

Changes

File Change Summary
src/EntityLookup.php Method signature modified: Removed default null value for $subject parameter in getPropertyValues() method.
src/Elastic/QueryEngine/ConditionBuilder.php Method signature modified: Removed default null value for $dataItem parameter in findHierarchyMembers() method.
src/Query/DescriptionBuilders/DescriptionBuilder.php Method signature modified: Removed default null value for $property parameter in prepareValue() method.
src/SPARQLStore/QueryEngine/QueryResultFactory.php Method signature modified: Removed default null value for $repositoryResult parameter in newQueryResult() method.
src/SQLStore/EntityStore/CachingSemanticDataLookup.php Method signatures modified: Removed default null value for $dataItem parameter in multiple methods (prefetchDataFromTable, fetchSemanticDataFromTable, getSemanticData, fetchFromCache).
src/SQLStore/EntityStore/SemanticDataLookup.php Method signatures modified: Removed default null value for $dataItem parameter in getSemanticData and fetchSemanticDataFromTable methods.

Assessment against linked issues

Objective Addressed Explanation
Remove optional parameters declared before required parameters (#5939)
Ensure method signatures comply with PHP parameter requirements (#5939)

Possibly related PRs

Suggested reviewers

  • JeroenDeDauw
  • gesinn-it-gea
  • gesinn-it-ilm

Poem

🐰 A Rabbit's Ode to Method Signatures
No more default, no more null's embrace
Parameters now demand their rightful place
In EntityLookup's method, clear and bright
Each subject must be passed with all its might
Explicit is the code, no hiding here! 🔍


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between a1535fd and 42ab05b.

📒 Files selected for processing (2)
  • src/Elastic/QueryEngine/ConditionBuilder.php (1 hunks)
  • src/EntityLookup.php (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (2)
  • src/EntityLookup.php
  • src/Elastic/QueryEngine/ConditionBuilder.php
⏰ Context from checks skipped due to timeout of 90000ms (6)
  • GitHub Check: build (1.43, 8.2, mysql, mariadb:11.2, false, true)
  • GitHub Check: build (1.42, 8.2, mysql, mariadb:11.2, false, true)
  • GitHub Check: build (1.41, 8.1, mysql, mariadb:11.2, false, true)
  • GitHub Check: build (1.40, 8.1, mysql, mariadb:11.2, true, false)
  • GitHub Check: build (1.39, 8.1, mysql, mysql:8, false, false)
  • GitHub Check: build (1.39, 8.1, mysql, mariadb:11.2, false, false)

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

codecov bot commented Jan 5, 2025

Codecov Report

Attention: Patch coverage is 80.00000% with 2 lines in your changes missing coverage. Please review.

Project coverage is 56.74%. Comparing base (e164b85) to head (42ab05b).

Files with missing lines Patch % Lines
src/Elastic/QueryEngine/ConditionBuilder.php 0.00% 1 Missing ⚠️
src/SPARQLStore/QueryEngine/QueryResultFactory.php 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff            @@
##             master    #5941   +/-   ##
=========================================
  Coverage     56.74%   56.74%           
  Complexity    19277    19277           
=========================================
  Files           983      983           
  Lines         68862    68862           
=========================================
  Hits          39075    39075           
  Misses        29787    29787           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@paladox
Copy link
Contributor Author

paladox commented Jan 5, 2025

@coderabbitai review

Copy link
Contributor

coderabbitai bot commented Jan 5, 2025

✅ Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🧹 Nitpick comments (1)
src/SQLStore/EntityStore/SemanticDataLookup.php (1)

129-129: Inconsistent parameter type check
The method signature now mandates $dataItem to be passed (albeit nullable), yet it throws a RuntimeException unless $dataItem is an instance of DIWikiPage. This is contradictory to allowing null or other DataItem types. Consider adjusting the signature or the type check to maintain a coherent contract.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 3c1c1fd and a1535fd.

📒 Files selected for processing (6)
  • src/Elastic/QueryEngine/ConditionBuilder.php (1 hunks)
  • src/Query/DescriptionBuilders/DescriptionBuilder.php (1 hunks)
  • src/SPARQLStore/QueryEngine/QueryResultFactory.php (1 hunks)
  • src/SQLStore/EntityStore/CachingSemanticDataLookup.php (4 hunks)
  • src/SQLStore/EntityStore/EntityLookup.php (1 hunks)
  • src/SQLStore/EntityStore/SemanticDataLookup.php (2 hunks)
🧰 Additional context used
🪛 GitHub Check: codecov/patch
src/SPARQLStore/QueryEngine/QueryResultFactory.php

[warning] 62-62: src/SPARQLStore/QueryEngine/QueryResultFactory.php#L62
Added line #L62 was not covered by tests

src/Elastic/QueryEngine/ConditionBuilder.php

[warning] 373-373: src/Elastic/QueryEngine/ConditionBuilder.php#L373
Added line #L373 was not covered by tests

🔇 Additional comments (8)
src/SPARQLStore/QueryEngine/QueryResultFactory.php (1)

62-62: Add test coverage for new required parameter

Line 62 is newly introduced without test coverage, as indicated by the static analysis tool. Consider adding a focused test to ensure stability and prevent regressions, especially for scenarios where $repositoryResult might be null.

Would you like me to provide a sample test case or open a new issue to help track this coverage need?

🧰 Tools
🪛 GitHub Check: codecov/patch

[warning] 62-62: src/SPARQLStore/QueryEngine/QueryResultFactory.php#L62
Added line #L62 was not covered by tests

src/Query/DescriptionBuilders/DescriptionBuilder.php (1)

118-118: Confirm correct usage in calling code

By removing the default value for $property, this parameter must always be provided. Ensure that all internal and external calls are updated to avoid runtime errors.

src/SQLStore/EntityStore/CachingSemanticDataLookup.php (4)

209-209: Verify caller compliance with new required $dataItem

Since $dataItem no longer has a default value, please confirm that all invocations of prefetchDataFromTable provide a non-omitted $dataItem.


254-254: Verify all calls to fetchSemanticDataFromTable

With the default value removed, ensure that all places passing $dataItem do so explicitly. This helps avoid unintended null references.


268-268: Check for null usage in getSemanticData

This parameter’s default value has been removed. Confirm that dependent code now supplies $dataItem correctly in every scenario.


288-288: Ensure $dataItem is always provided to fetchFromCache

Line 288 removes the default value for $dataItem. Confirm all call sites supply a non-omitted $dataItem to prevent runtime errors.

src/Elastic/QueryEngine/ConditionBuilder.php (1)

373-373: Enhance test coverage for findHierarchyMembers

This new required parameter $dataItem is not tested, according to static analysis. Consider adding a dedicated test to verify correct handling (including null scenarios).

🧰 Tools
🪛 GitHub Check: codecov/patch

[warning] 373-373: src/Elastic/QueryEngine/ConditionBuilder.php#L373
Added line #L373 was not covered by tests

src/SQLStore/EntityStore/EntityLookup.php (1)

240-240: Potential BC break due to removal of default param value
Changing the $subject parameter from having a default value of null to requiring an explicit value can break consumers that previously omitted this argument. Verify and update all call sites to ensure they pass this parameter if needed.

To confirm, run the following script to locate all invocations of getPropertyValues:

@gesinn-it-gea
Copy link
Member

I don't think this is the right approach. The deprecation warning occurs because in PHP, optional parameters (those with a default value) should not precede required parameters. This is because it can create ambiguity when calling the function. To fix this properly, you should reorder the parameters so that the required ones come first.

Codecov commented on some of the changes not covered by tests. We should check this. I would feel much better if we had tests for these cases.

@paladox
Copy link
Contributor Author

paladox commented Jan 6, 2025

I don't think this is the right approach. The deprecation warning occurs because in PHP, optional parameters (those with a default value) should not precede required parameters. This is because it can create ambiguity when calling the function. To fix this properly, you should reorder the parameters so that the required ones come first.

Codecov commented on some of the changes not covered by tests. We should check this. I would feel much better if we had tests for these cases.

I did consider that but that would be a breaking change (although acceptable as we're going to a 5.0 release). I found that doing this (the current pull) fixes the deprecation notice and keeps the current behaviour making it a noop. I'm happy to change the params around if that's what you want but I think that would be more work as you'd have to go digging into the code to find where it's used and fix it there as well.

@gesinn-it-gea thoughts?

@gesinn-it-gea
Copy link
Member

@JeroenDeDauw what's your opinion?

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.

Deprecated: Optional parameter x declared before required parameter x is implicitly treated as a required
2 participants