From a515bfe2bb1f5aece5cbdf0896f6350a8b09e606 Mon Sep 17 00:00:00 2001
From: Kevin Pfeifer <kevin.pfeifer@sunlime.at>
Date: Mon, 16 Oct 2023 07:36:24 +0200
Subject: [PATCH] use namespaced functions

---
 src/Cache/Engine/DebugEngine.php               | 1 +
 src/Controller/MailPreviewController.php       | 1 +
 src/DebugPanel.php                             | 1 +
 src/DebugTimer.php                             | 1 +
 src/ToolbarService.php                         | 1 +
 src/View/Helper/CredentialsHelper.php          | 1 +
 templates/Dashboard/index.php                  | 2 ++
 templates/MailPreview/email.php                | 3 +++
 templates/MailPreview/index.php                | 3 +++
 templates/Panels/view.php                      | 1 +
 templates/Requests/view.php                    | 1 +
 templates/element/cache_panel.php              | 1 +
 templates/element/deprecations_panel.php       | 2 ++
 templates/element/environment_panel.php        | 2 ++
 templates/element/history_panel.php            | 2 ++
 templates/element/log_panel.php                | 2 ++
 templates/element/mail_panel.php               | 2 ++
 templates/element/packages_panel.php           | 1 +
 templates/element/preview_header.php           | 1 +
 templates/element/routes_panel.php             | 1 +
 templates/element/sql_log_panel.php            | 1 +
 templates/element/timer_panel.php              | 1 +
 templates/layout/mailer.php                    | 5 ++++-
 templates/layout/toolbar.php                   | 1 +
 tests/TestCase/Panel/DeprecationsPanelTest.php | 1 +
 tests/bootstrap.php                            | 3 +--
 26 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/Cache/Engine/DebugEngine.php b/src/Cache/Engine/DebugEngine.php
index d976fef2e..ef8e4c997 100644
--- a/src/Cache/Engine/DebugEngine.php
+++ b/src/Cache/Engine/DebugEngine.php
@@ -17,6 +17,7 @@
 use Cake\Cache\CacheEngine;
 use Cake\Cache\CacheRegistry;
 use Psr\Log\LoggerInterface;
+use function Cake\Core\namespaceSplit;
 
 /**
  * A spying proxy for cache engines.
diff --git a/src/Controller/MailPreviewController.php b/src/Controller/MailPreviewController.php
index 067e6630d..8f7116c63 100644
--- a/src/Controller/MailPreviewController.php
+++ b/src/Controller/MailPreviewController.php
@@ -26,6 +26,7 @@
 use DebugKit\Mailer\PreviewResult;
 use DebugKit\Mailer\SentMailResult;
 use Psr\Http\Message\ResponseInterface;
+use function Cake\Collection\collection;
 
 /**
  * Provides access to the MailPreview classes for visually debugging email sending
diff --git a/src/DebugPanel.php b/src/DebugPanel.php
index 567b066ff..442e182f3 100644
--- a/src/DebugPanel.php
+++ b/src/DebugPanel.php
@@ -18,6 +18,7 @@
 use Cake\Event\EventInterface;
 use Cake\Event\EventListenerInterface;
 use Cake\Utility\Inflector;
+use function Cake\Core\namespaceSplit;
 
 /**
  * Base class for debug panels.
diff --git a/src/DebugTimer.php b/src/DebugTimer.php
index 5e72527ed..31ee3dd5d 100644
--- a/src/DebugTimer.php
+++ b/src/DebugTimer.php
@@ -16,6 +16,7 @@
 namespace DebugKit;
 
 use Cake\Error\Debugger;
+use function Cake\Core\env;
 
 /**
  * Contains methods for Profiling and creating timers.
diff --git a/src/ToolbarService.php b/src/ToolbarService.php
index 5cf1474f7..578f22b7e 100644
--- a/src/ToolbarService.php
+++ b/src/ToolbarService.php
@@ -27,6 +27,7 @@
 use DebugKit\Panel\PanelRegistry;
 use Exception;
 use Psr\Http\Message\ResponseInterface;
+use function Cake\Core\env;
 
 /**
  * Used to create the panels and inject a toolbar into
diff --git a/src/View/Helper/CredentialsHelper.php b/src/View/Helper/CredentialsHelper.php
index 3d731285a..da7daa8cf 100644
--- a/src/View/Helper/CredentialsHelper.php
+++ b/src/View/Helper/CredentialsHelper.php
@@ -17,6 +17,7 @@
 
 use Cake\Utility\Hash;
 use Cake\View\Helper;
+use function Cake\Core\h;
 
 /**
  * CredentialsHelper
diff --git a/templates/Dashboard/index.php b/templates/Dashboard/index.php
index d7468e1f2..56c25e9b7 100644
--- a/templates/Dashboard/index.php
+++ b/templates/Dashboard/index.php
@@ -2,6 +2,8 @@
 /**
  * @var \App\View\AppView $this
  */
+
+use function Cake\Core\h;
 ?>
 <h1>Debug Kit Dashboard</h1>
 
diff --git a/templates/MailPreview/email.php b/templates/MailPreview/email.php
index 2529d93e1..d105038e9 100644
--- a/templates/MailPreview/email.php
+++ b/templates/MailPreview/email.php
@@ -1,3 +1,6 @@
+<?php
+use function Cake\Core\h;
+?>
 <style>
     html, body {
         height: 100%;
diff --git a/templates/MailPreview/index.php b/templates/MailPreview/index.php
index 6e7d49dfa..0c2bada07 100644
--- a/templates/MailPreview/index.php
+++ b/templates/MailPreview/index.php
@@ -1,3 +1,6 @@
+<?php
+use function Cake\Core\h;
+?>
 <?php foreach ($mailPreviews as $plugin => $previews) : ?>
 <h3><?= $plugin ?></h3>
     <?php foreach ($previews as $preview) : ?>
diff --git a/templates/Panels/view.php b/templates/Panels/view.php
index 81eeeb091..deb4557f7 100644
--- a/templates/Panels/view.php
+++ b/templates/Panels/view.php
@@ -3,6 +3,7 @@
  * @var \DebugKit\View\AjaxView $this
  * @var \DebugKit\Model\Entity\Panel $panel
  */
+use function Cake\Core\h;
 ?>
 <h2 class="c-panel__title"><?= h($panel->title) ?></h2>
 <div class="c-panel__content">
diff --git a/templates/Requests/view.php b/templates/Requests/view.php
index 25d378dc1..f01fa135d 100644
--- a/templates/Requests/view.php
+++ b/templates/Requests/view.php
@@ -7,6 +7,7 @@
 use Cake\Routing\Router;
 use Cake\Core\Configure;
 use Cake\Utility\Inflector;
+use function Cake\Core\h;
 
 ?>
 <div class="c-panel-content-container js-panel-content-container">
diff --git a/templates/element/cache_panel.php b/templates/element/cache_panel.php
index 2544c6296..2b142d5ff 100644
--- a/templates/element/cache_panel.php
+++ b/templates/element/cache_panel.php
@@ -17,6 +17,7 @@
  * @var array $metrics
  * @var array $logs
  */
+use function Cake\Core\h;
 ?>
 <div class="c-cache-panel">
     <?php if (empty($metrics)) : ?>
diff --git a/templates/element/deprecations_panel.php b/templates/element/deprecations_panel.php
index 1b468fd7f..806f78f35 100644
--- a/templates/element/deprecations_panel.php
+++ b/templates/element/deprecations_panel.php
@@ -21,6 +21,8 @@
  * @var array $other
  */
 
+use function Cake\Core\h;
+
 $printer = function ($section, $data) {
 ?>
     <h3><?= h(ucfirst($section)) ?> </h3>
diff --git a/templates/element/environment_panel.php b/templates/element/environment_panel.php
index 7ef0397fe..bd78a8e88 100644
--- a/templates/element/environment_panel.php
+++ b/templates/element/environment_panel.php
@@ -22,6 +22,8 @@
  * @var array $cake
  * @var array $php
  */
+
+use function Cake\Core\h;
 ?>
 
 <div class="c-environment-panel">
diff --git a/templates/element/history_panel.php b/templates/element/history_panel.php
index 4eaaa68b0..7be822638 100644
--- a/templates/element/history_panel.php
+++ b/templates/element/history_panel.php
@@ -16,6 +16,8 @@
  * @var \DebugKit\Model\Entity\Panel $panel
  * @var array $requests
  */
+
+use function Cake\Core\h;
 ?>
 <div id="request-history" class="c-history-panel" data-panel-id="<?= $panel->id ?>">
     <?php if (empty($requests)) : ?>
diff --git a/templates/element/log_panel.php b/templates/element/log_panel.php
index b4d1a1e4e..9010810a6 100644
--- a/templates/element/log_panel.php
+++ b/templates/element/log_panel.php
@@ -16,6 +16,8 @@
  * @var \DebugKit\View\AjaxView $this
  * @var \DebugKit\Log\Engine\DebugKitLog $logger
  */
+
+use function Cake\Core\h;
 ?>
 <div class="c-log-panel">
     <?php if ($logger->noLogs()) : ?>
diff --git a/templates/element/mail_panel.php b/templates/element/mail_panel.php
index 95138aabf..251cbdbb1 100644
--- a/templates/element/mail_panel.php
+++ b/templates/element/mail_panel.php
@@ -2,6 +2,8 @@
 /**
  * @var $panel \DebugKit\Model\Entity\Panel
  */
+
+use function Cake\Core\h;
 ?>
 <div class="c-mail-panel">
     <p class="c-flash c-flash--info">
diff --git a/templates/element/packages_panel.php b/templates/element/packages_panel.php
index c7792f196..90be6d741 100644
--- a/templates/element/packages_panel.php
+++ b/templates/element/packages_panel.php
@@ -16,6 +16,7 @@
  * @var \DebugKit\View\AjaxView $this
  * @var array $packages
  */
+use function Cake\Core\h;
 ?>
 <div class="c-packages-panel"
      data-base-url="<?= $this->Url->build([
diff --git a/templates/element/preview_header.php b/templates/element/preview_header.php
index 898dd84a3..9ce050135 100644
--- a/templates/element/preview_header.php
+++ b/templates/element/preview_header.php
@@ -2,6 +2,7 @@
 /**
  * @var \DebugKit\Mailer\AbstractResult $email
  */
+use function Cake\Core\h;
 ?>
     <header>
         <table>
diff --git a/templates/element/routes_panel.php b/templates/element/routes_panel.php
index 2d7924653..f382d03a1 100644
--- a/templates/element/routes_panel.php
+++ b/templates/element/routes_panel.php
@@ -7,6 +7,7 @@
 use Cake\Core\Plugin as CorePlugin;
 use Cake\Utility\Hash;
 use Cake\Utility\Text;
+use function Cake\Core\h;
 
 $routes = Cake\Routing\Router::routes();
 
diff --git a/templates/element/sql_log_panel.php b/templates/element/sql_log_panel.php
index 0d67b7b41..4fbba0c93 100644
--- a/templates/element/sql_log_panel.php
+++ b/templates/element/sql_log_panel.php
@@ -24,6 +24,7 @@
 
 use Doctrine\SqlFormatter\HtmlHighlighter;
 use Doctrine\SqlFormatter\SqlFormatter;
+use function Cake\Core\h;
 
 $noOutput = true;
 ?>
diff --git a/templates/element/timer_panel.php b/templates/element/timer_panel.php
index 91ed890f5..ba72f7f6a 100644
--- a/templates/element/timer_panel.php
+++ b/templates/element/timer_panel.php
@@ -18,6 +18,7 @@
  * @var int $peakMemory
  * @var array $memory
  */
+use function Cake\Core\h;
 ?>
 <div class="c-timer-panel">
     <section>
diff --git a/templates/layout/mailer.php b/templates/layout/mailer.php
index fde8616ff..3e0e86b0b 100644
--- a/templates/layout/mailer.php
+++ b/templates/layout/mailer.php
@@ -1,4 +1,7 @@
-<?php $this->extend('toolbar') ?>
+<?php
+use function Cake\Core\h;
+$this->extend('toolbar');
+?>
 
 <div style="height:calc(100vh);overflow-y:scroll">
     <?php if (empty($noHeader)) : ?>
diff --git a/templates/layout/toolbar.php b/templates/layout/toolbar.php
index f5d3f9f9c..3c23d3780 100644
--- a/templates/layout/toolbar.php
+++ b/templates/layout/toolbar.php
@@ -2,6 +2,7 @@
 /**
  * @var \DebugKit\View\AjaxView $this
  */
+use function Cake\Core\h;
 ?>
 <!DOCTYPE html>
 <html>
diff --git a/tests/TestCase/Panel/DeprecationsPanelTest.php b/tests/TestCase/Panel/DeprecationsPanelTest.php
index 2d126f978..0eae1099e 100644
--- a/tests/TestCase/Panel/DeprecationsPanelTest.php
+++ b/tests/TestCase/Panel/DeprecationsPanelTest.php
@@ -17,6 +17,7 @@
 use Cake\Event\Event;
 use Cake\TestSuite\TestCase;
 use DebugKit\Panel\DeprecationsPanel;
+use function Cake\Core\deprecationWarning;
 
 /**
  * Class DeprecationsPanelTest
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index e708ffdf5..860e0ca66 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -20,6 +20,7 @@
 use Cake\Log\Log;
 use Cake\TestSuite\Fixture\SchemaLoader;
 use DebugKit\DebugKitPlugin;
+use function Cake\Core\env;
 
 require_once 'vendor/autoload.php';
 
@@ -42,8 +43,6 @@
 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');