Changeset 2611 for sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-tools.php

Timestamp:

02/25/2016 05:03:19 AM (10 years ago)

Author:

dd32

Message:

Plugin Directory: Switch to using namespaces instead of implemeting them through classnames.
This change introduces an autoloader and relies upon it for most file inclusions, this should encourage us to keep a standard naming schema and writing more component classes going forward.
See #1584

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-tools.php (moved) (moved from sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-wporg-plugin-directory-tools.php) (5 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-tools.php

@@ -1 +1 @@
 <?php
-/**
- * @package WPorg_Plugin_Directory
- */
+namespace WordPressdotorg\Plugin_Directory;
 
 /**
  * Various functions used by other processes, will make sense to move to specific classes.
+ *
+ * @package WordPressdotorg_Plugin_Directory
  */
-class WPorg_Plugin_Directory_Tools {
+class Tools {
 
     /**
@@ -19 +19 @@
         include_once __DIR__ . '/readme-parser/compat.php';
 
-        $data = (object) WPorg_Readme::parse_readme( $readme );
+        $data = (object) \WPorg_Readme::parse_readme( $readme );
 
         unset( $data->sections['screenshots'] ); // Useless.
@@ -53 +53 @@
         }
 
-        $tonesque = new Tonesque( $file_location );
+        $tonesque = new \Tonesque( $file_location );
         return $tonesque->color();
     }
@@ -76 +76 @@
      */
     public static function grant_plugin_committer( $plugin_slug, $user ) {
-        global $wpdb, $wporg_plugin_directory;
-        if ( ! $user instanceof WP_User ) {
-            $user = new WP_User( $user );
+        global $wpdb;
+        if ( ! $user instanceof \WP_User ) {
+            $user = new \WP_User( $user );
         }
 
-        if ( ! $user->exists() || ! $wporg_plugin_directory->get_plugin_post( $plugin_slug ) ) {
+        if ( ! $user->exists() || ! Plugin_Directory::instance()->get_plugin_post( $plugin_slug ) ) {
             return false;
         }
@@ -108 +108 @@
      */
     public static function revoke_plugin_committer( $plugin_slug, $user ) {
-        global $wpdb, $wporg_plugin_directory;
-        if ( ! $user instanceof WP_User ) {
-            $user = new WP_User( $user );
+        global $wpdb;
+        if ( ! $user instanceof \WP_User ) {
+            $user = new \WP_User( $user );
         }
 
-        if ( ! $user->exists() || ! $wporg_plugin_directory->get_plugin_post( $plugin_slug ) ) {
+        if ( ! $user->exists() || ! Plugin_Directory::instance()->get_plugin_post( $plugin_slug ) ) {
             return false;
         }