refactor(Request): Enhance query parameter handling and resolution logic for PSR-7 compatibility. #66

terabytesoftw · 2025-08-07T02:00:00Z

Q	A
Is bugfix?	✔️
New feature?	❌
Breaks BC?	❌

Summary by CodeRabbit

Bug Fixes
- Improved handling of query parameters to ensure compatibility with Yii2's native behavior.
- Enhanced route and parameter resolution for requests, providing more consistent integration with Yii's routing and query parameters.
- Improved error handling for unresolved routes, now displaying a localized "Page not found" message.

…gic for PSR-7 compatibility.

coderabbitai · 2025-08-07T02:00:06Z

Walkthrough

This change removes query parameter caching and route resolution logic from ServerRequestAdapter, shifting all parameter merging and resolution responsibilities to the Request class. The Request class now handles merging Yii and PSR-7 query parameters and performs route resolution using Yii's UrlManager, ensuring consistent parameter handling.

Changes

Cohort / File(s)	Change Summary
ServerRequestAdapter Refactor `src/adapter/ServerRequestAdapter.php`	Removed `$queryParams` caching property and all related logic. Deleted the `resolve(Request $request): array` method and associated imports. The adapter now simply returns PSR-7 query parameters directly.
Request Class Routing & Query Handling `src/http/Request.php`	Updated `getQueryParams()` to prefer Yii's native parameters, falling back to PSR-7 if empty. Overhauled `resolve()` to perform route parsing and parameter merging within the class, integrating Yii's UrlManager and PSR-7 adapter logic.

Sequence Diagram(s)

sequenceDiagram
    participant Client
    participant Request
    participant PSR7Adapter
    participant UrlManager
    participant Yii

    Client->>Request: resolve()
    alt PSR-7 Adapter is set
        Request->>UrlManager: parseRequest(Request)
        alt Route found
            UrlManager-->>Request: [route, params]
            Request->>PSR7Adapter: getQueryParams()
            PSR7Adapter-->>Request: psr7Params
            Request->>Request: Merge params with psr7Params
            Request-->>Client: [route, mergedParams]
        else Route not found
            Request->>Yii: t('yii', 'Page not found.')
            Request-->>Client: throw NotFoundHttpException
        end
    else No PSR-7 Adapter
        Request->>Request: parent::resolve()
        Request-->>Client: result
    end

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

Possibly related PRs

fix: Align query parameters behavior between PSR-7 and Yii2 Request. #65: Introduced the now-removed caching and merging logic in ServerRequestAdapter; this PR undoes those changes.
refactor(Request): Add resolve method to handle routing and parameters, throw NotFoundHttpException for unresolved requests. #64: Added the resolve(Request $request): array method to ServerRequestAdapter and delegated resolution from Request; this PR removes and restructures that logic.
feat(request): Enhance PSR-7 integration with detailed method documentation and improved fallback handling. #19: Introduced the initial Request class with PSR-7 integration and the original resolution methods, which are now being refactored or removed.

Suggested labels

bug

Poem

A bunny hops through code anew,
Caches gone, the logic grew!
No more query hiding here,
Merged parameters, crisp and clear.
Routing now is neat and bright,
The PSR-7 and Yii unite—
Bugs hop out of sight! 🐇✨

📜 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 3e00276 and ca47e26.

📒 Files selected for processing (2)

src/adapter/ServerRequestAdapter.php (0 hunks)
src/http/Request.php (4 hunks)

💤 Files with no reviewable changes (1)

src/adapter/ServerRequestAdapter.php

🧰 Additional context used

🧠 Learnings (10)

📓 Common learnings

Learnt from: terabytesoftw
PR: yii2-extensions/psr-bridge#6
File: tests/http/RequestTest.php:1536-1552
Timestamp: 2025-07-20T16:35:15.341Z
Learning: In the yii2-extensions/psr-bridge project, the base TestCase class already handles $_SERVER cleanup in setUp() and tearDown() methods, so individual test methods that extend TestCase don't need manual $_SERVER restoration.

Learnt from: terabytesoftw
PR: yii2-extensions/psr-bridge#6
File: tests/http/RequestTest.php:1536-1552
Timestamp: 2025-07-20T16:35:15.341Z
Learning: In the yii2-extensions/psr-bridge project, the base TestCase class already handles $_SERVER cleanup in setUp() and tearDown() methods (lines 28 and 32), so individual test methods that extend TestCase don't need manual $_SERVER restoration.

Learnt from: terabytesoftw
PR: yii2-extensions/psr-bridge#64
File: tests/http/StatelessApplicationTest.php:1939-1967
Timestamp: 2025-08-06T22:52:05.363Z
Learning: In yii2-extensions/psr-bridge tests, when testing specific component methods like Request::resolve(), it's necessary to call $app->handle($request) first to initialize all application components before testing the method in isolation. This ensures proper component lifecycle initialization.

Learnt from: terabytesoftw
PR: yii2-extensions/psr-bridge#21
File: tests/http/PSR7ResponseTest.php:0-0
Timestamp: 2025-07-22T00:50:26.546Z
Learning: In yii2-extensions/psr-bridge, the ResponseAdapter::formatCookieHeader() method uses `$expire !== 1` to skip validation for Yii2's special deletion cookies, but this should be extended to handle all expired cookies, not just the special case where expire=1.

Learnt from: terabytesoftw
PR: yii2-extensions/psr-bridge#6
File: tests/http/RequestTest.php:1564-1578
Timestamp: 2025-07-20T16:33:57.495Z
Learning: The TestCase class in yii2-extensions/psr-bridge automatically handles $_SERVER superglobal cleanup by saving its original state before each test and restoring it afterward in setUp() and tearDown() methods. Manual $_SERVER cleanup in individual test methods is unnecessary when extending this TestCase.

Learnt from: terabytesoftw
PR: yii2-extensions/psr-bridge#21
File: tests/http/PSR7ResponseTest.php:0-0
Timestamp: 2025-07-22T01:01:13.426Z
Learning: In yii2-extensions/psr-bridge, expired cookies should not be hashed/validated because they are deletion cookies meant to remove existing cookies from the client browser. The validation logic should only apply to live cookies (expire=0 or expire >= current time) and skip validation for both the special Yii2 deletion case (expire=1) and regular expired cookies.

Learnt from: terabytesoftw
PR: yii2-extensions/psr-bridge#53
File: src/http/ErrorHandler.php:258-272
Timestamp: 2025-08-03T16:24:09.241Z
Learning: In yii2-extensions/psr-bridge, the StatelessApplication creates a new Response instance for each request in the reset() method, then passes it to ErrorHandler::setResponse(). This means the template response is not shared across requests, so calling clear() on it in createErrorResponse() is safe and doesn't cause side effects.

Learnt from: terabytesoftw
PR: yii2-extensions/psr-bridge#53
File: src/http/ErrorHandler.php:258-272
Timestamp: 2025-08-03T16:24:09.241Z
Learning: In yii2-extensions/psr-bridge, the StatelessApplication creates a new Response instance for each request in the reset() method, then passes it to ErrorHandler::setResponse(). This means the template response is not shared across requests, so calling clear() on it in createErrorResponse() is safe and doesn't cause side effects.

Learnt from: terabytesoftw
PR: yii2-extensions/psr-bridge#53
File: src/http/ErrorHandler.php:258-272
Timestamp: 2025-08-03T16:24:09.241Z
Learning: In yii2-extensions/psr-bridge, the StatelessApplication creates a new Response instance for each request in the reset() method (line 408: `$this->response = new Response($this->components['response'] ?? []);`), then passes it to ErrorHandler::setResponse(). This means the template response is not shared across requests, so calling clear() on it in createErrorResponse() is safe and doesn't cause side effects.

📚 Learning: in yii2-extensions/psr-bridge tests, when testing specific component methods like request::resolve()...

Learnt from: terabytesoftw
PR: yii2-extensions/psr-bridge#64
File: tests/http/StatelessApplicationTest.php:1939-1967
Timestamp: 2025-08-06T22:52:05.363Z
Learning: In yii2-extensions/psr-bridge tests, when testing specific component methods like Request::resolve(), it's necessary to call $app->handle($request) first to initialize all application components before testing the method in isolation. This ensures proper component lifecycle initialization.

Applied to files:

src/http/Request.php

📚 Learning: in yii2-extensions/psr-bridge, the responseadapter::formatcookieheader() method uses `$expire !== 1`...

Learnt from: terabytesoftw
PR: yii2-extensions/psr-bridge#21
File: tests/http/PSR7ResponseTest.php:0-0
Timestamp: 2025-07-22T00:50:26.546Z
Learning: In yii2-extensions/psr-bridge, the ResponseAdapter::formatCookieHeader() method uses `$expire !== 1` to skip validation for Yii2's special deletion cookies, but this should be extended to handle all expired cookies, not just the special case where expire=1.

Applied to files:

src/http/Request.php

📚 Learning: in the yii2-extensions/psr-bridge project, the base testcase class already handles $_server cleanup ...

Learnt from: terabytesoftw
PR: yii2-extensions/psr-bridge#6
File: tests/http/RequestTest.php:1536-1552
Timestamp: 2025-07-20T16:35:15.341Z
Learning: In the yii2-extensions/psr-bridge project, the base TestCase class already handles $_SERVER cleanup in setUp() and tearDown() methods, so individual test methods that extend TestCase don't need manual $_SERVER restoration.

Applied to files:

src/http/Request.php

📚 Learning: in the yii2-extensions/psr-bridge project, the base testcase class already handles $_server cleanup ...

Learnt from: terabytesoftw
PR: yii2-extensions/psr-bridge#6
File: tests/http/RequestTest.php:1536-1552
Timestamp: 2025-07-20T16:35:15.341Z
Learning: In the yii2-extensions/psr-bridge project, the base TestCase class already handles $_SERVER cleanup in setUp() and tearDown() methods (lines 28 and 32), so individual test methods that extend TestCase don't need manual $_SERVER restoration.

Applied to files:

src/http/Request.php

📚 Learning: in yii2-extensions/psr-bridge, expired cookies should not be hashed/validated because they are delet...

Learnt from: terabytesoftw
PR: yii2-extensions/psr-bridge#21
File: tests/http/PSR7ResponseTest.php:0-0
Timestamp: 2025-07-22T01:01:13.426Z
Learning: In yii2-extensions/psr-bridge, expired cookies should not be hashed/validated because they are deletion cookies meant to remove existing cookies from the client browser. The validation logic should only apply to live cookies (expire=0 or expire >= current time) and skip validation for both the special Yii2 deletion case (expire=1) and regular expired cookies.

Applied to files:

src/http/Request.php

📚 Learning: the testcase class in yii2-extensions/psr-bridge automatically handles $_server superglobal cleanup ...

Learnt from: terabytesoftw
PR: yii2-extensions/psr-bridge#6
File: tests/http/RequestTest.php:1564-1578
Timestamp: 2025-07-20T16:33:57.495Z
Learning: The TestCase class in yii2-extensions/psr-bridge automatically handles $_SERVER superglobal cleanup by saving its original state before each test and restoring it afterward in setUp() and tearDown() methods. Manual $_SERVER cleanup in individual test methods is unnecessary when extending this TestCase.

Applied to files:

src/http/Request.php

📚 Learning: in yii2-extensions/psr-bridge, the statelessapplication creates a new response instance for each req...

Learnt from: terabytesoftw
PR: yii2-extensions/psr-bridge#53
File: src/http/ErrorHandler.php:258-272
Timestamp: 2025-08-03T16:24:09.241Z
Learning: In yii2-extensions/psr-bridge, the StatelessApplication creates a new Response instance for each request in the reset() method, then passes it to ErrorHandler::setResponse(). This means the template response is not shared across requests, so calling clear() on it in createErrorResponse() is safe and doesn't cause side effects.

Applied to files:

src/http/Request.php

📚 Learning: in yii2-extensions/psr-bridge cookie validation logic, a cookie is only considered expired when expi...

Learnt from: terabytesoftw
PR: yii2-extensions/psr-bridge#21
File: tests/adapter/ResponseAdapterTest.php:436-450
Timestamp: 2025-07-22T10:56:44.424Z
Learning: In yii2-extensions/psr-bridge cookie validation logic, a cookie is only considered expired when expire < current time (strictly less than). When expire == current time, the cookie is still valid and validation/hashing should apply. Only cookies with expire < current time should skip validation.

Applied to files:

src/http/Request.php

📚 Learning: in yii2-extensions/psr-bridge, the statelessapplication creates a new response instance for each req...

Learnt from: terabytesoftw
PR: yii2-extensions/psr-bridge#53
File: src/http/ErrorHandler.php:258-272
Timestamp: 2025-08-03T16:24:09.241Z
Learning: In yii2-extensions/psr-bridge, the StatelessApplication creates a new Response instance for each request in the reset() method (line 408: `$this->response = new Response($this->components['response'] ?? []);`), then passes it to ErrorHandler::setResponse(). This means the template response is not shared across requests, so calling clear() on it in createErrorResponse() is safe and doesn't cause side effects.

Applied to files:

src/http/Request.php

🧬 Code Graph Analysis (1)

src/http/Request.php (3)

src/adapter/ServerRequestAdapter.php (3)

getQueryParams (236-239)

ServerRequestAdapter (49-490)

resolve (390-404)

src/exception/Message.php (1)

getMessage (223-226)

tests/http/RequestTest.php (2)

testResolve (1447-1589)

RequestTest (20-1699)

⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (2)

GitHub Check: mutation / PHP 8.3-ubuntu-latest
GitHub Check: mutation / PHP 8.3-ubuntu-latest

🔇 Additional comments (3)

src/http/Request.php (3)

8-8: LGTM!

The Yii import is correctly added to support the new usage in the resolve() method.

346-373: LGTM! Improved compatibility with Yii2 query handling.

The updated logic correctly prioritizes parent class query parameters when available, falling back to PSR-7 adapter parameters only when the parent returns an empty array. This preserves compatibility with Yii2's native query parameter handling while maintaining PSR-7 interoperability.

531-569: Approve PSR-7 resolve() branch and internal state mutation.

The refactored resolve() correctly merges route parameters with the PSR-7 adapter’s query parameters and calls setQueryParams() to update the request’s internal state only—without touching $_GET. This matches the original adapter behavior and is fully covered by the existing testResolve() cases. No further changes required.

✨ Finishing Touches

📝 Generate Docstrings

🧪 Generate unit tests

Create PR with unit tests
Post copyable unit tests in a comment
Commit unit tests in branch fix_mini_53

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ 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.
- Explain this complex logic.
- 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 explain this code block.
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 explain its main purpose.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

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.
@coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
@coderabbitai generate unit tests to generate unit tests for this 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.

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.

codecov · 2025-08-07T02:00:32Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 100.00%. Comparing base (3e00276) to head (ca47e26).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files

@@             Coverage Diff             @@
##                main       #66   +/-   ##
===========================================
  Coverage     100.00%   100.00%           
+ Complexity       297       296    -1     
===========================================
  Files             12        12           
  Lines            759       759           
===========================================
  Hits             759       759

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

refactor(Request): Enhance query parameter handling and resolution lo…

ca47e26

…gic for PSR-7 compatibility.

terabytesoftw added the bug Something isn't working label Aug 7, 2025

terabytesoftw merged commit 0c24a14 into main Aug 7, 2025
29 checks passed

terabytesoftw deleted the fix_mini_53 branch August 7, 2025 02:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

refactor(Request): Enhance query parameter handling and resolution logic for PSR-7 compatibility. #66

refactor(Request): Enhance query parameter handling and resolution logic for PSR-7 compatibility. #66

Uh oh!

terabytesoftw commented Aug 7, 2025 •

edited by coderabbitai bot

Loading

Uh oh!

coderabbitai bot commented Aug 7, 2025 •

edited

Loading

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

Uh oh!

codecov bot commented Aug 7, 2025 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

refactor(Request): Enhance query parameter handling and resolution logic for PSR-7 compatibility. #66

refactor(Request): Enhance query parameter handling and resolution logic for PSR-7 compatibility. #66

Uh oh!

Conversation

terabytesoftw commented Aug 7, 2025 • edited by coderabbitai bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary by CodeRabbit

Uh oh!

coderabbitai bot commented Aug 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Sequence Diagram(s)

Estimated code review effort

Possibly related PRs

Suggested labels

Poem

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

Uh oh!

codecov bot commented Aug 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

terabytesoftw commented Aug 7, 2025 •

edited by coderabbitai bot

Loading

coderabbitai bot commented Aug 7, 2025 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)

codecov bot commented Aug 7, 2025 •

edited

Loading