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

[HttpKernel] Fix issue when resetting DumpDataCollector #25226

Merged
merged 1 commit into from Dec 1, 2017

Conversation

Projects
None yet
6 participants
@Pierstoval
Contributor

Pierstoval commented Nov 30, 2017

Q A
Branch? 3.4
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
License MIT

Fixes issue when resetting the collector and no stopwatch was provided in the constructor.

By the way, current workaround is to composer require symfony/stopwatch, so this is not a "big blocker".

@xabbuh

xabbuh approved these changes Nov 30, 2017

@nicolas-grekas

This comment has been minimized.

Show comment
Hide comment
@nicolas-grekas
Member

nicolas-grekas commented Dec 1, 2017

Thank you @Pierstoval.

@nicolas-grekas nicolas-grekas merged commit 159fedc into symfony:3.4 Dec 1, 2017

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
fabbot.io Your code looks good.
Details

nicolas-grekas added a commit that referenced this pull request Dec 1, 2017

bug #25226 [HttpKernel] Fix issue when resetting DumpDataCollector (P…
…ierstoval)

This PR was merged into the 3.4 branch.

Discussion
----------

[HttpKernel] Fix issue when resetting DumpDataCollector

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

Fixes issue when resetting the collector and no stopwatch was provided in the constructor.

By the way, current workaround is to `composer require symfony/stopwatch`, so this is not a "big blocker".

Commits
-------

159fedc [HttpKernel] Fix issue when resetting DumpDataCollector
@stof

This comment has been minimized.

Show comment
Hide comment
@stof

stof Dec 1, 2017

Member

That looks weird anyway. The DumpDataCollector is not collecting stuff from the Stopwatch. It uses it to profile itself.
So it should not be responsible for resetting it at all actually (the TimeDataCollector is the one resetting it).
So I think this call should just be removed entirely.

Member

stof commented Dec 1, 2017

That looks weird anyway. The DumpDataCollector is not collecting stuff from the Stopwatch. It uses it to profile itself.
So it should not be responsible for resetting it at all actually (the TimeDataCollector is the one resetting it).
So I think this call should just be removed entirely.

@Pierstoval Pierstoval deleted the Pierstoval:fix-dump-data-collector branch Dec 1, 2017

This was referenced Dec 4, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment