Changeset 51462 for trunk/tests/phpunit/tests/comment/query.php

Timestamp:

07/19/2021 02:00:11 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: Replace assertContains() with assertStringContainsString() when used with strings.

Using the assertContains() and assertNotContains() methods with string haystacks was deprecated in PHPUnit 8 and removed in PHPUnit 9.

While WordPress test suite currently only supports PHPUnit up to 7.5.x, this allows us to switch to newer assertions ahead of adding full support for PHPUnit 8+.

These methods introduced in PHPUnit 7.5 should be used as an alternative:

• assertStringContainsString()
• assertStringContainsStringIgnoringCase
• assertStringNotContainsString()
• assertStringNotContainsStringIgnoringCase

As WordPress currently uses PHPUnit 5.7.x to run tests on PHP 5.6, polyfills for these methods were added to the WP_UnitTestCase class for PHPUnit < 7.5.

Follow-up to [51331], [51451], [51461].

Props jrf, dd32, SergeyBiryukov.
See #53363, #46149.

File:

• trunk/tests/phpunit/tests/comment/query.php (modified) (22 diffs)

trunk/tests/phpunit/tests/comment/query.php

@@ -2485 +2485 @@
             )
         );
-        $this->assertNotContains( 'comment_author LIKE', $q->request );
+        $this->assertStringNotContainsString( 'comment_author LIKE', $q->request );
     }
 
@@ -2498 +2498 @@
             )
         );
-        $this->assertNotContains( 'comment_author LIKE', $q->request );
+        $this->assertStringNotContainsString( 'comment_author LIKE', $q->request );
     }
 
@@ -2511 +2511 @@
             )
         );
-        $this->assertNotContains( 'comment_author LIKE', $q->request );
+        $this->assertStringNotContainsString( 'comment_author LIKE', $q->request );
     }
 
@@ -2525 +2525 @@
             )
         );
-        $this->assertContains( "comment_author LIKE '%0%'", $wpdb->remove_placeholder_escape( $q->request ) );
+        $this->assertStringContainsString( "comment_author LIKE '%0%'", $wpdb->remove_placeholder_escape( $q->request ) );
     }
 
@@ -2539 +2539 @@
             )
         );
-        $this->assertContains( "comment_author LIKE '%0%'", $wpdb->remove_placeholder_escape( $q->request ) );
+        $this->assertStringContainsString( "comment_author LIKE '%0%'", $wpdb->remove_placeholder_escape( $q->request ) );
     }
 
@@ -2548 +2548 @@
         $q->query( array() );
 
-        $this->assertContains( "ORDER BY $wpdb->comments.comment_date_gmt", $q->request );
+        $this->assertStringContainsString( "ORDER BY $wpdb->comments.comment_date_gmt", $q->request );
     }
 
@@ -2561 +2561 @@
         );
 
-        $this->assertContains( "ORDER BY $wpdb->comments.comment_agent", $q->request );
+        $this->assertStringContainsString( "ORDER BY $wpdb->comments.comment_agent", $q->request );
     }
 
@@ -2574 +2574 @@
         );
 
-        $this->assertContains( "ORDER BY $wpdb->comments.comment_date_gmt", $q->request );
+        $this->assertStringContainsString( "ORDER BY $wpdb->comments.comment_date_gmt", $q->request );
     }
 
@@ -2587 +2587 @@
         );
 
-        $this->assertContains( "ORDER BY $wpdb->comments.comment_agent DESC, $wpdb->comments.comment_approved DESC", $q->request );
+        $this->assertStringContainsString( "ORDER BY $wpdb->comments.comment_agent DESC, $wpdb->comments.comment_approved DESC", $q->request );
     }
 
@@ -2600 +2600 @@
         );
 
-        $this->assertContains( "ORDER BY $wpdb->comments.comment_agent DESC, $wpdb->comments.comment_approved DESC", $q->request );
+        $this->assertStringContainsString( "ORDER BY $wpdb->comments.comment_agent DESC, $wpdb->comments.comment_approved DESC", $q->request );
     }
 
@@ -2613 +2613 @@
         );
 
-        $this->assertContains( "ORDER BY $wpdb->comments.comment_agent DESC, $wpdb->comments.comment_approved DESC", $q->request );
+        $this->assertStringContainsString( "ORDER BY $wpdb->comments.comment_agent DESC, $wpdb->comments.comment_approved DESC", $q->request );
     }
 
@@ -2626 +2626 @@
         );
 
-        $this->assertContains( "ORDER BY $wpdb->comments.comment_agent DESC, $wpdb->comments.comment_approved DESC", $q->request );
+        $this->assertStringContainsString( "ORDER BY $wpdb->comments.comment_agent DESC, $wpdb->comments.comment_approved DESC", $q->request );
     }
 
@@ -2639 +2639 @@
         );
 
-        $this->assertContains( "ORDER BY $wpdb->comments.comment_date_gmt", $q->request );
+        $this->assertStringContainsString( "ORDER BY $wpdb->comments.comment_date_gmt", $q->request );
     }
 
@@ -2653 +2653 @@
         );
 
-        $this->assertNotContains( 'ORDER BY', $q->request );
+        $this->assertStringNotContainsString( 'ORDER BY', $q->request );
     }
 
@@ -2667 +2667 @@
         );
 
-        $this->assertNotContains( 'ORDER BY', $q->request );
+        $this->assertStringNotContainsString( 'ORDER BY', $q->request );
     }
 
@@ -2681 +2681 @@
         );
 
-        $this->assertNotContains( 'ORDER BY', $q->request );
+        $this->assertStringNotContainsString( 'ORDER BY', $q->request );
     }
 
@@ -2702 +2702 @@
         );
 
-        $this->assertContains( "ORDER BY $wpdb->comments.comment_agent DESC, $wpdb->comments.comment_date_gmt ASC, $wpdb->comments.comment_ID DESC", $q->request );
+        $this->assertStringContainsString( "ORDER BY $wpdb->comments.comment_agent DESC, $wpdb->comments.comment_date_gmt ASC, $wpdb->comments.comment_ID DESC", $q->request );
     }
 
@@ -2723 +2723 @@
         );
 
-        $this->assertContains( "ORDER BY $wpdb->comments.comment_agent DESC, $wpdb->comments.comment_ID DESC", $q->request );
+        $this->assertStringContainsString( "ORDER BY $wpdb->comments.comment_agent DESC, $wpdb->comments.comment_ID DESC", $q->request );
     }
 
@@ -2744 +2744 @@
         );
 
-        $this->assertContains( "ORDER BY $wpdb->comments.comment_agent DESC, $wpdb->comments.comment_date_gmt DESC, $wpdb->comments.comment_ID DESC", $q->request );
+        $this->assertStringContainsString( "ORDER BY $wpdb->comments.comment_agent DESC, $wpdb->comments.comment_date_gmt DESC, $wpdb->comments.comment_ID DESC", $q->request );
     }
 
@@ -2764 +2764 @@
         );
 
-        $this->assertContains( "ORDER BY $wpdb->comments.comment_agent DESC, $wpdb->comments.comment_date_gmt ASC, $wpdb->comments.comment_ID ASC", $q->request );
+        $this->assertStringContainsString( "ORDER BY $wpdb->comments.comment_agent DESC, $wpdb->comments.comment_date_gmt ASC, $wpdb->comments.comment_ID ASC", $q->request );
     }
 
@@ -2784 +2784 @@
         );
 
-        $this->assertContains( "ORDER BY $wpdb->comments.comment_agent DESC, $wpdb->comments.comment_date ASC, $wpdb->comments.comment_ID ASC", $q->request );
+        $this->assertStringContainsString( "ORDER BY $wpdb->comments.comment_agent DESC, $wpdb->comments.comment_date ASC, $wpdb->comments.comment_ID ASC", $q->request );
     }
 
@@ -2803 +2803 @@
         );
 
-        $this->assertContains( "ORDER BY $wpdb->comments.comment_agent ASC, $wpdb->comments.comment_ID DESC", $q->request );
+        $this->assertStringContainsString( "ORDER BY $wpdb->comments.comment_agent ASC, $wpdb->comments.comment_ID DESC", $q->request );
     }