Changeset 2611 for sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.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-template.php (moved) (moved from sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-wporg-plugin-directory-template.php) (5 diffs)

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

@@ -1 +1 @@
 <?php
-/**
- * @package WPorg_Plugin_Directory
- */
+namespace WordPressdotorg\Plugin_Directory;
 
 /**
  * Various helpers to retrieve data not stored within WordPress.
+ *
+ * @package WordPressdotorg_Plugin_Directory
  */
-class WPorg_Plugin_Directory_Template {
+class Template {
 
     /**
@@ -149 +149 @@
      */
     static function get_plugin_icon( $plugin, $output = 'raw' ) {
-        global $wporg_plugin_directory;
-        $plugin = $wporg_plugin_directory->get_plugin_post( $plugin );
+        $plugin = Plugin_Directory::instance()->get_plugin_post( $plugin );
         if ( ! $plugin ) {
             return false;
@@ -176 +175 @@
         if ( ! $icon ) {
             $generated = true;
-            if ( ! class_exists( 'WPorg_Plugin_Geopattern' ) ) {
-                include __DIR__ . '/class-wporg-plugin-geopattern.php';
-            }
-            $icon = new WPorg_Plugin_Geopattern;
+
+            $icon = new Plugin_Geopattern;
             $icon->setString( $plugin->post_name );
 
@@ -218 +215 @@
      */
     static function get_plugin_banner( $plugin, $output = 'raw' ) {
-        global $wporg_plugin_directory;
-        $plugin = $wporg_plugin_directory->get_plugin_post( $plugin );
+        $plugin = Plugin_Directory::instance()->get_plugin_post( $plugin );
         if ( ! $plugin ) {
             return false;
@@ -251 +247 @@
 
     static function get_asset_url( $plugin, $asset ) {
+        if ( ! empty( $asset['location'] ) && 'plugin' == $asset['location'] ) {
+            // Screenshots in the plugin folder - /plugins/plugin-name/screenshot-1.png
+            $format = 'https://s.w.org/plugins/%s/%s?rev=%s';
+        } else {
+            // Images in the assets folder - /plugin-name/assets/screenshot-1.png
+            $format = 'https://ps.w.org/%s/assets/%s?rev=%s';
+        }
+
         return esc_url( sprintf(
-            'https://ps.w.org/%s/assets/%s?rev=%s',
+            $format,
             $plugin,
             $asset['filename'],