From d70c222670f47f6bb0b9ea3f1e99b73cf5dfd25c Mon Sep 17 00:00:00 2001
From: Kevin Pfeifer <kevin.pfeifer@sunlime.at>
Date: Sat, 29 Apr 2023 18:06:54 +0200
Subject: [PATCH 1/2] fix tests

---
 tests/TestCase/DebugSqlTest.php | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/tests/TestCase/DebugSqlTest.php b/tests/TestCase/DebugSqlTest.php
index 9ae92cc26..bd3d7c881 100644
--- a/tests/TestCase/DebugSqlTest.php
+++ b/tests/TestCase/DebugSqlTest.php
@@ -71,21 +71,13 @@ public function testSqlHtmlOnCli()
 
         ob_start();
         $this->assertSame($query, DebugSql::sql($query, true, true));
-        $result = ob_get_clean();
+        $result = strip_tags(ob_get_clean());
+        $result = preg_replace("/[\n\r]/", '', $result);
 
-        $expected = <<<EXPECTED
-<div class="cake-debug-output">
-<span><strong>%s</strong> (line <strong>%d</strong>)</span>
-<pre class="cake-debug">
-SELECT 
-  panels.id AS %s 
-FROM 
-  panels panels
-</pre>
-</div>
-EXPECTED;
-        $expected = sprintf($expected, str_replace(ROOT, '', __FILE__), __LINE__ - 9);
-        $this->assertTextContains(str_replace("\r", '', $expected), str_replace("\r", '', $result));
+        $this->assertStringContainsString(sprintf('%s (line %s)', str_replace(ROOT, '', __FILE__), __LINE__ - 4), $result);
+        $this->assertStringContainsString('SELECT  panels.id AS', $result);
+        $this->assertStringContainsString('panels__id', $result);
+        $this->assertStringContainsString('FROM  panels panels', $result);
     }
 
     /**

From 91e79e3f9fd232ee1d344cd62e10f90e609eb6f7 Mon Sep 17 00:00:00 2001
From: Kevin Pfeifer <kevin.pfeifer@sunlime.at>
Date: Sun, 3 Sep 2023 20:58:15 +0200
Subject: [PATCH 2/2] fix cs

---
 tests/TestCase/DebugSqlTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/TestCase/DebugSqlTest.php b/tests/TestCase/DebugSqlTest.php
index 42146953e..934d600a6 100644
--- a/tests/TestCase/DebugSqlTest.php
+++ b/tests/TestCase/DebugSqlTest.php
@@ -14,7 +14,6 @@
  */
 namespace DebugKit\Test\TestCase;
 
-use Cake\Database\Driver\Postgres;
 use Cake\Datasource\ConnectionManager;
 use Cake\TestSuite\TestCase;
 use DebugKit\DebugSql;