Changeset 5960

Timestamp:

09/23/2017 03:55:48 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Support Forums: Convert Ratings_Compat and Stickies_Compat constructor arguments to an array.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc

Files:

• class-directory-compat.php (modified) (2 diffs)
• class-ratings-compat.php (modified) (1 diff)
• class-stickies-compat.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-directory-compat.php

@@ -295 +295 @@
                         // Instantiate WPORG_Ratings compat mode for reviews.
                         if ( class_exists( 'WPORG_Ratings' ) && class_exists( 'WordPressdotorg\Forums\Ratings_Compat' ) ) {
-                                $this->ratings = new Ratings_Compat( $this->compat(), $this->slug(), $this->taxonomy(), $this->get_object( $this->slug() ) );
+                                $this->ratings = new Ratings_Compat( array(
+                                        'compat'   => $this->compat(),
+                                        'slug'     => $this->slug(),
+                                        'taxonomy' => $this->taxonomy(),
+                                        'object'   => $this->get_object( $this->slug() ),
+                                ) );
                         }
 
                         // Instantiate WPORG_Stickies mode for support view.
                         if ( class_exists( 'WordPressdotorg\Forums\Stickies_Compat' ) ) {
-                                $this->stickies = new Stickies_Compat( $this->compat(), $this->slug(), $this->taxonomy(), $this->get_object( $this->slug() ), $this->term );
+                                $this->stickies = new Stickies_Compat( array(
+                                        'compat'   => $this->compat(),
+                                        'slug'     => $this->slug(),
+                                        'taxonomy' => $this->taxonomy(),
+                                        'object'   => $this->get_object( $this->slug() ),
+                                        'term'     => $this->term,
+                                ) );
                         }
 
@@ -329 +340 @@
                                 // Instantiate WPORG_Ratings compat mode for reviews.
                                 if ( class_exists( 'WPORG_Ratings' ) && class_exists( 'WordPressdotorg\Forums\Ratings_Compat' ) ) {
-                                        $this->ratings = new Ratings_Compat( $this->compat(), $this->slug(), $this->taxonomy(), $this->get_object( $this->slug() ) );
+                                        $this->ratings = new Ratings_Compat( array(
+                                                'compat'   => $this->compat(),
+                                                'slug'     => $this->slug(),
+                                                'taxonomy' => $this->taxonomy(),
+                                                'object'   => $this->get_object( $this->slug() ),
+                                        ) );
                                 }
 
                                 // Instantiate WPORG_Stickies mode for topic view.
                                 if ( class_exists( 'WordPressdotorg\Forums\Stickies_Compat' ) ) {
-                                        $this->stickies = new Stickies_Compat( $this->compat(), $this->slug(), $this->taxonomy(), $this->get_object( $this->slug() ), $this->term, $this->authors, $this->contributors, $this->support_reps );
+                                        $this->stickies = new Stickies_Compat( array(
+                                                'compat'       => $this->compat(),
+                                                'slug'         => $this->slug(),
+                                                'taxonomy'     => $this->taxonomy(),
+                                                'object'       => $this->get_object( $this->slug() ),
+                                                'term'         => $this->term,
+                                                'authors'      => $this->authors,
+                                                'contributors' => $this->contributors,
+                                                'support_reps' => $this->support_reps,
+                                        ) );
                                 }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-ratings-compat.php

@@ -12 +12 @@
         var $filter = false;
 
-        public function __construct( $compat, $slug, $taxonomy, $object ) {
+        public function __construct( $args ) {
                 if ( ! class_exists( 'WPORG_Ratings' ) ) {
                         return;
                 }
 
-                if ( empty( $compat ) || empty( $slug ) || empty( $taxonomy ) || empty( $object ) ) {
-                        return;
-                }
-
-                $this->compat   = $compat;
-                $this->slug     = $slug;
-                $this->taxonomy = $taxonomy;
-                $this->object   = $object;
+                $args = wp_parse_args( $args, array(
+                        'compat'       => '',
+                        'slug'         => '',
+                        'taxonomy'     => '',
+                        'object'       => '',
+                ) );
+
+                if ( ! $args['compat'] || ! $args['slug'] || ! $args['taxonomy'] || ! $args['object'] ) {
+                        return;
+                }
+
+                $this->compat   = $args['compat'];
+                $this->slug     = $args['slug'];
+                $this->taxonomy = $args['taxonomy'];
+                $this->object   = $args['object'];
 
                 $this->ratings_counts = \WPORG_Ratings::get_rating_counts( $this->compat, $this->slug );

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-stickies-compat.php

@@ -13 +13 @@
         var $term     = null;
 
-        public function __construct( $compat, $slug, $taxonomy, $object, $term, $authors = array(), $contributors = array(), $support_reps = array() ) {
-                if ( empty( $compat ) || empty( $slug ) || empty( $taxonomy ) || empty( $object ) || empty( $term ) ) {
+        public function __construct( $args ) {
+                $args = wp_parse_args( $args, array(
+                        'compat'       => '',
+                        'slug'         => '',
+                        'taxonomy'     => '',
+                        'object'       => '',
+                        'term'         => '',
+                        'authors'      => array(),
+                        'contributors' => array(),
+                        'support_reps' => array(),
+                ) );
+
+                if ( ! $args['compat'] || ! $args['slug'] || ! $args['taxonomy'] || ! $args['object'] || ! $args['term'] ) {
                         return;
                 }
 
-                $this->compat       = $compat;
-                $this->slug         = $slug;
-                $this->taxonomy     = $taxonomy;
-                $this->object       = $object;
-                $this->term         = $term;
-                $this->authors      = $authors;
-                $this->contributors = $contributors;
-                $this->support_reps = $support_reps;
+                $this->compat       = $args['compat'];
+                $this->slug         = $args['slug'];
+                $this->taxonomy     = $args['taxonomy'];
+                $this->object       = $args['object'];
+                $this->term         = $args['term'];
+                $this->authors      = $args['authors'];
+                $this->contributors = $args['contributors'];
+                $this->support_reps = $args['support_reps'];
 
                 // Remove global stickies from sticky array.