<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[54038] trunk/src/wp-includes/class-json.php: Coding Standards: Use more consistent formatting in `wp-includes/class-json.php`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/54038">54038</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/54038","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-08-31 13:39:33 +0000 (Wed, 31 Aug 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Coding Standards: Use more consistent formatting in `wp-includes/class-json.php`.
As an adopted library that does not follow the WordPress Coding Standards, the file ended with a mix of tab and spaces as part of maintenance updates over the years.
This commit standardizes on spaces for now, to bring some consistency while minimizing the number of changes.
Includes moving all the declared properties to the top of the class.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/11875">[11875]</a>, <a href="https://core.trac.wordpress.org/changeset/11877">[11877]</a>, <a href="https://core.trac.wordpress.org/changeset/23376">[23376]</a>, <a href="https://core.trac.wordpress.org/changeset/32990">[32990]</a>, <a href="https://core.trac.wordpress.org/changeset/46377">[46377]</a>, <a href="https://core.trac.wordpress.org/changeset/54037">[54037]</a>.
See <a href="https://core.trac.wordpress.org/ticket/55647">#55647</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclassjsonphp">trunk/src/wp-includes/class-json.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclassjsonphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-json.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-json.php 2022-08-31 13:05:11 UTC (rev 54037)
+++ trunk/src/wp-includes/class-json.php 2022-08-31 13:39:33 UTC (rev 54038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,8 +126,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @var int
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public $use;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $use;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // private - cache the mbstring lookup results..
+ var $_mb_strlen = false;
+ var $_mb_substr = false;
+ var $_mb_convert_encoding = false;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * constructs a new JSON instance
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,22 +166,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_mb_substr = function_exists('mb_substr');
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * PHP4 constructor.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * PHP4 constructor.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated 5.3.0 Use __construct() instead.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see Services_JSON::__construct()
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- */
- public function Services_JSON( $use = 0 ) {
- _deprecated_constructor( 'Services_JSON', '5.3.0', get_class( $this ) );
- self::__construct( $use );
- }
- // private - cache the mbstring lookup results..
- var $_mb_strlen = false;
- var $_mb_substr = false;
- var $_mb_convert_encoding = false;
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ */
+ public function Services_JSON( $use = 0 ) {
+ _deprecated_constructor( 'Services_JSON', '5.3.0', get_class( $this ) );
+ self::__construct( $use );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * convert a string from one UTF-16 char to one UTF-8 char
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -980,11 +981,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> class Services_JSON_Error extends PEAR_Error
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * PHP5 constructor.
- *
- * @deprecated 5.3.0 Use the PHP native JSON extension instead.
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * PHP5 constructor.
+ *
+ * @deprecated 5.3.0 Use the PHP native JSON extension instead.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function __construct($message = 'unknown error', $code = null,
</span><span class="cx" style="display: block; padding: 0 10px"> $mode = null, $options = null, $userinfo = null)
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -993,18 +994,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> parent::PEAR_Error($message, $code, $mode, $options, $userinfo);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * PHP4 constructor.
- *
- * @deprecated 5.3.0 Use __construct() instead.
- *
- * @see Services_JSON_Error::__construct()
- */
- public function Services_JSON_Error($message = 'unknown error', $code = null,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * PHP4 constructor.
+ *
+ * @deprecated 5.3.0 Use __construct() instead.
+ *
+ * @see Services_JSON_Error::__construct()
+ */
+ public function Services_JSON_Error($message = 'unknown error', $code = null,
</ins><span class="cx" style="display: block; padding: 0 10px"> $mode = null, $options = null, $userinfo = null) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _deprecated_constructor( 'Services_JSON_Error', '5.3.0', get_class( $this ) );
- self::__construct($message, $code, $mode, $options, $userinfo);
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _deprecated_constructor( 'Services_JSON_Error', '5.3.0', get_class( $this ) );
+ self::__construct($message, $code, $mode, $options, $userinfo);
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1014,11 +1015,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Services_JSON_Error
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * PHP5 constructor.
- *
- * @deprecated 5.3.0 Use the PHP native JSON extension instead.
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * PHP5 constructor.
+ *
+ * @deprecated 5.3.0 Use the PHP native JSON extension instead.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function __construct( $message = 'unknown error', $code = null,
</span><span class="cx" style="display: block; padding: 0 10px"> $mode = null, $options = null, $userinfo = null )
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1025,18 +1026,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __METHOD__, '5.3.0', 'The PHP native JSON extension' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * PHP4 constructor.
- *
- * @deprecated 5.3.0 Use __construct() instead.
- *
- * @see Services_JSON_Error::__construct()
- */
- public function Services_JSON_Error( $message = 'unknown error', $code = null,
- $mode = null, $options = null, $userinfo = null ) {
- _deprecated_constructor( 'Services_JSON_Error', '5.3.0', get_class( $this ) );
- self::__construct( $message, $code, $mode, $options, $userinfo );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * PHP4 constructor.
+ *
+ * @deprecated 5.3.0 Use __construct() instead.
+ *
+ * @see Services_JSON_Error::__construct()
+ */
+ public function Services_JSON_Error( $message = 'unknown error', $code = null,
+ $mode = null, $options = null, $userinfo = null ) {
+ _deprecated_constructor( 'Services_JSON_Error', '5.3.0', get_class( $this ) );
+ self::__construct( $message, $code, $mode, $options, $userinfo );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>