Merge branch '4.x' into 4.next

Author: ADmad

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: CI
 on:
   push:
     branches:
-      - master
+      - '4.x'
       - '4.next'
   pull_request:
     branches:

templates/Pages/home.php

@@ -87,15 +87,15 @@
                         <div class="message default text-center">
                             <small>Please be aware that this page will not be shown if you turn off debug mode unless you replace templates/Pages/home.php with your own version.</small>
                         </div>
-                        <!-- <div id="url-rewriting-warning" class="alert url-rewriting">
+                        <div id="url-rewriting-warning" style="padding: 1rem; background: #fcebea; color: #cc1f1a; border-color: #ef5753;">
                             <ul>
                                 <li class="bullet problem">
                                     URL rewriting is not properly configured on your server.<br />
                                     1) <a target="_blank" rel="noopener" href="https://book.cakephp.org/4/en/installation.html#url-rewriting">Help me configure it</a><br />
                                     2) <a target="_blank" rel="noopener" href="https://book.cakephp.org/4/en/development/configuration.html#general-configuration">I don't / can't use URL rewriting</a>
                                 </li>
                             </ul>
-                        </div> -->
+                        </div>
                         <?php Debugger::checkSecurityKeys(); ?>
                     </div>
                 </div>

tests/bootstrap.php

@@ -31,7 +31,9 @@
 
 $_SERVER['PHP_SELF'] = '/';
 
-Configure::write('App.fullBaseUrl', 'http://localhost');
+if (empty($_SERVER['HTTP_HOST'])) {
+    Configure::write('App.fullBaseUrl', 'http://localhost');
+}
 
 // DebugKit skips settings these connection config if PHP SAPI is CLI / PHPDBG.
 // But since PagesControllerTest is run with debug enabled and DebugKit is loaded

webroot/css/home.css

@@ -70,3 +70,6 @@ hr {
     padding: 10px;
     margin: 10px 0;
 }
+#url-rewriting-warning {
+    display: none;
+}