Namespaced

.gitignore

@@ -0,0 +1,4 @@
+.claude/
+docs/
+phpstan.neon
+phpstan-baseline.neon

ProcessTracyAdminer.module.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace ProcessWire;
 
 class ProcessTracyAdminer extends Process implements Module {
     public static function getModuleInfo() {
@@ -7,11 +7,11 @@ public static function getModuleInfo() {
             'summary' => __('Adminer page for TracyDebugger.', __FILE__),
             'author' => 'Adrian Jones',
             'href' => 'https://processwire.com/talk/topic/12208-tracy-debugger/',
-            'version' => '2.0.3',
+            'version' => '2.0.4',
             'autoload' => false,
             'singular' => true,
             'icon' => 'database',
-            'requires'  => 'ProcessWire>=2.7.2, PHP>=5.4.4, TracyDebugger, ProcessTracyAdminerRenderer',
+            'requires'  => 'ProcessWire>=3.0.0, PHP>=7.1.0, TracyDebugger, ProcessTracyAdminerRenderer',
             'installs' => array('ProcessTracyAdminerRenderer'),
             'page' => array(
                 'name' => 'adminer',
@@ -30,8 +30,8 @@ public function ___execute() {
         }
         else {
             return '
-            <iframe id="adminer-iframe" src="'.str_replace('/adminer/', '/adminer-renderer/', $_SERVER['REQUEST_URI']).'" style="width:100vw; border: none; padding:0; margin:0;"></iframe>
-            <script>
+            <iframe id="adminer-iframe" src="'.htmlspecialchars(str_replace('/adminer/', '/adminer-renderer/', $_SERVER['REQUEST_URI'] ?? ''), ENT_QUOTES, 'UTF-8').'" style="width:100vw; border: none; padding:0; margin:0;"></iframe>
+            <script' . TracyDebugger::getNonceAttr() . '>
                 const adminer_iframe = document.getElementById("adminer-iframe");
                 window.addEventListener("popstate", function (event) {
                     adminer_iframe.src = location.href.replace("/adminer/", "/adminer-renderer/");

ProcessTracyAdminerRenderer.module.php

@@ -1,17 +1,18 @@
-<?php
+<?php namespace ProcessWire;
 
 class ProcessTracyAdminerRenderer extends Process implements Module {
+
     public static function getModuleInfo() {
         return array(
             'title' => __('Process Tracy Adminer Renderer', __FILE__),
             'summary' => __('Adminer renderer for TracyDebugger.', __FILE__),
             'author' => 'Adrian Jones',
             'href' => 'https://processwire.com/talk/topic/12208-tracy-debugger/',
-            'version' => '2.0.3',
+            'version' => '2.0.4',
             'autoload' => false,
             'singular' => true,
             'icon' => 'database',
-            'requires'  => 'ProcessWire>=2.7.2, PHP>=5.4.4, TracyDebugger',
+            'requires'  => 'ProcessWire>=3.0.0, PHP>=7.1.0, TracyDebugger',
             'page' => array(
                 'name' => 'adminer-renderer',
                 'parent' => 'setup',
@@ -22,54 +23,8 @@ public static function getModuleInfo() {
     }
 
     public function ___execute() {
-
-        function adminneo_instance() {
-
-            foreach (glob(__DIR__.'/panels/Adminer/plugins/*.php') as $filename) {
-                require_once $filename/*NoCompile*/;
-            }
-
-            $tracyConfig = wire('modules')->getModuleConfigData('TracyDebugger');
-
-            $plugins = [
-                new \AdminNeo\ExternalLoginPlugin(true),
-                new \AdminNeo\FrameSupportPlugin(["self"]),
-                new \AdminNeo\ProcessWirePlugin(),
-                new \AdminNeo\JsonDumpPlugin,
-                new \AdminNeo\JsonPreviewPlugin($tracyConfig['adminerJsonMaxLevel'], $tracyConfig['adminerJsonInTable'], $tracyConfig['adminerJsonInEdit'], $tracyConfig['adminerJsonMaxTextLength']),
-                new \AdminNeo\XmlDumpPlugin,
-                new \AdminNeo\Bz2OutputPlugin,
-                new \AdminNeo\ZipOutputPlugin
-            ];
-
-            $config = [
-                "servers" => [
-                    [
-                        "driver" => "mysql",
-                        "server" => wire('config')->dbHost . (wire('config')->dbPort ? ':' . wire('config')->dbPort : ''),
-                        "database" => wire('config')->dbName,
-                        "username" => wire('config')->dbUser,
-                        "password" => wire('config')->dbPass
-                    ]
-                ],
-                "jsonValuesDetection" => true,
-                "jsonValuesAutoFormat" => true,
-                "preferSelection" => true,
-                "colorVariant" => $tracyConfig['adminerThemeColor'],
-                "cssUrls" => [
-                    wire('config')->urls->root . 'site/modules/TracyDebugger/panels/Adminer/css/tweaks.css'
-                ],
-                "jsUrls" => [
-                    wire('config')->urls->root . 'site/modules/TracyDebugger/panels/Adminer/scripts/tweaks.js'
-                ]
-            ];
-
-            return \AdminNeo\Admin::create($config, $plugins);
-        }
-
-        require_once __DIR__ . '/panels/Adminer/adminneo.php'/*NoCompile*/;
-
+        require_once __DIR__ . '/panels/Adminer/adminneo-instance.php';
+        require_once __DIR__ . '/panels/Adminer/adminneo.php';
         exit;
     }
-
 }