diff --git a/CHANGELOG.md b/CHANGELOG.md index f28083c9..1a91aa3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ## Unreleased - Updated and improved styles for BU Landing Pages and color palettes. +- Adds PHPCS configuration file. +- Updates and prepares SQL queries per PHPCS. ## 2.3.15 @@ -53,7 +55,6 @@ ## 2.3.7 - Removes duplicate call to burf-base, which is a dependency of burf-theme. -- Add responsive_html_class() for use on the `` tag for class name output/filtering. ## 2.3.61 diff --git a/inc/migration-helpers.php b/inc/migration-helpers.php index 569f7328..f77d828d 100755 --- a/inc/migration-helpers.php +++ b/inc/migration-helpers.php @@ -249,8 +249,7 @@ function responsive_migrate_contact_form() { if ( class_exists( 'GFForms' ) && class_exists( 'GFAPI' ) ) { - $contact_query = sprintf( 'SELECT post_id FROM %s WHERE meta_key = "_wp_page_template" AND meta_value = "contact-us.php"', $wpdb->postmeta ); - $results = $wpdb->get_col( $contact_query ); + $results = $wpdb->get_col( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wp_page_template' AND meta_value = 'contact-us.php'" ); if ( empty( $results ) ) { return; diff --git a/inc/upgrade.php b/inc/upgrade.php index b06ad8d9..9cfb90fd 100644 --- a/inc/upgrade.php +++ b/inc/upgrade.php @@ -115,13 +115,16 @@ function responsive_upgrade_091( $verbose = true ) { ) ); - $template_query = sprintf( - 'SELECT post_id, meta_value FROM %s WHERE meta_key = "_wp_page_template" AND meta_value IN ("%s")', - $wpdb->postmeta, - implode( '","', array_keys( $template_map ) ) - ); + // Extract array keys for reuse when generating the query. + $template_map_keys = array_keys( $template_map ); - $results = $wpdb->get_results( $template_query ); + // Prepare the query by adding a %s placeholder for each key of the passed array. + $results = $wpdb->get_results( + $wpdb->prepare( + "SELECT post_id, meta_value FROM {$wpdb->postmeta} WHERE meta_key = '_wp_page_template' AND meta_value IN (" . substr( str_repeat( ',%s', count( $template_map_keys ) ), 1 ) . ")", // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared + esc_sql( $template_map_keys ) + ) + ); if ( $verbose ) { error_log( __FUNCTION__ . ' - Posts to migrate: ' . count( $results ) ); @@ -145,12 +148,7 @@ function responsive_upgrade_091( $verbose = true ) { ) ); - $banner_query = sprintf( - 'SELECT post_id, meta_value FROM %s WHERE meta_key = "_bu_banner"', - $wpdb->postmeta - ); - - $results = $wpdb->get_results( $banner_query ); + $results = $wpdb->get_results( "SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = '_bu_banner'" ); foreach ( $results as $result ) { $banner = maybe_unserialize( $result->meta_value ); @@ -216,12 +214,16 @@ function responsive_upgrade_2_0( $verbose = true ) { ) ); - $template_query = sprintf( - 'SELECT post_id, meta_value FROM %s WHERE meta_key = "_wp_page_template" AND meta_value IN ("%s")', - $wpdb->postmeta, - implode( '","', array_keys( $template_map ) ) + // Extract array keys for reuse when generating the query. + $template_map_keys = array_keys( $template_map ); + + // Prepare the query by adding a %s placeholder for each key of the passed array. + $results = $wpdb->get_results( + $wpdb->prepare( + "SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = '_wp_page_template' AND meta_value IN (" . substr( str_repeat( ',%s', count( $template_map_keys ) ), 1 ) . ")", // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared + $template_map_keys + ) ); - $results = $wpdb->get_results( $template_query ); if ( $verbose ) { error_log( __FUNCTION__ . ' - Posts to migrate: ' . count( $results ) ); @@ -271,12 +273,7 @@ function responsive_upgrade_banner( $verbose ) { ) ); - $results = $wpdb->get_results( - $wpdb->prepare( - "SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = '_bu_banner'", - $wpdb->postmeta - ) - ); + $results = $wpdb->get_results( "SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = '_bu_banner'" ); foreach ( $results as $result ) { $banner = maybe_unserialize( $result->meta_value ); diff --git a/phpcs.xml.dist b/phpcs.xml.dist new file mode 100644 index 00000000..cb65d117 --- /dev/null +++ b/phpcs.xml.dist @@ -0,0 +1,365 @@ + + + Apply WordPress Coding Standards to all Core files + + + + + + + + + + + + ./ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + node_modules/* + vendor/* + + + + + + diff --git a/tests/test-upgrade-constants.php b/tests/test-upgrade-constants.php index 0b0e66e6..82e2a002 100644 --- a/tests/test-upgrade-constants.php +++ b/tests/test-upgrade-constants.php @@ -35,8 +35,6 @@ class Tests_Responsive_Framework_Upgrade_Constants extends WP_UnitTestCase { * Test Responsive 2.0 upgrade routine when a layout is saved and a constant * is set with a value that is an allowed layout and different than the saved * value. - * - * @expectedIncorrectUsage wpdb::prepare */ function test_responsive_upgrade_2_0_layout_valid_constant_overwrites_no_value() { define( 'BU_RESPONSIVE_LAYOUT', 'side-nav' ); @@ -50,8 +48,6 @@ function test_responsive_upgrade_2_0_layout_valid_constant_overwrites_no_value() * Test Responsive 2.0 upgrade routine when a layout is saved and a constant * is set with a value that is an allowed layout and different than the saved * value. - * - * @expectedIncorrectUsage wpdb::prepare */ function test_responsive_upgrade_2_0_layout_valid_constant_overwrites_value() { define( 'BU_RESPONSIVE_LAYOUT', 'side-nav' ); diff --git a/tests/test-upgrade.php b/tests/test-upgrade.php index 09ba3fb6..f88c4a97 100755 --- a/tests/test-upgrade.php +++ b/tests/test-upgrade.php @@ -14,8 +14,6 @@ class Tests_Responsive_Framework_Upgrades extends WP_UnitTestCase { /** * Test our theme is actually active. - * - * @expectedIncorrectUsage wpdb::prepare */ function test_responsive_framework_upgrade() { update_option( '_responsive_framework_version', '0.0' ); @@ -91,8 +89,6 @@ function test_responsive_upgrade_091() { /** * Test Responsive 2.0 upgrade routine for banner positions. - * - * @expectedIncorrectUsage wpdb::prepare */ function test_responsive_upgrade_2_0_banner_positions() { $test_page_id_1 = $this->factory->post->create( @@ -141,8 +137,6 @@ function test_responsive_upgrade_2_0_banner_positions() { /** * Test Responsive 2.0 upgrade routine for layout names. - * - * @expectedIncorrectUsage wpdb::prepare */ function test_responsive_upgrade_2_0_layout_names() { update_option( 'burf_setting_layout', 'topNav' ); @@ -160,8 +154,6 @@ function test_responsive_upgrade_2_0_layout_names() { /** * Test Responsive 2.0 upgrade routine when no layout is saved and no constant is set. - * - * @expectedIncorrectUsage wpdb::prepare */ function test_responsive_upgrade_2_0_layout_empty() { delete_option( 'burf_setting_layout' ); @@ -174,8 +166,6 @@ function test_responsive_upgrade_2_0_layout_empty() { /** * Test Responsive 2.0 upgrade routine when no layout is saved and a constant * is set with a value that is not an allowed layout. - * - * @expectedIncorrectUsage wpdb::prepare */ function test_responsive_upgrade_2_0_layout_invalid_constant() { update_option( 'burf_setting_layout', 'not-a-valid-layout' ); @@ -187,8 +177,6 @@ function test_responsive_upgrade_2_0_layout_invalid_constant() { /** * Test Responsive 2.0 upgrade routine for template names. - * - * @expectedIncorrectUsage wpdb::prepare */ function test_responsive_upgrade_2_0_templates() { $test_page_id = $this->factory->post->create(