Merge pull request #930 from cakephp/5.x-merge

4.x => 5.x merge

Author: LordSimal

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"

src/Cache/Engine/DebugEngine.php

@@ -336,6 +336,7 @@ public function __toString(): string
     {
         /** @psalm-suppress RedundantPropertyInitializationCheck */
         if (isset($this->_engine)) {
+            // phpcs:ignore SlevomatCodingStandard.Variables.UnusedVariable.UnusedVariable
             [$ns, $class] = namespaceSplit(get_class($this->_engine));
 
             return str_replace('Engine', '', $class);

src/DebugPanel.php

@@ -47,6 +47,7 @@ class DebugPanel implements EventListenerInterface
      */
     public function title(): string
     {
+        // phpcs:ignore SlevomatCodingStandard.Variables.UnusedVariable.UnusedVariable
         [$ns, $name] = namespaceSplit(static::class);
         $name = substr($name, 0, strlen('Panel') * -1);
 
@@ -60,6 +61,7 @@ public function title(): string
      */
     public function elementName(): string
     {
+        // phpcs:ignore SlevomatCodingStandard.Variables.UnusedVariable.UnusedVariable
         [$ns, $name] = namespaceSplit(static::class);
         if ($this->plugin) {
             return $this->plugin . '.' . Inflector::underscore($name);

tests/TestCase/Controller/RequestsControllerTest.php

@@ -57,7 +57,7 @@ public function setUp(): void
     public function testView()
     {
         $request = $this->makeRequest();
-        $panel = $this->makePanel($request);
+        $this->makePanel($request);
 
         $this->configRequest(['headers' => ['Accept' => 'application/json']]);
         $this->get("/debug-kit/toolbar/{$request->id}");

tests/TestCase/ToolbarServiceTest.php

@@ -322,10 +322,6 @@ public function testInjectScriptsLastBodyTag()
      */
     public function testInjectScriptsFileBodies()
     {
-        $request = new Request([
-            'url' => '/articles',
-            'params' => ['plugin' => null],
-        ]);
         $response = new Response([
             'statusCode' => 200,
             'type' => 'text/html',
@@ -348,10 +344,6 @@ public function testInjectScriptsFileBodies()
      */
     public function testInjectScriptsStreamBodies()
     {
-        $request = new Request([
-            'url' => '/articles',
-            'params' => ['plugin' => null],
-        ]);
         $response = new Response([
             'statusCode' => 200,
             'type' => 'text/html',

tests/bootstrap.php

@@ -42,6 +42,8 @@
 define('LOGS', TMP);
 
 require_once CORE_PATH . 'config/bootstrap.php';
+require_once CAKE . 'Core/functions_global.php';
+require_once CAKE . 'Collection/functions_global.php';
 
 date_default_timezone_set('UTC');
 mb_internal_encoding('UTF-8');