Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

[FrameworkBundle] Add conflict withWebProfilerBundle < 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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged

Conversation

@HeahDude
Copy link
Contributor

QA
Branch?6.4
Bug fix?yes
New feature?no
Deprecations?no
Issues#52210
LicenseMIT

@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
ContributorAuthor

HeahDude commentedOct 21, 2023•
edited
Loading

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-grekasnicolas-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 🚀

HeahDude reacted with thumbs up emoji
@nicolas-grekas
Copy link
Member

Thank you@HeahDude.

@nicolas-grekasnicolas-grekas merged commite6d1ed4 intosymfony:6.4Oct 21, 2023
@chalasr
Copy link
Member

@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

@HeahDudeHeahDude deleted the fix-webprofiler-high-deps branchOctober 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 requestOct 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       | MITAnother attempt at fixing#52210, allowing to revert#52218 and leave the conflict constraints untouchedCommandDataCollector was always registered, and not always removed from the container when not needed/invalid.Commits-------6e2c2ec [FrameworkBundle] Fix CommandDataCollector is always registered
This was referencedOct 29, 2023
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

@nicolas-grekasnicolas-grekasnicolas-grekas approved these changes

Assignees

No one assigned

Projects

None yet

Milestone

6.4

Development

Successfully merging this pull request may close these issues.

5 participants

@HeahDude@nicolas-grekas@smnandre@chalasr@carsonbot
[8]ページ先頭
©2009-2025 Movatter.jp