Changeset 53749

Timestamp:

07/21/2022 03:58:51 PM (2 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Move wp-includes/wp-db.php to wp-includes/class-wpdb.php.

This renames the file containing the wpdb class to conform to the coding standards.

This commit also includes:

• A new wp-db.php that loads the new file, for anyone that may have been including the file directly.
• Replacing references to the old filename with the new filename.

Fixes #56268. See #55647.

Location:

trunk

Files:

• phpcs.xml.dist (modified) (2 diffs)
• src/wp-admin/install.php (modified) (1 diff)
• src/wp-includes/class-wpdb.php (copied) (copied from trunk/src/wp-includes/wp-db.php) (1 diff)
• src/wp-includes/load.php (modified) (1 diff)
• src/wp-includes/wp-db.php (added)
• tests/phpunit/includes/install.php (modified) (1 diff)

trunk/phpcs.xml.dist

@@ -166 +166 @@
     <!-- Whitelist the WP DB Class and related tests for usage of direct database access functions. -->
     <rule ref="WordPress.DB.RestrictedFunctions">
-        <exclude-pattern>/src/wp-includes/wp-db\.php</exclude-pattern>
+        <exclude-pattern>/src/wp-includes/class-wpdb\.php</exclude-pattern>
         <exclude-pattern>/tests/phpunit/tests/db/charset\.php</exclude-pattern>
     </rule>
@@ -326 +326 @@
     <rule ref="PEAR.NamingConventions.ValidClassName.StartWithCapital">
         <exclude-pattern>/src/wp-admin/includes/class-wp-list-table-compat\.php</exclude-pattern>
+        <exclude-pattern>/src/wp-includes/class-wp-dependency\.php</exclude-pattern>
         <exclude-pattern>/src/wp-includes/class-wp-editor\.php</exclude-pattern>
         <exclude-pattern>/src/wp-includes/class-wp-xmlrpc-server\.php</exclude-pattern>
-        <exclude-pattern>/src/wp-includes/wp-db\.php</exclude-pattern>
-        <exclude-pattern>/src/wp-includes/class-wp-dependency\.php</exclude-pattern>
+        <exclude-pattern>/src/wp-includes/class-wpdb\.php</exclude-pattern>
     </rule>
 

trunk/src/wp-admin/install.php

@@ -43 +43 @@
 
 /** Load wpdb */
-require_once ABSPATH . WPINC . '/wp-db.php';
+require_once ABSPATH . WPINC . '/class-wpdb.php';
 
 nocache_headers();

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

@@ -1 +1 @@
 <?php
 /**
- * WordPress database access abstraction class
+ * WordPress database access abstraction class.
  *
  * Original code from {@link http://php.justinvincent.com Justin Vincent (justin@visunet.ie)}

trunk/src/wp-includes/load.php

@@ -545 +545 @@
     global $wpdb;
 
-    require_once ABSPATH . WPINC . '/wp-db.php';
+    require_once ABSPATH . WPINC . '/class-wpdb.php';
+
     if ( file_exists( WP_CONTENT_DIR . '/db.php' ) ) {
         require_once WP_CONTENT_DIR . '/db.php';

trunk/tests/phpunit/includes/install.php

@@ -41 +41 @@
 
 require_once ABSPATH . '/wp-admin/includes/upgrade.php';
-require_once ABSPATH . '/wp-includes/wp-db.php';
+require_once ABSPATH . '/wp-includes/class-wpdb.php';
 
 // Override the PHPMailer.