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

Replace DbalLogger by DebugMiddleware #1517

Merged
merged 1 commit into from
May 21, 2022

Conversation

l-vo
Copy link
Contributor

@l-vo l-vo commented May 2, 2022

Fixes #1431

@l-vo l-vo force-pushed the replace_debugstack_dballogger branch 16 times, most recently from 1a96247 to 204259f Compare May 2, 2022 20:54
@l-vo l-vo changed the title Replace DbalLogger by DebugMiddleware [WIP] Replace DbalLogger by DebugMiddleware May 2, 2022
@l-vo l-vo force-pushed the replace_debugstack_dballogger branch from 204259f to ab63a76 Compare May 2, 2022 20:55
DataCollector/DoctrineDataCollector.php Outdated Show resolved Hide resolved
Middleware/BacktraceDebugDataHolder.php Outdated Show resolved Hide resolved
Middleware/BacktraceDebugDataHolder.php Outdated Show resolved Hide resolved
Middleware/BacktraceDebugDataHolder.php Outdated Show resolved Hide resolved
Middleware/BacktraceDebugDataHolder.php Outdated Show resolved Hide resolved
Middleware/BacktraceDebugDataHolder.php Outdated Show resolved Hide resolved
Resources/config/dbal.xml Outdated Show resolved Hide resolved
@l-vo l-vo force-pushed the replace_debugstack_dballogger branch 10 times, most recently from a475545 to cae4592 Compare May 4, 2022 20:52
@l-vo l-vo changed the title [WIP] Replace DbalLogger by DebugMiddleware Replace DbalLogger by DebugMiddleware May 5, 2022
@l-vo
Copy link
Contributor Author

l-vo commented May 6, 2022

@stof PR updated according to your feedbacks 🙂

DependencyInjection/DoctrineExtension.php Show resolved Hide resolved
DependencyInjection/DoctrineExtension.php Outdated Show resolved Hide resolved
Middleware/DebugMiddleware.php Show resolved Hide resolved
@l-vo l-vo force-pushed the replace_debugstack_dballogger branch from eea2c4a to 9cadf2c Compare May 6, 2022 20:28
@l-vo
Copy link
Contributor Author

l-vo commented May 7, 2022

@stof Feedbacks answered :)

@dmaicher
Copy link
Contributor

dmaicher commented May 9, 2022

I think this should go to 2.7.x, or? Not sure this qualifies as a patch?

@ostrolucky
Copy link
Member

indeed

@l-vo
Copy link
Contributor Author

l-vo commented May 9, 2022

I targeted 2.6 because on the Symfony side, the choice was to pass middlewares adds in a patch version to fix the deprecation about DebugStack. But maybe here the case is a bit different... It's up to you to choose 🙂

@l-vo
Copy link
Contributor Author

l-vo commented May 9, 2022

@dmaicher @ostrolucky So given my explanation #1517 (comment) should I target 2.7 instead ?

@ostrolucky ostrolucky changed the base branch from 2.6.x to 2.7.x May 9, 2022 21:32
@l-vo l-vo force-pushed the replace_debugstack_dballogger branch from 9cadf2c to 2677c0c Compare May 11, 2022 21:07
@l-vo l-vo force-pushed the replace_debugstack_dballogger branch from 2677c0c to 5d08e5b Compare May 11, 2022 21:10
@ostrolucky ostrolucky requested a review from stof May 15, 2022 19:22
@ostrolucky ostrolucky merged commit 9583584 into doctrine:2.7.x May 21, 2022
@l-vo l-vo deleted the replace_debugstack_dballogger branch May 27, 2022 09:44
@dmaicher dmaicher added this to the 2.7.0 milestone Jun 7, 2022
@dmaicher
Copy link
Contributor

dmaicher commented Jun 7, 2022

@l-vo I just tested this on one of my apps and it looks like for me its not working as intended.

with DoctrineBundle 2.6.3:
Screenshot from 2022-06-07 20-26-45

With your changes on 2.7.x and the same page:
Screenshot from 2022-06-07 20-25-07

Did you test this on a real app?

@l-vo
Copy link
Contributor Author

l-vo commented Jun 7, 2022

@dmaicher Yes, I tested on a real app, which version of the doctrine bridge and dbal do you use ?

@dmaicher
Copy link
Contributor

dmaicher commented Jun 7, 2022

@dmaicher Yes, I tested on a real app, which version of the doctrine bridge and dbal do you use ?

I'm using those

doctrine/dbal                            3.3.6                    Powerful PHP database abstraction layer (DBAL) with many features for database schema introspection and management.
symfony/doctrine-bridge                  v5.4.9                   Provides integration for Doctrine with various Symfony components

@l-vo
Copy link
Contributor Author

l-vo commented Jun 7, 2022

It works on b700275 (after #1488) for me, could you try this commit on your project ? Maybe a bad conflict resolution has broken the system ?

@l-vo
Copy link
Contributor Author

l-vo commented Jun 7, 2022

It works on b700275 (after #1488) for me, could you try this commit on your project ? Maybe a bad conflict resolution has broken the system ?

My bad, I didn't look the good commit; indeed; there is a problem, I'll take a look.

l-vo added a commit to l-vo/DoctrineBundle that referenced this pull request Jun 8, 2022
@l-vo
Copy link
Contributor Author

l-vo commented Jun 8, 2022

@dmaicher I don't understand how it occurred, but it seems the dbal.xml file hasn't been pushed. Fix in #1535.

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.

Implement a DBAL middleware for the profiler collector
4 participants