Coding Standards: Fix the remaining issues in /tests.

All PHP files in `/tests` now conform to the PHP coding standards, or have exceptions appropriately marked.

Travis now also runs `phpcs` on the `/tests` directory, any future changes to these files must conform entirely to the WordPress PHP coding standards. 🎉

See #47632.



git-svn-id: https://develop.svn.wordpress.org/trunk@45607 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Gary Pendergast
2019-07-08 00:55:20 +00:00
parent 431bc58a48
commit c6c78490e2
91 changed files with 435 additions and 320 deletions

View File

@@ -23,7 +23,7 @@ class Tests_DB extends WP_UnitTestCase {
public static function setUpBeforeClass() {
parent::setUpBeforeClass();
self::$_wpdb = new wpdb_exposed_methods_for_testing();
self::$_wpdb = new WpdbExposedMethodsForTesting();
}
/**
@@ -346,7 +346,7 @@ class Tests_DB extends WP_UnitTestCase {
}
public function filter_allowed_incompatible_sql_mode( $modes ) {
$pos = array_search( 'ONLY_FULL_GROUP_BY', $modes );
$pos = array_search( 'ONLY_FULL_GROUP_BY', $modes, true );
$this->assertGreaterThanOrEqual( 0, $pos );
if ( false === $pos ) {
@@ -365,6 +365,7 @@ class Tests_DB extends WP_UnitTestCase {
global $wpdb;
$id = 0;
// This, obviously, is an incorrect prepare.
// phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
$prepared = $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = $id", $id );
$this->assertEquals( "SELECT * FROM $wpdb->users WHERE id = 0", $prepared );
}
@@ -382,9 +383,11 @@ class Tests_DB extends WP_UnitTestCase {
function test_prepare_sprintf_invalid_args() {
global $wpdb;
// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
$prepared = @$wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = %d AND user_login = %s", 1, array( 'admin' ) );
$this->assertEquals( "SELECT * FROM $wpdb->users WHERE id = 1 AND user_login = ''", $prepared );
// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
$prepared = @$wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = %d AND user_login = %s", array( 1 ), 'admin' );
$this->assertEquals( "SELECT * FROM $wpdb->users WHERE id = 0 AND user_login = 'admin'", $prepared );
}
@@ -402,9 +405,11 @@ class Tests_DB extends WP_UnitTestCase {
function test_prepare_vsprintf_invalid_args() {
global $wpdb;
// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
$prepared = @$wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = %d AND user_login = %s", array( 1, array( 'admin' ) ) );
$this->assertEquals( "SELECT * FROM $wpdb->users WHERE id = 1 AND user_login = ''", $prepared );
// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
$prepared = @$wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = %d AND user_login = %s", array( array( 1 ), 'admin' ) );
$this->assertEquals( "SELECT * FROM $wpdb->users WHERE id = 0 AND user_login = 'admin'", $prepared );
}
@@ -420,6 +425,7 @@ class Tests_DB extends WP_UnitTestCase {
// $query is the first argument to be passed to wpdb::prepare()
array_unshift( $args, $query );
// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
$prepared = @call_user_func_array( array( $wpdb, 'prepare' ), $args );
$this->assertEquals( $expected, $prepared );
}
@@ -587,6 +593,7 @@ class Tests_DB extends WP_UnitTestCase {
$wpdb->last_result = $last_result;
// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
$result = $wpdb->get_col( $query, $column );
if ( $query ) {
@@ -1043,7 +1050,7 @@ class Tests_DB extends WP_UnitTestCase {
$expected_charset = $wpdb->get_col_charset( $wpdb->posts, 'post_content' );
}
if ( ! in_array( $expected_charset, array( 'utf8', 'utf8mb4', 'latin1' ) ) ) {
if ( ! in_array( $expected_charset, array( 'utf8', 'utf8mb4', 'latin1' ), true ) ) {
$this->markTestSkipped( 'This test only works with utf8, utf8mb4 or latin1 character sets' );
}
@@ -1116,7 +1123,7 @@ class Tests_DB extends WP_UnitTestCase {
array( '%s', '%s' )
);
$row = $wpdb->get_row( "SELECT * FROM $wpdb->postmeta WHERE meta_key='$key'" );
$row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE meta_key=%s", $key ) );
$this->assertNull( $row->meta_value );
}
@@ -1139,7 +1146,7 @@ class Tests_DB extends WP_UnitTestCase {
array( '%s', '%s' )
);
$row = $wpdb->get_row( "SELECT * FROM $wpdb->postmeta WHERE meta_key='$key'" );
$row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE meta_key=%s", $key ) );
$this->assertSame( $value, $row->meta_value );
@@ -1154,7 +1161,7 @@ class Tests_DB extends WP_UnitTestCase {
array( '%s', '%s' )
);
$row = $wpdb->get_row( "SELECT * FROM $wpdb->postmeta WHERE meta_key='$key'" );
$row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE meta_key=%s", $key ) );
$this->assertNull( $row->meta_value );
}
@@ -1177,7 +1184,7 @@ class Tests_DB extends WP_UnitTestCase {
array( '%s', '%s' )
);
$row = $wpdb->get_row( "SELECT * FROM $wpdb->postmeta WHERE meta_key='$key'" );
$row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE meta_key=%s", $key ) );
$this->assertNull( $row->meta_value );
@@ -1192,7 +1199,7 @@ class Tests_DB extends WP_UnitTestCase {
array( '%s', '%s' )
);
$row = $wpdb->get_row( "SELECT * FROM $wpdb->postmeta WHERE meta_key='$key'" );
$row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE meta_key=%s", $key ) );
$this->assertSame( $value, $row->meta_value );
}
@@ -1215,7 +1222,7 @@ class Tests_DB extends WP_UnitTestCase {
array( '%s', '%s' )
);
$row = $wpdb->get_row( "SELECT * FROM $wpdb->postmeta WHERE meta_key='$key'" );
$row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE meta_key=%s", $key ) );
$this->assertNull( $row->meta_value );
@@ -1228,7 +1235,7 @@ class Tests_DB extends WP_UnitTestCase {
array( '%s', '%s' )
);
$row = $wpdb->get_row( "SELECT * FROM $wpdb->postmeta WHERE meta_key='$key'" );
$row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE meta_key=%s", $key ) );
$this->assertNull( $row );
}
@@ -1572,6 +1579,7 @@ class Tests_DB extends WP_UnitTestCase {
$sql = str_replace( '{ESCAPE}', $escape, $sql );
// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
$actual = $wpdb->prepare( $sql, $values );
$this->assertEquals( $expected, $actual );
@@ -1653,6 +1661,8 @@ class Tests_DB extends WP_UnitTestCase {
$wpdb->query( "CREATE TABLE {$wpdb->prefix}test_placeholder( a VARCHAR(100) );" );
$sql = $wpdb->prepare( "INSERT INTO {$wpdb->prefix}test_placeholder VALUES(%s)", $value );
// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
$wpdb->query( $sql );
$actual = $wpdb->get_var( "SELECT a FROM {$wpdb->prefix}test_placeholder" );
@@ -1667,6 +1677,7 @@ class Tests_DB extends WP_UnitTestCase {
global $wpdb;
$sql = $wpdb->prepare( ' %s %1$c ', 'foo' );
// phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
$sql = $wpdb->prepare( " $sql %s ", 'foo' );
$this->assertEquals( " 'foo' {$wpdb->placeholder_escape()}1\$c 'foo' ", $sql );