Merge pull request #934 from cakephp/4.next-merge

4.x => 4.next merge and fix tests

Author: LordSimal

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ permissions:
 
 jobs:
   testsuite-linux:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -98,7 +98,7 @@ jobs:
 
   cs-stan:
     name: Coding Standard & Static Analysis
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v3

docs.Dockerfile

@@ -1,5 +1,5 @@
 # Generate the HTML output.
-FROM markstory/cakephp-docs-builder as builder
+FROM ghcr.io/cakephp/docs-builder as builder
 
 RUN pip install git+https://github.com/sphinx-contrib/video.git@master
 
@@ -15,7 +15,7 @@ RUN cd /data/docs-builder \
   && cp /data/docs/static/* /data/website/html/_static/
 
 # Build a small nginx container with just the static site in it.
-FROM markstory/cakephp-docs-builder:runtime as runtime
+FROM ghcr.io/cakephp/docs-builder:runtime as runtime
 
 # Configure search index script
 ENV LANGS="en fr ja pt"

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);
     }
 
     /**