Changeset 51788

Timestamp:

09/09/2021 07:41:53 PM (4 years ago)

Author:

hellofromTonya

Message:

Code Modernization: Fix parameter name mismatches for parent/child classes in WP_Sitemaps_Provider::get_max_num_pages().

In each child class, renames the parameter to match the parent's method signature.
Why? PHP 8 introduces the ability to pass named arguments to function/method calls. This means the child and parent method signatures (i.e. parameter names) need to match.

Adds @since to clearly specify why the change happened.

Reassigns the generic parameter to the original parameter.
Why? Restoring the original name keeps the context intact within the method and makes the code more readable. An inline comment explains why this reassignment is made.

Note: Reassignment is done after the guard clause.
Why? To avoid unnecessary processing and memory should the method bail out.

Follow-up to [48072].

Props jrf, hellofromTonya, sergeybiryukov, azaozz, desrosj, johnbillion.
See #51553.

Location:

trunk/src/wp-includes/sitemaps/providers

Files:

• class-wp-sitemaps-posts.php (modified) (1 diff)
• class-wp-sitemaps-taxonomies.php (modified) (1 diff)

trunk/src/wp-includes/sitemaps/providers/class-wp-sitemaps-posts.php

@@ -149 +149 @@
      *
      * @since 5.5.0
-     *
-     * @param string $post_type Optional. Post type name. Default empty.
+     * @since 5.9.0 Renamed `$post_type` to `$object_subtype` to match parent class
+     *              for PHP 8 named parameter support.
+     *
+     * @param string $object_subtype Optional. Post type name. Default empty.
      * @return int Total number of pages.
      */
-    public function get_max_num_pages( $post_type = '' ) {
-        if ( empty( $post_type ) ) {
+    public function get_max_num_pages( $object_subtype = '' ) {
+        if ( empty( $object_subtype ) ) {
             return 0;
         }
+
+        // Restores the more descriptive, specific name for use within this method.
+        $post_type = $object_subtype;
 
         /**

trunk/src/wp-includes/sitemaps/providers/class-wp-sitemaps-taxonomies.php

@@ -135 +135 @@
      *
      * @since 5.5.0
-     *
-     * @param string $taxonomy Taxonomy name.
+     * @since 5.9.0 Renamed `$taxonomy` to `$object_subtype` to match parent class
+     *              for PHP 8 named parameter support.
+     *
+     * @param string $object_subtype Optional. Taxonomy name. Default empty.
      * @return int Total number of pages.
      */
-    public function get_max_num_pages( $taxonomy = '' ) {
-        if ( empty( $taxonomy ) ) {
+    public function get_max_num_pages( $object_subtype = '' ) {
+        if ( empty( $object_subtype ) ) {
             return 0;
         }
+
+        // Restores the more descriptive, specific name for use within this method.
+        $taxonomy = $object_subtype;
 
         /**