Changeset 46127 for trunk/tests/phpunit/includes/abstract-testcase.php

Timestamp:

09/15/2019 11:03:45 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Code Modernisation: Introduce the spread operator in tests/phpunit/*.

Rather than relying func_get_args() to retrieve arbitrary function arguments, we can now use the spread operator to assign them directly to a variable.

Props jrf.
See #47678.

File:

• trunk/tests/phpunit/includes/abstract-testcase.php (modified) (4 diffs)

trunk/tests/phpunit/includes/abstract-testcase.php

@@ -904 +904 @@
      *
      * Any properties that are listed by name as parameters will be expected to be true; all others are
-     * expected to be false. For example, assertQueryTrue('is_single', 'is_feed') means is_single()
+     * expected to be false. For example, assertQueryTrue( 'is_single', 'is_feed' ) means is_single()
      * and is_feed() must be true and everything else must be false to pass.
      *
@@ -912 +912 @@
      * @param string ...$prop Any number of WP_Query properties that are expected to be true for the current request.
      */
-    public function assertQueryTrue() {
+    public function assertQueryTrue( ...$prop ) {
         global $wp_query;
-        $all  = array(
+
+        $all = array(
             'is_404',
             'is_admin',
@@ -945 +946 @@
             'is_year',
         );
-        $true = func_get_args();
-
-        foreach ( $true as $true_thing ) {
+
+        foreach ( $prop as $true_thing ) {
             $this->assertContains( $true_thing, $all, "Unknown conditional: {$true_thing}." );
         }
@@ -957 +957 @@
             $result = is_callable( $query_thing ) ? call_user_func( $query_thing ) : $wp_query->$query_thing;
 
-            if ( in_array( $query_thing, $true, true ) ) {
+            if ( in_array( $query_thing, $prop, true ) ) {
                 if ( ! $result ) {
                     $message .= $query_thing . ' is false but is expected to be true. ' . PHP_EOL;