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 the passing of queue_headers #67

Merged
merged 1 commit into from
Jun 25, 2024
Merged

Fix the passing of queue_headers #67

merged 1 commit into from
Jun 25, 2024

Conversation

msmakouz
Copy link
Member

@msmakouz msmakouz commented Jun 25, 2024

Q A
Bugfix? ✔️
Breaks BC?
New feature?

@msmakouz msmakouz added the bug Something isn't working label Jun 25, 2024
@msmakouz msmakouz requested a review from rustatian June 25, 2024 08:10
@msmakouz msmakouz self-assigned this Jun 25, 2024
Copy link

coderabbitai bot commented Jun 25, 2024

Walkthrough

These changes focus on simplifying JSON encoding logic and improving conditional handling in the Jobs and AMQPCreateInfo classes. The toStringOfStringMap method in Jobs has been streamlined, while the toArray method in AMQPCreateInfo now conditionally includes queue_headers based on its content. Additionally, tests have been updated to verify these new behaviors.

Changes

File Change Summary
src/Jobs.php Simplified the json_encode logic in the toStringOfStringMap method.
src/Queue/AMQPCreateInfo.php Modified toArray method to conditionally include queue_headers based on the presence of headers.
tests/Unit/Queue/AMQPCreateInfoTest.php Added testToArrayWithEmptyQueueHeaders to verify the toArray method handles empty queue headers correctly.

Sequence Diagrams

sequenceDiagram
    participant Client
    participant Jobs
    participant AMQPCreateInfo

    Client->>Jobs: Call toStringOfStringMap()
    Jobs->>Jobs: json_encode with simplified flags
    Jobs-->>Client: Return JSON String
    
    Client->>AMQPCreateInfo: Call toArray()
    alt Queue Headers Present
        AMQPCreateInfo->>Client: Include queue_headers in result
    else Queue Headers Absent
        AMQPCreateInfo->>Client: Exclude queue_headers from result
    end
Loading

Poem

Just a tweak in the code, so light,
Jobs and queues set right,
Encode with ease, no force, no fight,
Headers appear, like dawn's first light.
A rabbit's touch, brings delight! 🐇💻


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>.
    • 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 generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @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 as 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 resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration 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

@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: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between ab1e4ff and d3ee263.

Files selected for processing (3)
  • src/Jobs.php (1 hunks)
  • src/Queue/AMQPCreateInfo.php (2 hunks)
  • tests/Unit/Queue/AMQPCreateInfoTest.php (1 hunks)
Additional comments not posted (3)
src/Queue/AMQPCreateInfo.php (1)

95-97: Good conditional inclusion of queue_headers.

The modification to conditionally include queue_headers only when they are not empty aligns with the PR objectives and improves data handling. This change ensures that unnecessary empty fields are not serialized, which can be beneficial for performance and clarity when interfacing with APIs or storage systems.

src/Jobs.php (1)

126-126: Streamlined JSON encoding process.

Removing the conditional (empty($value) ? \JSON_FORCE_OBJECT : 0) simplifies the JSON encoding process. This change makes the behavior more predictable and reduces complexity, which is generally beneficial for maintainability. Ensure that all calling code and integrations are compatible with this change, as it could potentially alter the JSON structure output.

tests/Unit/Queue/AMQPCreateInfoTest.php (1)

137-141: Effective test for empty queue_headers.

The new test method testToArrayWithEmptyQueueHeaders effectively checks that queue_headers is not included in the result array when it is empty. This test aligns with the changes made in AMQPCreateInfo and ensures that the new behavior functions as expected.

@msmakouz msmakouz merged commit 9842316 into 4.x Jun 25, 2024
7 checks passed
@msmakouz msmakouz deleted the fix/empty-queue-headers branch June 25, 2024 08:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants