Skip to content

[FrameworkBundle] Add conflict with WebProfilerBundle < 6.4 #52218

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

Merged
merged 1 commit into from
Oct 21, 2023

Conversation

HeahDude
Copy link
Contributor

Q A
Branch? 6.4
Bug fix? yes
New feature? no
Deprecations? no
Issues #52210
License MIT

@nicolas-grekas
Copy link
Member

Works for me, but can you think of any other way that wouldn't involve a conflict?

@HeahDude
Copy link
Contributor Author

HeahDude commented Oct 21, 2023

The only other way I can think of would be to disallow FWB 6.4 by adding the conflict in WPB 5.4.

@smnandre
Copy link
Member

If the problem happen only with 2 datacollectors, would it be possible to add a specific conflict ?

FMB 6.4 has a conflict with worflow < 6.4, but allow console 5.4.. so i guess there won't be a problem with the new worflow profiler

What if we add a conflict on console < 6.4 on FMB ?

Copy link
Member

@nicolas-grekas nicolas-grekas left a comment

Choose a reason for hiding this comment

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

On closer look, this is fine to me 🚀

@nicolas-grekas
Copy link
Member

Thank you @HeahDude.

@nicolas-grekas nicolas-grekas merged commit e6d1ed4 into symfony:6.4 Oct 21, 2023
@chalasr
Copy link
Member

chalasr commented Oct 21, 2023

@smnandre That wouldn’t have been enough to fix the issue at hand as the missing template is both located in and rendered by WPB. See the failing build which does run with Console v6.4-dev

@HeahDude HeahDude deleted the fix-webprofiler-high-deps branch October 21, 2023 18:35
@smnandre
Copy link
Member

@nicolas-grekas @chalasr

I "fixed" it in another way..... by declaring the collector separately

--> Changes: 6.4...smnandre:symfony:fix/console-profiler
--> Runs: https://github.com/smnandre/symfony/actions/runs/6599172839/job/17927922180

But..... is it only because this one was merged ? (even if i restored the conflict as it was before ?) 😨

@nicolas-grekas
Copy link
Member

Send the PR! :)

chalasr added a commit that referenced this pull request Oct 22, 2023
…tered (smnandre)

This PR was squashed before being merged into the 6.4 branch.

Discussion
----------

[FrameworkBundle] Fix CommandDataCollector is always registered

| Q             | A
| ------------- | ---
| Branch?       | 6.4
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Issues        | Fix #52210
| License       | MIT

Another attempt at fixing #52210, allowing to revert #52218 and leave the conflict constraints untouched

CommandDataCollector was always registered, and not always removed from the container when not needed/invalid.

Commits
-------

6e2c2ec [FrameworkBundle] Fix CommandDataCollector is always registered
This was referenced Oct 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants