diff --git a/admin/css/debug-toolbar/toolbar.scss b/admin/css/debug-toolbar/toolbar.scss index 9c5b149d392c..e129a4b1c5b6 100644 --- a/admin/css/debug-toolbar/toolbar.scss +++ b/admin/css/debug-toolbar/toolbar.scss @@ -13,7 +13,6 @@ @import '_mixins'; @import '_settings'; - // DEBUG ICON // ========================================================================== */ @@ -36,6 +35,8 @@ clear: both; text-align: center; + cursor: pointer; + a svg { margin: 8px; max-width: 20px; @@ -56,6 +57,10 @@ // DEBUG BAR // ========================================================================== */ +.debug-bar-vars { + cursor: pointer; +} + #debug-bar { // Position bottom: 0; @@ -227,14 +232,13 @@ // The toolbar preferences #toolbar-position, #toolbar-theme { - a { - padding: 0 6px; - display: inline-flex; - vertical-align: top; + padding: 0 6px; + display: inline-flex; + vertical-align: top; + cursor: pointer; - &:hover { - text-decoration: none; - } + &:hover { + text-decoration: none; } } @@ -242,6 +246,7 @@ #debug-bar-link { display: flex; padding: 6px; + cursor: pointer; } // The toolbar menus @@ -518,43 +523,43 @@ .debug-bar-dtableRow { display: table-row; } - + .debug-bar-dinlineBlock { display: inline-block; } - + .debug-bar-pointer { cursor: pointer; } - + .debug-bar-mleft4 { margin-left: 4px; } - + .debug-bar-level-0 { --level: 0; } - + .debug-bar-level-1 { --level: 1; } - + .debug-bar-level-2 { --level: 2; } - + .debug-bar-level-3 { --level: 3; } - + .debug-bar-level-4 { --level: 4; } - + .debug-bar-level-5 { --level: 5; } - + .debug-bar-level-6 { --level: 6; } diff --git a/phpstan-baseline.php b/phpstan-baseline.php index a5a7fb669b98..4ab7f34e1dec 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -2436,36 +2436,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Test/Mock/MockCURLRequest.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Cannot unset offset string on array\\\\|null\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Test/Mock/MockCache.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockCache\\:\\:assertHas\\(\\) has no return type specified\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockCache.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockCache\\:\\:assertHasValue\\(\\) has no return type specified\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockCache.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockCache\\:\\:assertMissing\\(\\) has no return type specified\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockCache.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Return type \\(mixed\\) of method CodeIgniter\\\\Test\\\\Mock\\\\MockCache\\:\\:get\\(\\) should be covariant with return type \\(array\\|bool\\|float\\|int\\|object\\|string\\|null\\) of method CodeIgniter\\\\Cache\\\\CacheInterface\\:\\:get\\(\\)$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Test/Mock/MockCache.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Return type \\(mixed\\) of method CodeIgniter\\\\Test\\\\Mock\\\\MockCache\\:\\:remember\\(\\) should be covariant with return type \\(array\\|bool\\|float\\|int\\|object\\|string\\|null\\) of method CodeIgniter\\\\Cache\\\\Handlers\\\\BaseHandler\\:\\:remember\\(\\)$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockCache.php', -]; $ignoreErrors[] = [ 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', 'count' => 2, diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css index a3b934b68bd4..4154f4c5c4ca 100644 --- a/system/Debug/Toolbar/Views/toolbar.css +++ b/system/Debug/Toolbar/Views/toolbar.css @@ -17,6 +17,7 @@ padding: 0px; clear: both; text-align: center; + cursor: pointer; } #debug-icon a svg { margin: 8px; @@ -31,6 +32,10 @@ display: none; } +.debug-bar-vars { + cursor: pointer; +} + #debug-bar { bottom: 0; left: 0; @@ -156,19 +161,21 @@ bottom: auto; top: 36px; } -#debug-bar #toolbar-position a, -#debug-bar #toolbar-theme a { +#debug-bar #toolbar-position, +#debug-bar #toolbar-theme { padding: 0 6px; display: inline-flex; vertical-align: top; + cursor: pointer; } -#debug-bar #toolbar-position a:hover, -#debug-bar #toolbar-theme a:hover { +#debug-bar #toolbar-position:hover, +#debug-bar #toolbar-theme:hover { text-decoration: none; } #debug-bar #debug-bar-link { display: flex; padding: 6px; + cursor: pointer; } #debug-bar .ci-label { display: inline-flex; diff --git a/system/Debug/Toolbar/Views/toolbar.tpl.php b/system/Debug/Toolbar/Views/toolbar.tpl.php index 1dba9081fc79..8179c1a8e631 100644 --- a/system/Debug/Toolbar/Views/toolbar.tpl.php +++ b/system/Debug/Toolbar/Views/toolbar.tpl.php @@ -27,21 +27,21 @@
- +
- ↕ - 🔅 + ↕ + 🔅 - + - + ms   MB @@ -50,7 +50,7 @@ - + @@ -64,7 +64,7 @@ - + Vars @@ -72,7 +72,7 @@

- + @@ -80,7 +80,7 @@

- +
@@ -124,7 +124,7 @@ $items) : ?> - +

@@ -148,7 +148,7 @@ - +

Session User Data

 @@ -174,7 +174,7 @@

Request ( )

- +

$_GET

 @@ -191,7 +191,7 @@ - +

$_POST

 @@ -208,7 +208,7 @@ - +

Headers

 @@ -225,7 +225,7 @@ - +

Cookies

 @@ -246,7 +246,7 @@ - +

Headers

 diff --git a/system/Test/Mock/MockCache.php b/system/Test/Mock/MockCache.php index 47f19d4e4aa7..df2179678de5 100644 --- a/system/Test/Mock/MockCache.php +++ b/system/Test/Mock/MockCache.php @@ -56,7 +56,7 @@ public function initialize() * * @param string $key Cache item name * - * @return mixed + * @return bool|null */ public function get(string $key) { @@ -68,7 +68,7 @@ public function get(string $key) /** * Get an item from the cache, or execute the given Closure and store the result. * - * @return mixed + * @return bool|null */ public function remember(string $key, int $ttl, Closure $callback) { @@ -268,6 +268,8 @@ public function bypass(bool $bypass = true) * Asserts that the cache has an item named $key. * The value is not checked since storing false or null * values is valid. + * + * @return void */ public function assertHas(string $key) { @@ -278,6 +280,8 @@ public function assertHas(string $key) * Asserts that the cache has an item named $key with a value matching $value. * * @param mixed $value + * + * @return void */ public function assertHasValue(string $key, $value = null) { @@ -294,6 +298,8 @@ public function assertHasValue(string $key, $value = null) /** * Asserts that the cache does NOT have an item named $key. + * + * @return void */ public function assertMissing(string $key) {