Skip to content

Commit 9b11df0

Browse files
dev4pressdev4press
committed
Work in progress.
1 parent b7bc150 commit 9b11df0

File tree

9 files changed

+48
-34
lines changed

9 files changed

+48
-34
lines changed

‎core/display/ErrorFormat.php

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,13 @@ public static function doing_it_wrong( $item ) : string {
101101
public static function deprecated_file( $item ) : string {
102102
$render = '<div class="debugpress-wrapper-warning debugpress-warning-deprecated debugpress-deprecated-file">';
103103
$render .= '<h4>' . __( 'Deprecated File', 'debugpress' ) . ':</h4>';
104-
$render .= '<strong>' . __( 'On line', 'debugpress' ) . ":</strong> " . $item["on_line"] . '<br/>';
105-
$render .= '<strong>' . __( 'In file', 'debugpress' ) . ":</strong> " . $item["in_file"] . '<br/>';
104+
$render .= '<strong>' . __( 'On line', 'debugpress' ) . ":</strong> " . $item['on_line'] . '<br/>';
105+
$render .= '<strong>' . __( 'In file', 'debugpress' ) . ":</strong> " . $item['in_file'] . '<br/>';
106106

107-
if ( $item["replacement"] ) {
108-
$render .= sprintf( __( '<strong>%s</strong> is deprecated since version %s. Use <strong>%s</strong> instead.', 'debugpress' ), $item["deprecated"], $item["version"], $item["replacement"] );
107+
if ( $item['replacement'] ) {
108+
$render .= sprintf( __( '<strong>%1$s</strong> is deprecated since version %2$s. Use <strong>%3$s</strong> instead.', 'debugpress' ), $item['deprecated'], $item['version'], $item['replacement'] );
109109
} else {
110-
$render .= sprintf( __( '<strong>%s</strong> is deprecated since version %s.', 'debugpress' ), $item["deprecated"], $item["version"] );
110+
$render .= sprintf( __( '<strong>%1$s</strong> is deprecated since version %2$s.', 'debugpress' ), $item['deprecated'], $item['version'] );
111111
}
112112

113113
$render .= self::process_caller( $item );
@@ -120,17 +120,17 @@ public static function deprecated_file( $item ) : string {
120120
public static function deprecated_function( $item ) : string {
121121
$render = '<div class="debugpress-wrapper-warning debugpress-warning-deprecated debugpress-deprecated-function">';
122122
$render .= '<h4>' . __( 'Deprecated Function', 'debugpress' ) . ':</h4>';
123-
$render .= '<strong>' . __( 'On line', 'debugpress' ) . ":</strong> " . $item["on_line"] . '<br/>';
124-
$render .= '<strong>' . __( 'In file', 'debugpress' ) . ":</strong> " . $item["in_file"] . '<br/>';
123+
$render .= '<strong>' . __( 'On line', 'debugpress' ) . ":</strong> " . $item['on_line'] . '<br/>';
124+
$render .= '<strong>' . __( 'In file', 'debugpress' ) . ":</strong> " . $item['in_file'] . '<br/>';
125125

126-
if ( $item["hook"] ) {
127-
$render .= "<strong>" . __( 'Hook', 'debugpress' ) . ":</strong> " . $item["hook"] . "<br/>";
126+
if ( $item['hook'] ) {
127+
$render .= "<strong>" . __( 'Hook', 'debugpress' ) . ":</strong> " . $item['hook'] . "<br/>";
128128
}
129129

130-
if ( $item["replacement"] ) {
131-
$render .= sprintf( __( '<strong>%s</strong> is deprecated since version %s. Use <strong>%s</strong> instead.', 'debugpress' ), $item["deprecated"], $item["version"], $item["replacement"] );
130+
if ( $item['replacement'] ) {
131+
$render .= sprintf( __( '<strong>%1$s</strong> is deprecated since version %2$s. Use <strong>%3$s</strong> instead.', 'debugpress' ), $item['deprecated'], $item['version'], $item['replacement'] );
132132
} else {
133-
$render .= sprintf( __( '<strong>%s</strong> is deprecated since version %s.', 'debugpress' ), $item["deprecated"], $item["version"] );
133+
$render .= sprintf( __( '<strong>%1$s</strong> is deprecated since version %2$s.', 'debugpress' ), $item['deprecated'], $item['version'] );
134134
}
135135

136136
if ( ! empty( $item['message'] ) ) {
@@ -147,10 +147,10 @@ public static function deprecated_function( $item ) : string {
147147
public static function deprecated_constructor( $item ) : string {
148148
$render = '<div class="debugpress-wrapper-warning debugpress-warning-deprecated debugpress-deprecated-constructor">';
149149
$render .= '<h4>' . __( 'Deprecated Constructor', 'debugpress' ) . ':</h4>';
150-
$render .= '<strong>' . __( 'On line', 'debugpress' ) . ":</strong> " . $item["on_line"] . '<br/>';
151-
$render .= '<strong>' . __( 'In file', 'debugpress' ) . ":</strong> " . $item["in_file"] . '<br/>';
150+
$render .= '<strong>' . __( 'On line', 'debugpress' ) . ":</strong> " . $item['on_line'] . '<br/>';
151+
$render .= '<strong>' . __( 'In file', 'debugpress' ) . ":</strong> " . $item['in_file'] . '<br/>';
152152

153-
$render .= sprintf( __( 'For <strong>%s</strong> since version %s.', 'debugpress' ), $item["deprecated"], $item["version"] );
153+
$render .= sprintf( __( 'For <strong>%1$s</strong> since version %2$s.', 'debugpress' ), $item['deprecated'], $item['version'] );
154154

155155
if ( ! empty( $item['message'] ) ) {
156156
$render .= '<em>' . $item['message'] . '</em>';
@@ -169,13 +169,13 @@ public static function deprecated_argument( $item ) : string {
169169

170170
if ( $item['in_file'] ) {
171171
if ( $item['on_line'] ) {
172-
$render .= "<strong>" . __( 'On line', 'debugpress' ) . ":</strong> " . $item["on_line"] . ", ";
172+
$render .= "<strong>" . __( 'On line', 'debugpress' ) . ":</strong> " . $item['on_line'] . ", ";
173173
}
174174

175-
$render .= "<strong>" . __( 'In file', 'debugpress' ) . ":</strong> " . $item["in_file"] . "<br/>";
175+
$render .= "<strong>" . __( 'In file', 'debugpress' ) . ":</strong> " . $item['in_file'] . "<br/>";
176176
}
177177

178-
$render .= sprintf( __( 'Argument in <strong>%s</strong> is deprecated since version %s.', 'debugpress' ), $item["deprecated"], $item["version"] );
178+
$render .= sprintf( __( 'Argument in <strong>%1$s</strong> is deprecated since version %2$s.', 'debugpress' ), $item['deprecated'], $item['version'] );
179179

180180
if ( ! empty( $item['message'] ) ) {
181181
$render .= '<em>' . $item['message'] . '</em>';

‎readme.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,11 @@ Yes. Once the popup is open, you will find the Layout icon next to the button to
118118
Open the WordPress 'Settings' menu, there you will find 'DebugPress' panel.
119119

120120
== Changelog ==
121+
= 3.8.1 (2024.04.27) =
122+
* Edit: replacement of some native with WordPress functions
123+
* Edit: various small updates and tweaks
124+
* Edit: Kint Pretty Print Library 5.1.1
125+
121126
= 3.8 (2024.04.24) =
122127
* Edit: few minor tweaks and changes
123128
* Edit: updates to the plugin readme file

‎vendor/kint/composer/installed.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
"packages": [
33
{
44
"name": "kint-php/kint",
5-
"version": "5.1.0",
6-
"version_normalized": "5.1.0.0",
5+
"version": "5.1.1",
6+
"version_normalized": "5.1.1.0",
77
"source": {
88
"type": "git",
99
"url": "https://github.com/kint-php/kint.git",
10-
"reference": "128303461092734a1e3cb4beb1eea9afe7a5a0ee"
10+
"reference": "8c5ec370c3382ceae0b88e91f9bbb00e6bb4f93b"
1111
},
1212
"dist": {
1313
"type": "zip",
14-
"url": "https://api.github.com/repos/kint-php/kint/zipball/128303461092734a1e3cb4beb1eea9afe7a5a0ee",
15-
"reference": "128303461092734a1e3cb4beb1eea9afe7a5a0ee",
14+
"url": "https://api.github.com/repos/kint-php/kint/zipball/8c5ec370c3382ceae0b88e91f9bbb00e6bb4f93b",
15+
"reference": "8c5ec370c3382ceae0b88e91f9bbb00e6bb4f93b",
1616
"shasum": ""
1717
},
1818
"require": {
@@ -30,7 +30,7 @@
3030
"kint-php/kint-helpers": "Provides extra helper functions",
3131
"kint-php/kint-twig": "Provides d() and s() functions in twig templates"
3232
},
33-
"time": "2023-11-16T06:04:49+00:00",
33+
"time": "2024-04-26T14:20:09+00:00",
3434
"type": "library",
3535
"installation-source": "dist",
3636
"autoload": {
@@ -64,7 +64,7 @@
6464
],
6565
"support": {
6666
"issues": "https://github.com/kint-php/kint/issues",
67-
"source": "https://github.com/kint-php/kint/tree/5.1.0"
67+
"source": "https://github.com/kint-php/kint/tree/5.1.1"
6868
},
6969
"install-path": "../kint-php/kint"
7070
}

‎vendor/kint/composer/installed.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
'dev_requirement' => false,
2121
),
2222
'kint-php/kint' => array(
23-
'pretty_version' => '5.1.0',
24-
'version' => '5.1.0.0',
25-
'reference' => '128303461092734a1e3cb4beb1eea9afe7a5a0ee',
23+
'pretty_version' => '5.1.1',
24+
'version' => '5.1.1.0',
25+
'reference' => '8c5ec370c3382ceae0b88e91f9bbb00e6bb4f93b',
2626
'type' => 'library',
2727
'install_path' => __DIR__ . '/../kint-php/kint',
2828
'aliases' => array(),

‎vendor/kint/kint-php/kint/init.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
if (false !== \ini_get('xdebug.file_link_format')) {
5252
Kint::$file_link_format = \ini_get('xdebug.file_link_format');
5353
}
54-
if (isset($_SERVER['DOCUMENT_ROOT'])) {
54+
if (isset($_SERVER['DOCUMENT_ROOT']) && false === \strpos($_SERVER['DOCUMENT_ROOT'], "\0")) {
5555
Kint::$app_root_dirs = [
5656
$_SERVER['DOCUMENT_ROOT'] => '<ROOT>',
5757
];

‎vendor/kint/kint-php/kint/src/Parser/FsPathPlugin.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
use Kint\Zval\Representation\SplFileInfoRepresentation;
3131
use Kint\Zval\Value;
3232
use SplFileInfo;
33+
use TypeError;
3334

3435
class FsPathPlugin extends AbstractPlugin
3536
{
@@ -59,8 +60,13 @@ public function parse(&$var, Value &$o, int $trigger): void
5960
return;
6061
}
6162

62-
if (!@\file_exists($var)) {
63-
return;
63+
try {
64+
if (!@\file_exists($var)) {
65+
return;
66+
}
67+
} catch (TypeError $e) {// @codeCoverageIgnore
68+
// Only possible in PHP 7
69+
return; // @codeCoverageIgnore
6470
}
6571

6672
if (\in_array($var, self::$blacklist, true)) {

‎vendor/kint/kint-php/kint/src/Parser/MysqliPlugin.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ public function parse(&$var, Value &$o, int $trigger): void
105105
foreach ($o->value->contents as $key => $obj) {
106106
if (isset($this->connected_readable[$obj->name])) {
107107
if (!$connected) {
108-
continue;
108+
// No failed connections after PHP 8.1
109+
continue; // @codeCoverageIgnore
109110
}
110111
} elseif (isset($this->empty_readable[$obj->name])) {
111112
// No failed connections after PHP 8.1

‎vendor/kint/kint-php/kint/src/Zval/BlobValue.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,9 @@ public static function detectEncoding(string $string)
182182
if (\function_exists('iconv')) {
183183
foreach (self::$legacy_encodings as $encoding) {
184184
// Iconv detection works by triggering
185-
// "Detected an illegal character in input string" warnings
185+
// "Detected an illegal character in input string" notices
186+
// This notice does not become a TypeError with strict_types
187+
// so we don't have to wrap this in a try catch
186188
if (@\iconv($encoding, $encoding, $string) === $string) {
187189
return $encoding;
188190
}

‎vendor/kint/kint-php/kint/src/Zval/Representation/SplFileInfoRepresentation.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function __construct(SplFileInfo $fileInfo)
7676
}
7777
} catch (RuntimeException $e) {
7878
if (false === \strpos($e->getMessage(), ' open_basedir ')) {
79-
throw $e;
79+
throw $e; // @codeCoverageIgnore
8080
}
8181
}
8282

0 commit comments

Comments
 (0)