Merge branch '4.next' into 5.x-merge-4.next

# Conflicts:
#	tests/TestCase/DebugSqlTest.php

Author: LordSimal

tests/TestCase/DebugSqlTest.php

@@ -72,17 +72,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">
-<span style="font-weight:bold;">SELECT</span>
-EXPECTED;
-        $fieldName = $this->connection->getDriver() instanceof Postgres ? '"panels__id"' : 'panels__id';
-        $expected = sprintf($expected, str_replace(ROOT, '', __FILE__), __LINE__ - 10, $fieldName);
-        $this->assertTextContains(str_replace(["\n", "\r"], '', $expected), str_replace(["\n", "\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);
     }
 
     /**