<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[53126] trunk: Posts, Post Types/Taxonomies: Add object type specific registration filters.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/53126">53126</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/53126","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>peterwilsoncc</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-04-11 05:09:53 +0000 (Mon, 11 Apr 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Posts, Post Types/Taxonomies: Add object type specific registration filters.
Add post type and taxonomy specific registration argument hooks.
Introduces the filters `register_{$post_type}_post_type_args` and `register_{$taxonomy}_taxonomy_args`. Introduces the actions `registered_post_type_{$post_type}` and `registered_taxonomy_{$taxonomy}`.
Props pbiron, dlh, davidbaumwald, hellofromTonya, milana_cap.
Fixes <a href="https://core.trac.wordpress.org/ticket/53212">#53212</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpposttypephp">trunk/src/wp-includes/class-wp-post-type.php</a></li>
<li><a href="#trunksrcwpincludesclasswptaxonomyphp">trunk/src/wp-includes/class-wp-taxonomy.php</a></li>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunktestsphpunittestsposttypesphp">trunk/tests/phpunit/tests/post/types.php</a></li>
<li><a href="#trunktestsphpunittestspostwpPostTypephp">trunk/tests/phpunit/tests/post/wpPostType.php</a></li>
<li><a href="#trunktestsphpunitteststaxonomyphp">trunk/tests/phpunit/tests/taxonomy.php</a></li>
<li><a href="#trunktestsphpunitteststermwpTaxonomyphp">trunk/tests/phpunit/tests/term/wpTaxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpposttypephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-post-type.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-post-type.php 2022-04-11 05:01:04 UTC (rev 53125)
+++ trunk/src/wp-includes/class-wp-post-type.php 2022-04-11 05:09:53 UTC (rev 53126)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -440,6 +440,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $args = apply_filters( 'register_post_type_args', $args, $this->name );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_type = $this->name;
+
+ /**
+ * Filters the arguments for registering a specific post type.
+ *
+ * The dynamic portion of the filter name, `$this->name`, refers to the post type key.
+ *
+ * @since 6.0.0
+ *
+ * @param array $args Array of arguments for registering a post type.
+ * See the register_post_type() function for accepted arguments.
+ * @param string $post_type Post type key.
+ */
+ $args = apply_filters( "register_{$post_type}_post_type_args", $args, $this->name );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $has_edit_link = ! empty( $args['_edit_link'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Args prefixed with an underscore are reserved for internal use.
</span></span></pre></div>
<a id="trunksrcwpincludesclasswptaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-taxonomy.php 2022-04-11 05:01:04 UTC (rev 53125)
+++ trunk/src/wp-includes/class-wp-taxonomy.php 2022-04-11 05:09:53 UTC (rev 53126)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -315,6 +315,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $args = apply_filters( 'register_taxonomy_args', $args, $this->name, (array) $object_type );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $taxonomy = $this->name;
+
+ /**
+ * Filters the arguments for registering a specific taxonomy.
+ *
+ * The dynamic portion of the filter name, `$this->name`, refers to the taxonomy key.
+ *
+ * @since 6.0.0
+ *
+ * @param array $args Array of arguments for registering a taxonomy.
+ * See the register_taxonomy() function for accepted arguments.
+ * @param string $taxonomy Taxonomy key.
+ * @param string[] $object_type Array of names of object types for the taxonomy.
+ */
+ $args = apply_filters( "register_{$taxonomy}_taxonomy_args", $args, $this->name, (array) $object_type );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $defaults = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'labels' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => '',
</span></span></pre></div>
<a id="trunksrcwpincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post.php 2022-04-11 05:01:04 UTC (rev 53125)
+++ trunk/src/wp-includes/post.php 2022-04-11 05:09:53 UTC (rev 53126)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1709,6 +1709,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'registered_post_type', $post_type, $post_type_object );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Fires after a specific post type is registered.
+ *
+ * The dynamic portion of the filter name, `$post_type`, refers to the post type key.
+ *
+ * @since 6.0.0
+ *
+ * @param string $post_type Post type.
+ * @param WP_Post_Type $post_type_object Arguments used to register the post type.
+ */
+ do_action( "registered_post_type_{$post_type}", $post_type, $post_type_object );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $post_type_object;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludestaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/taxonomy.php 2022-04-11 05:01:04 UTC (rev 53125)
+++ trunk/src/wp-includes/taxonomy.php 2022-04-11 05:09:53 UTC (rev 53126)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -529,6 +529,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'registered_taxonomy', $taxonomy, $object_type, (array) $taxonomy_object );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Fires after a specific taxonomy is registered.
+ *
+ * The dynamic portion of the filter name, `$taxonomy`, refers to the taxonomy key.
+ *
+ * @since 6.0.0
+ *
+ * @param string $taxonomy Taxonomy slug.
+ * @param array|string $object_type Object type or array of object types.
+ * @param array $args Array of taxonomy registration arguments.
+ */
+ do_action( "registered_taxonomy_{$taxonomy}", $taxonomy, $object_type, (array) $taxonomy_object );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $taxonomy_object;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsposttypesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/types.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/types.php 2022-04-11 05:01:04 UTC (rev 53125)
+++ trunk/tests/phpunit/tests/post/types.php 2022-04-11 05:09:53 UTC (rev 53126)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,6 +163,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $public, $args->show_in_admin_bar );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket 53212
+ * @covers ::register_post_type
+ */
+ public function test_fires_registered_post_type_actions() {
+ $post_type = 'cpt';
+ $action = new MockAction();
+
+ add_action( 'registered_post_type', array( $action, 'action' ) );
+ add_action( "registered_post_type_{$post_type}", array( $action, 'action' ) );
+
+ register_post_type( $post_type );
+ register_post_type( $this->post_type );
+
+ $this->assertSame( 3, $action->get_call_count() );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_register_taxonomy_for_object_type() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_taxonomies;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestspostwpPostTypephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/wpPostType.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/wpPostType.php 2022-04-11 05:01:04 UTC (rev 53125)
+++ trunk/tests/phpunit/tests/post/wpPostType.php 2022-04-11 05:09:53 UTC (rev 53126)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,4 +216,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameSets( array( 'post_tag' ), $taxonomies );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameSets( array(), $taxonomies_after );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ public function test_applies_registration_args_filters() {
+ $post_type = 'cpt';
+ $action = new MockAction();
+
+ add_filter( 'register_post_type_args', array( $action, 'filter' ) );
+ add_filter( "register_{$post_type}_post_type_args", array( $action, 'filter' ) );
+
+ new WP_Post_Type( $post_type );
+ new WP_Post_Type( 'random' );
+
+ $this->assertSame( 3, $action->get_call_count() );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunitteststaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/taxonomy.php 2022-04-11 05:01:04 UTC (rev 53125)
+++ trunk/tests/phpunit/tests/taxonomy.php 2022-04-11 05:09:53 UTC (rev 53126)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,7 +221,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $tax_2->show_in_quick_edit );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 53212
+ */
+ public function test_register_taxonomy_fires_registered_actions() {
+ $taxonomy = 'taxonomy53212';
+ $action = new MockAction();
+
+ add_action( 'registered_taxonomy', array( $action, 'action' ) );
+ add_action( "registered_taxonomy_{$taxonomy}", array( $action, 'action' ) );
+
+ register_taxonomy( $taxonomy, 'post' );
+ register_taxonomy( 'random', 'post' );
+
+ $this->assertSame( 3, $action->get_call_count() );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket 11058
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_registering_taxonomies_to_object_types() {
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpTaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/wpTaxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpTaxonomy.php 2022-04-11 05:01:04 UTC (rev 53125)
+++ trunk/tests/phpunit/tests/term/wpTaxonomy.php 2022-04-11 05:09:53 UTC (rev 53126)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,4 +99,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $has_action_after );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ public function test_applies_registration_args_filters() {
+ $taxonomy = 'taxonomy5';
+ $action = new MockAction();
+
+ add_filter( 'register_taxonomy_args', array( $action, 'filter' ) );
+ add_filter( "register_{$taxonomy}_taxonomy_args", array( $action, 'filter' ) );
+
+ new WP_Taxonomy( $taxonomy, 'post' );
+ new WP_Taxonomy( 'random', 'post' );
+
+ $this->assertSame( 3, $action->get_call_count() );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>