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

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

@@ -77,9 +77,9 @@ public function testSqlHtmlOnCli()
 <div class="cake-debug-output">
 <span><strong>%s</strong> (line <strong>%d</strong>)</span>
 <pre class="cake-debug">
-SELECT
-  panels.id AS %s
-FROM
+SELECT 
+  panels.id AS %s 
+FROM 
   panels panels
 </pre>
 </div>