Ticket #39120: 39120.diff

src/wp-includes/class-wp-comment-query.php

@@ -1145 +1145 @@
                         return 'DESC';
                 }
         }
+
+        /**
+         * Retrieve query variable.
+         *
+         * @since 5.0.0
+         *
+         * @param  string $query_var Query variable key.
+         * @param  mixed  $default   Optional. Value to return if the query variable is not set. Default null.
+         * @return mixed             Contents of the query variable.
+         */
+        public function get( $query_var, $default = null ) {
+                if ( isset( $this->query_vars[ $query_var ] ) ) {
+                        return $this->query_vars[ $query_var ];
+                }
+
+                return $default;
+        }
+
+        /**
+         * Set query variable.
+         *
+         * @since 5.0.0
+         *
+         * @param string $query_var Query variable key.
+         * @param mixed  $value     Query variable value.
+         */
+        public function set( $query_var, $value ) {
+                $this->query_vars[ $query_var ] = $value;
+        }
 }

src/wp-includes/class-wp-term-query.php

@@ -972 +972 @@
 
                 return $wpdb->prepare( '((t.name LIKE %s) OR (t.slug LIKE %s))', $like, $like );
         }
+
+        /**
+         * Retrieve query variable.
+         *
+         * @since 5.0.0
+         *
+         * @param string $query_var Query variable key.
+         * @param mixed  $default   Optional. Value to return if the query variable is not set. Default null.
+         * @return mixed            Contents of the query variable.
+         */
+        public function get( $query_var, $default = null ) {
+                if ( isset( $this->query_vars[ $query_var ] ) ) {
+                        return $this->query_vars[ $query_var ];
+                }
+
+                return $default;
+        }
+
+        /**
+         * Set query variable.
+         *
+         * @since 5.0.0
+         *
+         * @param string $query_var Query variable key.
+         * @param mixed  $value     Query variable value.
+         */
+        public function set( $query_var, $value ) {
+                $this->query_vars[ $query_var ] = $value;
+        }
 }

tests/phpunit/tests/comment/query.php

@@ -4872 +4872 @@
 
                 $this->assertEqualSets( $c1, $found );
         }
+
+        /**
+         * Test that the get and set methods for handling query variables should be supported.
+         *
+         * @ticket 39120
+         */
+        public function test_get_and_set_methods_for_handling_query_vars_should_be_supported() {
+
+                $comments = new WP_Comment_Query();
+
+                // With default query variable value as null.
+                $this->assertNull( $comments->get( 'fields' ) );
+                $this->assertNull( $comments->query_vars['fields'] );
+
+                // With query variable value set as a non-empty string.
+                $comments->set( 'fields', 'ids' );
+                $this->assertSame( 'ids', $comments->get( 'fields' ) );
+                $this->assertSame( 'ids', $comments->query_vars['fields'] );
+
+                // With query variable value set as an empty string.
+                $comments->set( 'fields', '' );
+                $this->assertSame( '', $comments->get( 'fields' ) );
+                $this->assertSame( '', $comments->query_vars['fields'] );
+
+                // Getting a non-existing query variable key.
+                $this->assertNull( $comments->get( 'does-not-exist' ) );
+                // Getting a non-existing query varable key, with a default query value as a non-empty string.
+                $this->assertSame( 'foo', $comments->get( 'does-not-exist', 'foo' ) );
+        }
 }

tests/phpunit/tests/term/query.php

@@ -614 +614 @@
                 );
                 $this->assertSame( array(), $q->terms );
         }
+
+        /**
+         * Test that the get and set methods for handling query variables should be supported.
+         *
+         * @ticket 39120
+         */
+        public function test_get_and_set_methods_for_handling_query_vars_should_be_supported() {
+
+                $terms = new WP_Term_Query();
+
+                // With default query variable value as null.
+                $this->assertNull( $terms->get( 'fields' ) );
+                $this->assertNull( $terms->query_vars['fields'] );
+
+                // With query variable value set as a non-empty string.
+                $terms->set( 'fields', 'ids' );
+                $this->assertSame( 'ids', $terms->get( 'fields' ) );
+                $this->assertSame( 'ids', $terms->query_vars['fields'] );
+
+                // With query variable value set as an empty string.
+                $terms->set( 'fields', '' );
+                $this->assertSame( '', $terms->get( 'fields' ) );
+                $this->assertSame( '', $terms->query_vars['fields'] );
+
+                // Getting a non-existing query variable key.
+                $this->assertNull( $terms->get( 'does-not-exist' ) );
+                // Getting a non-existing query varable key, with a default query value as a non-empty string.
+                $this->assertSame( 'foo', $terms->get( 'does-not-exist', 'foo' ) );
+        }
 }