Changeset 38307

Timestamp:

08/22/2016 06:24:48 PM (10 years ago)

Author:

DrewAPicture

Message:

Hooks: Standardize naming of dynamic hooks to use interpolation vs concatenation.

Benefits gained in discoverability and self-documentation throughout core trump the negligible performance hit in using interpolation in hook names.

Props ramiy.
See #37748.

Location:

trunk/src

Files:

• wp-admin/admin-footer.php (modified) (2 diffs)
• wp-admin/admin-header.php (modified) (3 diffs)
• wp-admin/admin.php (modified) (4 diffs)
• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/includes/class-wp-automatic-updater.php (modified) (1 diff)
• wp-admin/includes/class-wp-ms-themes-list-table.php (modified) (2 diffs)
• wp-admin/includes/class-wp-plugin-install-list-table.php (modified) (1 diff)
• wp-admin/includes/class-wp-plugins-list-table.php (modified) (1 diff)
• wp-admin/includes/class-wp-theme-install-list-table.php (modified) (1 diff)
• wp-admin/includes/media.php (modified) (2 diffs)
• wp-admin/includes/plugin.php (modified) (2 diffs)
• wp-admin/includes/revision.php (modified) (1 diff)
• wp-admin/media-upload.php (modified) (2 diffs)
• wp-admin/plugin-install.php (modified) (2 diffs)
• wp-includes/category-template.php (modified) (1 diff)
• wp-includes/class-wp-customize-control.php (modified) (1 diff)
• wp-includes/class-wp-rewrite.php (modified) (1 diff)
• wp-includes/option.php (modified) (26 diffs)
• wp-includes/taxonomy.php (modified) (6 diffs)
• wp-includes/theme.php (modified) (1 diff)
• wp-login.php (modified) (1 diff)

trunk/src/wp-admin/admin-footer.php

@@ -84 +84 @@
  * @param string $hook_suffix The current admin page.
  */
-do_action( "admin_print_footer_scripts-$hook_suffix" );
+do_action( "admin_print_footer_scripts-{$hook_suffix}" );
 
 /**
@@ -104 +104 @@
  * @param string $hook_suffix The current admin page.
  */
-do_action( "admin_footer-$hook_suffix" );
+do_action( "admin_footer-{$hook_suffix}" );
 
 // get_site_option() won't exist when auto upgrading from <= 2.7

trunk/src/wp-admin/admin-header.php

@@ -97 +97 @@
  * @since 2.6.0
  */
-do_action( "admin_print_styles-$hook_suffix" );
+do_action( "admin_print_styles-{$hook_suffix}" );
 
 /**
@@ -111 +111 @@
  * @since 2.1.0
  */
-do_action( "admin_print_scripts-$hook_suffix" );
+do_action( "admin_print_scripts-{$hook_suffix}" );
 
 /**
@@ -128 +128 @@
  * @since 2.1.0
  */
-do_action( "admin_head-$hook_suffix" );
+do_action( "admin_head-{$hook_suffix}" );
 
 /**

trunk/src/wp-admin/admin.php

@@ -210 +210 @@
                  * @since 2.1.0
                  */
-                do_action( 'load-' . $page_hook );
+                do_action( "load-{$page_hook}" );
                 if (! isset($_GET['noheader']))
                         require_once(ABSPATH . 'wp-admin/admin-header.php');
@@ -240 +240 @@
                  * @since 1.5.0
                  */
-                do_action( 'load-' . $plugin_page );
+                do_action( "load-{$plugin_page}" );
 
                 if ( !isset($_GET['noheader']))
@@ -279 +279 @@
          * @since 3.5.0
          */
-        do_action( 'load-importer-' . $importer );
+        do_action( "load-importer-{$importer}" );
 
         $parent_file = 'tools.php';
@@ -327 +327 @@
          * @since 2.1.0
          */
-        do_action( 'load-' . $pagenow );
+        do_action( "load-{$pagenow}" );
 
         /*

trunk/src/wp-admin/edit-form-advanced.php

@@ -332 +332 @@
  * @param WP_Post $post Post object.
  */
-do_action( 'add_meta_boxes_' . $post_type, $post );
+do_action( "add_meta_boxes_{$post_type}", $post );
 
 /**

trunk/src/wp-admin/includes/class-wp-automatic-updater.php

@@ -177 +177 @@
                  * @param object $item   The update offer.
                  */
-                $update = apply_filters( 'auto_update_' . $type, $update, $item );
+                $update = apply_filters( "auto_update_{$type}", $update, $item );
 
                 if ( ! $update ) {

trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php

@@ -519 +519 @@
                  * @param string   $context Status of the theme.
                  */
-                $actions = apply_filters( "theme_action_links_$stylesheet", $actions, $theme, $context );
+                $actions = apply_filters( "theme_action_links_{$stylesheet}", $actions, $theme, $context );
 
                 echo $this->row_actions( $actions, true );
@@ -727 +727 @@
                  * @param string   $status     Status of the theme.
                  */
-                do_action( "after_theme_row_$stylesheet", $stylesheet, $theme, $status );
+                do_action( "after_theme_row_{$stylesheet}", $stylesheet, $theme, $status );
         }
 }

trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php

@@ -201 +201 @@
                  * @param array|bool $args Plugin Install API arguments.
                  */
-                $args = apply_filters( "install_plugins_table_api_args_$tab", $args );
+                $args = apply_filters( "install_plugins_table_api_args_{$tab}", $args );
 
                 if ( !$args )

trunk/src/wp-admin/includes/class-wp-plugins-list-table.php

@@ -865 +865 @@
                  *                            'Drop-ins', 'Search'.
                  */
-                do_action( "after_plugin_row_$plugin_file", $plugin_file, $plugin_data, $status );
+                do_action( "after_plugin_row_{$plugin_file}", $plugin_file, $plugin_data, $status );
         }
 

trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php

@@ -135 +135 @@
                  * @param array $args An array of themes API arguments.
                  */
-                $args = apply_filters( 'install_themes_table_api_args_' . $tab, $args );
+                $args = apply_filters( "install_themes_table_api_args_{$tab}", $args );
 
                 if ( ! $args )

trunk/src/wp-admin/includes/media.php

@@ -619 +619 @@
          * @param string $upload_iframe_src The upload iframe source URL by type.
          */
-        $upload_iframe_src = apply_filters( $type . '_upload_iframe_src', $upload_iframe_src );
+        $upload_iframe_src = apply_filters( "{$type}_upload_iframe_src", $upload_iframe_src );
 
         return add_query_arg('TB_iframe', true, $upload_iframe_src);
@@ -787 +787 @@
                          * @param string $title Media title.
                          */
-                        $html = apply_filters( $type . '_send_to_editor_url', $html, esc_url_raw( $src ), $title );
+                        $html = apply_filters( "{$type}_send_to_editor_url", $html, esc_url_raw( $src ), $title );
                 } else {
                         $align = '';

trunk/src/wp-admin/includes/plugin.php

@@ -589 +589 @@
                          *                           or just the current site. Multisite only. Default is false.
                          */
-                        do_action( 'activate_' . $plugin, $network_wide );
+                        do_action( "activate_{$plugin}", $network_wide );
                 }
 
@@ -702 +702 @@
                          *                                   or just the current site. Multisite only. Default is false.
                          */
-                        do_action( 'deactivate_' . $plugin, $network_deactivating );
+                        do_action( "deactivate_{$plugin}", $network_deactivating );
 
                         /**

trunk/src/wp-admin/includes/revision.php

@@ -71 +71 @@
                  *                                      or the new one. Values are 'to' or 'from'.
                  */
-                $content_from = $compare_from ? apply_filters( "_wp_post_revision_field_$field", $compare_from->$field, $field, $compare_from, 'from' ) : '';
+                $content_from = $compare_from ? apply_filters( "_wp_post_revision_field_{$field}", $compare_from->$field, $field, $compare_from, 'from' ) : '';
 
                 /** This filter is documented in wp-admin/includes/revision.php */
-                $content_to = apply_filters( "_wp_post_revision_field_$field", $compare_to->$field, $field, $compare_to, 'to' );
+                $content_to = apply_filters( "_wp_post_revision_field_{$field}", $compare_to->$field, $field, $compare_to, 'to' );
 
                 $args = array(

trunk/src/wp-admin/media-upload.php

@@ -96 +96 @@
          * @since 2.5.0
          */
-        do_action( "media_upload_$type" );
+        do_action( "media_upload_{$type}" );
 } else {
         /**
@@ -108 +108 @@
          * @since 2.5.0
          */
-        do_action( "media_upload_$tab" );
+        do_action( "media_upload_{$tab}" );
 }
 

trunk/src/wp-admin/plugin-install.php

@@ -65 +65 @@
  * @since 2.7.0
  */
-do_action( "install_plugins_pre_$tab" );
+do_action( "install_plugins_pre_{$tab}" );
 
 /*
@@ -156 +156 @@
  * @param int $paged The current page number of the plugins list table.
  */
-do_action( "install_plugins_$tab", $paged ); ?>
+do_action( "install_plugins_{$tab}", $paged ); ?>
 
         <span class="spinner"></span>

trunk/src/wp-includes/category-template.php

@@ -1260 +1260 @@
          * @param array $links An array of term links.
          */
-        $term_links = apply_filters( "term_links-$taxonomy", $links );
+        $term_links = apply_filters( "term_links-{$taxonomy}", $links );
 
         return $before . join( $sep, $term_links ) . $after;

trunk/src/wp-includes/class-wp-customize-control.php

@@ -384 +384 @@
                  * @param WP_Customize_Control $this WP_Customize_Control instance.
                  */
-                do_action( 'customize_render_control_' . $this->id, $this );
+                do_action( "customize_render_control_{$this->id}", $this );
 
                 $this->render();

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

@@ -1414 +1414 @@
                          * @param array $rules The rewrite rules generated for the current permastruct.
                          */
-                        $rules = apply_filters( $permastructname . '_rewrite_rules', $rules );
+                        $rules = apply_filters( "{$permastructname}_rewrite_rules", $rules );
                         if ( 'post_tag' == $permastructname ) {
 

trunk/src/wp-includes/option.php

@@ -50 +50 @@
          * @param string     $option     Option name.
          */
-        $pre = apply_filters( 'pre_option_' . $option, false, $option );
+        $pre = apply_filters( "pre_option_{$option}", false, $option );
         if ( false !== $pre )
                 return $pre;
@@ -73 +73 @@
                          * @param string $option  Option name.
                          */
-                        return apply_filters( 'default_option_' . $option, $default, $option );
+                        return apply_filters( "default_option_{$option}", $default, $option );
                 }
 
@@ -134 +134 @@
          * @param string $option Option name.
          */
-        return apply_filters( 'option_' . $option, maybe_unserialize( $value ), $option );
+        return apply_filters( "option_{$option}", maybe_unserialize( $value ), $option );
 }
 
@@ -278 +278 @@
          * @param string $option    Option name.
          */
-        $value = apply_filters( 'pre_update_option_' . $option, $value, $old_value, $option );
+        $value = apply_filters( "pre_update_option_{$option}", $value, $old_value, $option );
 
         /**
@@ -535 +535 @@
                  * @param string $option Name of the deleted option.
                  */
-                do_action( "delete_option_$option", $option );
+                do_action( "delete_option_{$option}", $option );
 
                 /**
@@ -569 +569 @@
          * @param string $transient Transient name.
          */
-        do_action( 'delete_transient_' . $transient, $transient );
+        do_action( "delete_transient_{$transient}", $transient );
 
         if ( wp_using_ext_object_cache() ) {
@@ -625 +625 @@
          * @param string $transient     Transient name.
          */
-        $pre = apply_filters( 'pre_transient_' . $transient, false, $transient );
+        $pre = apply_filters( "pre_transient_{$transient}", false, $transient );
         if ( false !== $pre )
                 return $pre;
@@ -662 +662 @@
          * @param string $transient Transient name.
          */
-        return apply_filters( 'transient_' . $transient, $value, $transient );
+        return apply_filters( "transient_{$transient}", $value, $transient );
 }
 
@@ -697 +697 @@
          * @param string $transient  Transient name.
          */
-        $value = apply_filters( 'pre_set_transient_' . $transient, $value, $expiration, $transient );
+        $value = apply_filters( "pre_set_transient_{$transient}", $value, $expiration, $transient );
 
         /**
@@ -710 +710 @@
          * @param string $transient  Transient name.
          */
-        $expiration = apply_filters( 'expiration_of_transient_' . $transient, $expiration, $value, $transient );
+        $expiration = apply_filters( "expiration_of_transient_{$transient}", $expiration, $value, $transient );
 
         if ( wp_using_ext_object_cache() ) {
@@ -759 +759 @@
                  * @param string $transient  The name of the transient.
                  */
-                do_action( 'set_transient_' . $transient, $value, $expiration, $transient );
+                do_action( "set_transient_{$transient}", $value, $expiration, $transient );
 
                 /**
@@ -1107 +1107 @@
          * @param string $option     Option name.
          */
-        $pre = apply_filters( 'pre_site_option_' . $option, false, $option );
+        $pre = apply_filters( "pre_site_option_{$option}", false, $option );
 
         if ( false !== $pre ) {
@@ -1131 +1131 @@
                  * @param string $option  Option name.
                  */
-                return apply_filters( 'default_site_option_' . $option, $default, $option );
+                return apply_filters( "default_site_option_{$option}", $default, $option );
         }
 
@@ -1175 +1175 @@
          * @param string $option Option name.
          */
-        return apply_filters( 'site_option_' . $option, $value, $option );
+        return apply_filters( "site_option_{$option}", $value, $option );
 }
 
@@ -1223 +1223 @@
          * @param string $option Option name.
          */
-        $value = apply_filters( 'pre_add_site_option_' . $option, $value, $option );
+        $value = apply_filters( "pre_add_site_option_{$option}", $value, $option );
 
         $notoptions_key = "$network_id:notoptions";
@@ -1272 +1272 @@
                  * @param mixed  $value  Value of the network option.
                  */
-                do_action( 'add_site_option_' . $option, $option, $value );
+                do_action( "add_site_option_{$option}", $option, $value );
 
                 /**
@@ -1328 +1328 @@
          * @param string $option Option name.
          */
-        do_action( 'pre_delete_site_option_' . $option, $option );
+        do_action( "pre_delete_site_option_{$option}", $option );
 
         if ( ! is_multisite() ) {
@@ -1355 +1355 @@
                  * @param string $option Name of the network option.
                  */
-                do_action( 'delete_site_option_' . $option, $option );
+                do_action( "delete_site_option_{$option}", $option );
 
                 /**
@@ -1418 +1418 @@
          * @param string $option    Option name.
          */
-        $value = apply_filters( 'pre_update_site_option_' . $option, $value, $old_value, $option );
+        $value = apply_filters( "pre_update_site_option_{$option}", $value, $old_value, $option );
 
         if ( $value === $old_value ) {
@@ -1463 +1463 @@
                  * @param mixed  $old_value Old value of the network option.
                  */
-                do_action( 'update_site_option_' . $option, $option, $value, $old_value );
+                do_action( "update_site_option_{$option}", $option, $value, $old_value );
 
                 /**
@@ -1501 +1501 @@
          * @param string $transient Transient name.
          */
-        do_action( 'delete_site_transient_' . $transient, $transient );
+        do_action( "delete_site_transient_{$transient}", $transient );
 
         if ( wp_using_ext_object_cache() ) {
@@ -1558 +1558 @@
          * @param string $transient          Transient name.
          */
-        $pre = apply_filters( 'pre_site_transient_' . $transient, false, $transient );
+        $pre = apply_filters( "pre_site_transient_{$transient}", false, $transient );
 
         if ( false !== $pre )
@@ -1594 +1594 @@
          * @param string $transient Transient name.
          */
-        return apply_filters( 'site_transient_' . $transient, $value, $transient );
+        return apply_filters( "site_transient_{$transient}", $value, $transient );
 }
 
@@ -1626 +1626 @@
          * @param string $transient Transient name.
          */
-        $value = apply_filters( 'pre_set_site_transient_' . $transient, $value, $transient );
+        $value = apply_filters( "pre_set_site_transient_{$transient}", $value, $transient );
 
         $expiration = (int) $expiration;
@@ -1641 +1641 @@
          * @param string $transient  Transient name.
          */
-        $expiration = apply_filters( 'expiration_of_site_transient_' . $transient, $expiration, $value, $transient );
+        $expiration = apply_filters( "expiration_of_site_transient_{$transient}", $expiration, $value, $transient );
 
         if ( wp_using_ext_object_cache() ) {
@@ -1672 +1672 @@
                  * @param string $transient  Transient name.
                  */
-                do_action( 'set_site_transient_' . $transient, $value, $expiration, $transient );
+                do_action( "set_site_transient_{$transient}", $value, $expiration, $transient );
 
                 /**

trunk/src/wp-includes/taxonomy.php

@@ -872 +872 @@
          * @param string      $taxonomy The taxonomy slug.
          */
-        $_term = apply_filters( "get_$taxonomy", $_term, $taxonomy );
+        $_term = apply_filters( "get_{$taxonomy}", $_term, $taxonomy );
 
         // Bail if a filter callback has changed the type of the `$_term` object.
@@ -1916 +1916 @@
          * @param array   $object_ids   List of term object IDs.
          */
-        do_action( "delete_$taxonomy", $term, $tt_id, $deleted_term, $object_ids );
+        do_action( "delete_{$taxonomy}", $term, $tt_id, $deleted_term, $object_ids );
 
         return true;
@@ -2407 +2407 @@
          * @param int $tt_id   Term taxonomy ID.
          */
-        do_action( "create_$taxonomy", $term_id, $tt_id );
+        do_action( "create_{$taxonomy}", $term_id, $tt_id );
 
         /**
@@ -2443 +2443 @@
          * @param int $tt_id   Term taxonomy ID.
          */
-        do_action( "created_$taxonomy", $term_id, $tt_id );
+        do_action( "created_{$taxonomy}", $term_id, $tt_id );
 
         return array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
@@ -2988 +2988 @@
          * @param int $tt_id   Term taxonomy ID.
          */
-        do_action( "edit_$taxonomy", $term_id, $tt_id );
+        do_action( "edit_{$taxonomy}", $term_id, $tt_id );
 
         /** This filter is documented in wp-includes/taxonomy.php */
@@ -3017 +3017 @@
          * @param int $tt_id   Term taxonomy ID.
          */
-        do_action( "edited_$taxonomy", $term_id, $tt_id );
+        do_action( "edited_{$taxonomy}", $term_id, $tt_id );
 
         return array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);

trunk/src/wp-includes/theme.php

@@ -903 +903 @@
          * @param string $old_value The current value of the theme mod.
          */
-        $mods[ $name ] = apply_filters( "pre_set_theme_mod_$name", $value, $old_value );
+        $mods[ $name ] = apply_filters( "pre_set_theme_mod_{$name}", $value, $old_value );
 
         $theme = get_option( 'stylesheet' );

trunk/src/wp-login.php

@@ -427 +427 @@
  * @since 2.8.0
  */
-do_action( 'login_form_' . $action );
+do_action( "login_form_{$action}" );
 
 $http_post = ('POST' == $_SERVER['REQUEST_METHOD']);