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

Timestamp:

04/21/2016 07:41:53 PM (9 years ago)

Author:

obenland

Message:

Plugin Directory: Housekeeping.

• Updates and corrects doc blocks.
• Simplifies overqualified class references.
• Corrects function args and return types.
• Adds missing labels to input elements.
• Makes sure variables are set before using them.

See #1584.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php (modified) (6 diffs)

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

@@ -1 +1 @@
 <?php
 namespace WordPressdotorg\Plugin_Directory;
+use WordPressdotorg\Plugin_Directory\Admin\Customizations;
 
 /**
@@ -26 +27 @@
         add_filter( 'the_content', array( $this, 'filter_post_content_to_correct_page' ), 1 );
         add_filter( 'rest_api_allowed_post_types', array( $this, 'filter_allowed_post_types' ) );
-        add_filter( 'pre_update_option_jetpack_options', array( $this, 'filter_jetpack_options' ), 10, 2 );
+        add_filter( 'pre_update_option_jetpack_options', array( $this, 'filter_jetpack_options' ) );
 
         add_filter( 'map_meta_cap', array( __NAMESPACE__ . '\Capabilities', 'map_meta_cap' ), 10, 4 );
@@ -39 +40 @@
         // Cannot be included on `admin_init` to allow access to menu hooks
         if ( defined( 'WP_ADMIN' ) && WP_ADMIN ) {
-            Admin\Customizations::instance();
+            Customizations::instance();
 
             add_action( 'transition_post_status', array( __NAMESPACE__ . '\Admin\Status_Transitions', 'instance' ) );
@@ -200 +201 @@
      * Setting up the site requires setting up the theme and proper
      * rewrite permastructs.
-     *
-     * @global \WP_Rewrite $wp_rewrite WordPress rewrite component.
      */
     public function activate() {
+
+        /**
+         * @var \WP_Rewrite $wp_rewrite WordPress rewrite component.
+         */
         global $wp_rewrite;
 
@@ -220 +223 @@
         }
 
-        // Enable the WordPress.org Plugin Repo Theme.
+        /**
+         * Enable the WordPress.org Plugin Repo Theme.
+         *
+         * @var \WP_Theme $theme
+         */
         foreach ( wp_get_themes() as $theme ) {
             if ( $theme->get( 'Name' ) === 'WordPress.org Plugins' ) {
@@ -398 +405 @@
      *
      * @param mixed $new_value
-     * @param mixed $old_value
      * @return mixed
      */
-    public function filter_jetpack_options( $new_value, $old_value ) {
-        if ( is_array($new_value) && array_key_exists( 'public', $new_value ) )
+    public function filter_jetpack_options( $new_value ) {
+        if ( is_array( $new_value ) && array_key_exists( 'public', $new_value ) )
             $new_value['public'] = 1;