Changeset 10410

Timestamp:

10/27/2020 02:41:36 AM (4 years ago)

Author:

dd32

Message:

Theme Directory: Add a callback to an experimental theme-review workflow.

Props dufresnesteven.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory

Files:

• class-wporg-themes-upload.php (modified) (3 diffs)
• lib/adhocore-php-jwt (copied) (copied from sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/adhocore-php-jwt)
• lib/class-github.php (copied) (copied from sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/clients/class-github.php) (4 diffs)
• theme-directory.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php

@@ -1 +1 @@
 <?php
+use WordPressdotorg\Theme_Directory\Lib\GitHub;
 
 /**
@@ -323 +324 @@
 
         do_action( 'theme_upload', $this->theme, $this->theme_post );
+
+        // Initiate a GitHub actions run for the theme.
+        $this->trigger_e2e_run( $ticket_id );
 
         // Success!
@@ -948 +952 @@
     }
 
+    /**
+     * Triggers a GitHub actions run for the upload.
+     */
+    public function trigger_e2e_run( $ticket_id ) {
+        $api = GitHub::api(
+            '/repos/' . WPORG_THEMES_E2E_REPO . '/dispatches',
+            json_encode([
+                'event_type'     => $this->theme->display( 'Name' ),
+                'client_payload' => [
+                    'theme_slug'       => $this->theme_slug,
+                    'theme_zip'        => "https://wordpress.org/themes/download/{$this->theme_slug}.{$this->theme->display( 'Version' )}.zip?nostats=1",
+                    'accessible_ready' => in_array( 'accessibility-ready', $this->theme->get( 'Tags' ) ),
+                    'trac_ticket_id'   => $ticket_id,
+                ],
+            ])
+        );
+    
+        // Upon failure a message is returned, success returns nothing.
+        return empty( $api );
+    }
+
     // Helper
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/lib/class-github.php

@@ -1 +1 @@
 <?php
-namespace WordPressdotorg\Plugin_Directory\Clients;
+namespace WordPressdotorg\Theme_Directory\Lib;
 use Ahc\Jwt\JWT;
 
 /**
- * Simple GitHub client.
+ * Simple GitHub API client.
  *
- * @package WordPressdotorg\Plugin_Directory\Clients
+ * @package WordPressdotorg\Theme_Directory
  */
 class GitHub {
@@ -12 +12 @@
     public static function api( $url, $args = null, $headers = [], $method = null ) {
         // Verify the configuration variables are available.
+        // This re-uses the Plugin Directory constants deliberately.
         if ( ! defined( 'PLUGIN_GITHUB_APP_ID' ) || ! defined( 'PLUGIN_GITHUB_APP_PRIV_KEY' ) ) {
             return false;
@@ -20 +21 @@
             $url = 'https://api.github.com' . $url;
         }
-    
+
         $request = wp_remote_request(
             $url,
@@ -105 +106 @@
         // This should be replaced with an Autoloader.
         if ( ! class_exists( 'Ahc\Jwt\JWT' ) ) {
-            require_once dirname( __DIR__ ) . '/libs/adhocore-php-jwt/JWTException.php';
-            require_once dirname( __DIR__ ) . '/libs/adhocore-php-jwt/ValidatesJWT.php';
-            require_once dirname( __DIR__ ) . '/libs/adhocore-php-jwt/JWT.php';
+            require_once __DIR__ . '/adhocore-php-jwt/JWTException.php';
+            require_once __DIR__ . '/adhocore-php-jwt/ValidatesJWT.php';
+            require_once __DIR__ . '/adhocore-php-jwt/JWT.php';
         }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php

@@ -35 +35 @@
 new WordPressdotorg\Theme_Directory\Jobs\Manager();
 
+// Load the GitHub API client.
+include __DIR__ . '/lib/class-github.php';
+
 define( 'WPORG_THEMES_DEFAULT_BROWSE', 'popular' );
+
+define( 'WPORG_THEMES_E2E_REPO', 'WordPress/theme-review-e2e' );
 
 /**