Skip to content

DebugStack should ignore stopQuery when disabled #168

Closed
wants to merge 1 commit into from

3 participants

@dpb587
dpb587 commented Jul 9, 2012

I noticed that DebugStack was adding an empty element when it was disabled. This PR changes it to match startQuery with its behavior.

1) Doctrine\Tests\DBAL\Logging\DebugStackTest::testLoggedQueryDisabled
Failed asserting that two arrays are equal.
--- Expected
+++ Actual
@@ @@
 Array
 (
+    [0] => Array
+        (
+            [executionMS] => 1341871660.9651
+        )
+
 )

I've submitted the PR to 2.0.x since that's where the bug is first seen and is still listed as stable on doctrine-project.org. Preferably this could also be applied to newer branches as well, or I can also submit separate PRs.

@travisbot

This pull request fails (merged d0352d7 into c1e4ec6).

@stof
Doctrine member
stof commented Jul 9, 2012

2.0.x is not maintained anymore for bug fixes, it receives only security fixes.

@dpb587
dpb587 commented Jul 9, 2012

Should I resubmit to a different branch?

@stof
Doctrine member
stof commented Jul 9, 2012

Well, the best way is to submit a PR to master. This is where the development occurs (and where several people can merge it). @beberlei then chooses which PR should be backported to the maintenance branches (this one would be backported to 2.2 at least as it is a bugfix)

@dpb587
dpb587 commented Jul 9, 2012

Thanks - I'll resubmit.

@dpb587 dpb587 closed this Jul 9, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.