File tree Expand file tree Collapse file tree 2 files changed +6
-4
lines changed Expand file tree Collapse file tree 2 files changed +6
-4
lines changed Original file line number Diff line number Diff line change 8
8
use SilverStripe \Control \Controller ;
9
9
use TractorCow \ClassProxy \Generators \ProxyGenerator ;
10
10
use LeKoala \DebugBar \DebugBarUtils ;
11
+ use SilverStripe \Dev \Debug ;
11
12
12
13
class ProxyDBExtension extends Extension
13
14
{
@@ -33,16 +34,12 @@ class ProxyDBExtension extends Extension
33
34
*/
34
35
public function updateProxy (ProxyGenerator &$ proxy )
35
36
{
36
- if (DebugBar::getDebugBar () === false ) {
37
- return ;
38
- }
39
37
if (self ::$ findSource === null ) {
40
38
self ::$ findSource = DebugBar::config ()->get ('find_source ' );
41
39
}
42
40
43
41
// In the closure, $this is the proxied database
44
42
$ callback = function ($ args , $ next ) {
45
-
46
43
// The first argument is always the sql query
47
44
$ sql = $ args [0 ];
48
45
$ parameters = isset ($ args [2 ]) ? $ args [2 ] : [];
Original file line number Diff line number Diff line change 5
5
use SilverStripe \Dev \SapphireTest ;
6
6
use SilverStripe \ORM \DB ;
7
7
use LeKoala \DebugBar \Extension \ProxyDBExtension ;
8
+ use LeKoala \DebugBar \DebugBar ;
8
9
9
10
class ProxyDBExtensionTest extends SapphireTest
10
11
{
@@ -17,10 +18,14 @@ public function setUp(): void
17
18
{
18
19
parent ::setUp ();
19
20
$ this ->conn = DB ::get_conn ();
21
+ DebugBar::initDebugBar ();
20
22
}
21
23
22
24
public function testQueriesAreCollected ()
23
25
{
26
+ $ res = DebugBar::getDebugBar ();
27
+ $ this ->assertTrue ($ res !== false );
28
+ DB ::query ("SELECT 0 " );
24
29
$ this ->assertNotEmpty (ProxyDBExtension::getQueries ());
25
30
ProxyDBExtension::resetQueries ();
26
31
}
You can’t perform that action at this time.
0 commit comments