Changeset 54038

Timestamp:

08/31/2022 01:39:33 PM (3 years ago)

Author:

SergeyBiryukov

Message:

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 [11875], [11877], [23376], [32990], [46377], [54037].

See #55647.

File:

• trunk/src/wp-includes/class-json.php (modified) (6 diffs)

trunk/src/wp-includes/class-json.php

@@ -127 +127 @@
     * @var int
     */
-   public $use;
+    public $use;
+
+    // private - cache the mbstring lookup results..
+    var $_mb_strlen = false;
+    var $_mb_substr = false;
+    var $_mb_convert_encoding = false;
 
    /**
@@ -162 +167 @@
     }
 
-    /**
-     * PHP4 constructor.
+    /**
+     * PHP4 constructor.
      *
      * @deprecated 5.3.0 Use __construct() instead.
      *
      * @see Services_JSON::__construct()
-     */
-    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;
-    
+     */
+    public function Services_JSON( $use = 0 ) {
+        _deprecated_constructor( 'Services_JSON', '5.3.0', get_class( $this ) );
+        self::__construct( $use );
+    }
+
    /**
     * convert a string from one UTF-16 char to one UTF-8 char
@@ -981 +982 @@
     class Services_JSON_Error extends PEAR_Error
     {
-        /**
-         * PHP5 constructor.
-         *
-         * @deprecated 5.3.0 Use the PHP native JSON extension instead.
-         */
+        /**
+         * PHP5 constructor.
+         *
+         * @deprecated 5.3.0 Use the PHP native JSON extension instead.
+         */
         function __construct($message = 'unknown error', $code = null,
                                      $mode = null, $options = null, $userinfo = null)
@@ -994 +995 @@
         }
 
-        /**
-         * PHP4 constructor.
-         *
-         * @deprecated 5.3.0 Use __construct() instead.
-         *
-         * @see Services_JSON_Error::__construct()
-         */
-        public function Services_JSON_Error($message = 'unknown error', $code = null,
+        /**
+         * 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);
-        }
+            _deprecated_constructor( 'Services_JSON_Error', '5.3.0', get_class( $this ) );
+            self::__construct($message, $code, $mode, $options, $userinfo);
+        }
     }
 
@@ -1015 +1016 @@
     class Services_JSON_Error
     {
-        /**
-         * PHP5 constructor.
-         *
-         * @deprecated 5.3.0 Use the PHP native JSON extension instead.
-         */
+        /**
+         * PHP5 constructor.
+         *
+         * @deprecated 5.3.0 Use the PHP native JSON extension instead.
+         */
         function __construct( $message = 'unknown error', $code = null,
                                      $mode = null, $options = null, $userinfo = null )
@@ -1026 +1027 @@
         }
 
-        /**
-         * 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 );
-        }
+        /**
+         * 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 );
+        }
     }