Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: upgrade WPCS to v3.0 #2924

Merged
merged 9 commits into from Sep 13, 2023
Merged

chore: upgrade WPCS to v3.0 #2924

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
99aaa56
chore: update vipcs (and dep tree) to ^3.0
justlevine Sep 6, 2023
a20eab6
chore: autofix wpcs 3.0 smells
justlevine Sep 6, 2023
d600da6
chore: preincrement when possible (wpcs 3.0)
justlevine Sep 6, 2023
4cb43c0
chore: remove extra conditional nesting (wpcs 3.0)
justlevine Sep 6, 2023
66cc23c
chore: avoid reserved keywords for param names (wpcs 3.0)
justlevine Sep 6, 2023
802ca2f
chore: evaluate remaining exclusions (wpcs 3.0)
justlevine Sep 6, 2023
b0d2717
chore: remove unused 'AssignmentInCondition` exclude
justlevine Sep 6, 2023
6a6296a
chore: update exclusions
justlevine Sep 7, 2023
ec93a97
chore: escape exception messages
justlevine Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
50 changes: 25 additions & 25 deletions access-functions.php
View file
Open in desktop
Expand Up @@ -315,7 +315,7 @@ static function ( TypeRegistry $type_registry ) use ( $type_name, $fields ) {
*
* @since 1.13.0
*/
function register_graphql_edge_field( string $from_type, string $to_type, string $field_name, array $config ) : void {
function register_graphql_edge_field( string $from_type, string $to_type, string $field_name, array $config ): void {
$connection_name = ucfirst( $from_type ) . 'To' . ucfirst( $to_type ) . 'ConnectionEdge';

add_action(
Expand All @@ -336,7 +336,7 @@ static function ( TypeRegistry $type_registry ) use ( $connection_name, $field_n
*
* @since 1.13.0
*/
function register_graphql_edge_fields( string $from_type, string $to_type, array $fields ) : void {
function register_graphql_edge_fields( string $from_type, string $to_type, array $fields ): void {
$connection_name = ucfirst( $from_type ) . 'To' . ucfirst( $to_type ) . 'ConnectionEdge';

add_action(
Expand All @@ -358,7 +358,7 @@ static function ( TypeRegistry $type_registry ) use ( $connection_name, $fields
*
* @since 1.13.0
*/
function register_graphql_connection_where_arg( string $from_type, string $to_type, string $field_name, array $config ) : void {
function register_graphql_connection_where_arg( string $from_type, string $to_type, string $field_name, array $config ): void {
$connection_name = ucfirst( $from_type ) . 'To' . ucfirst( $to_type ) . 'ConnectionWhereArgs';

add_action(
Expand All @@ -379,7 +379,7 @@ static function ( TypeRegistry $type_registry ) use ( $connection_name, $field_n
*
* @since 1.13.0
*/
function register_graphql_connection_where_args( string $from_type, string $to_type, array $fields ) : void {
function register_graphql_connection_where_args( string $from_type, string $to_type, array $fields ): void {
$connection_name = ucfirst( $from_type ) . 'To' . ucfirst( $to_type ) . 'ConnectionWhereArgs';

add_action(
Expand Down Expand Up @@ -520,11 +520,11 @@ static function ( TypeRegistry $type_registry ) use ( $type_name, $config ) {
*
* @since 1.13.0
*/
function deregister_graphql_type( string $type_name ) : void {
function deregister_graphql_type( string $type_name ): void {
// Prevent the type from being registered to the scheme directly.
add_filter(
'graphql_excluded_types',
static function ( $excluded_types ) use ( $type_name ) : array {
static function ( $excluded_types ) use ( $type_name ): array {
// Normalize the types to prevent case sensitivity issues.
$type_name = strtolower( $type_name );
// If the type isn't already excluded, add it to the array.
Expand All @@ -540,7 +540,7 @@ static function ( $excluded_types ) use ( $type_name ) : array {
// Prevent the type from being inherited as an interface.
add_filter(
'graphql_type_interfaces',
static function ( $interfaces ) use ( $type_name ) : array {
static function ( $interfaces ) use ( $type_name ): array {
// Normalize the needle and haystack to prevent case sensitivity issues.
$key = array_search(
strtolower( $type_name ),
Expand Down Expand Up @@ -586,7 +586,7 @@ static function ( TypeRegistry $type_registry ) use ( $type_name, $field_name )
*
* @since 1.14.0
*/
function deregister_graphql_connection( string $connection_name ) : void {
function deregister_graphql_connection( string $connection_name ): void {
add_action(
get_graphql_register_action(),
static function ( TypeRegistry $type_registry ) use ( $connection_name ) {
Expand All @@ -603,7 +603,7 @@ static function ( TypeRegistry $type_registry ) use ( $connection_name ) {
*
* @since 1.14.0
*/
function deregister_graphql_mutation( string $mutation_name ) : void {
function deregister_graphql_mutation( string $mutation_name ): void {
add_action(
get_graphql_register_action(),
static function ( TypeRegistry $type_registry ) use ( $mutation_name ) {
Expand Down Expand Up @@ -762,40 +762,40 @@ static function ( \WPGraphQL\Admin\Settings\SettingsRegistry $registry ) use ( $
/**
* Get an option value from GraphQL settings
*
* @param string $option_name The key of the option to return
* @param mixed $default The default value the setting should return if no value is set
* @param string $section_name The settings group section that the option belongs to
* @param string $option_name The key of the option to return
* @param mixed $default_value The default value the setting should return if no value is set
* @param string $section_name The settings group section that the option belongs to
*
* @return mixed|string|int|boolean
* @since 0.13.0
*/
function get_graphql_setting( string $option_name, $default = '', $section_name = 'graphql_general_settings' ) {
function get_graphql_setting( string $option_name, $default_value = '', $section_name = 'graphql_general_settings' ) {
$section_fields = get_option( $section_name );

/**
* Filter the section fields
*
* @param array $section_fields The values of the fields stored for the section
* @param string $section_name The name of the section
* @param mixed $default The default value for the option being retrieved
* @param mixed $default_value The default value for the option being retrieved
*/
$section_fields = apply_filters( 'graphql_get_setting_section_fields', $section_fields, $section_name, $default );
$section_fields = apply_filters( 'graphql_get_setting_section_fields', $section_fields, $section_name, $default_value );

/**
* Get the value from the stored data, or return the default
*/
$value = isset( $section_fields[ $option_name ] ) ? $section_fields[ $option_name ] : $default;
$value = isset( $section_fields[ $option_name ] ) ? $section_fields[ $option_name ] : $default_value;

/**
* Filter the value before returning it
*
* @param mixed $value The value of the field
* @param mixed $default The default value if there is no value set
* @param mixed $default_value The default value if there is no value set
* @param string $option_name The name of the option
* @param array $section_fields The setting values within the section
* @param string $section_name The name of the section the setting belongs to
*/
return apply_filters( 'graphql_get_setting_section_field_value', $value, $default, $option_name, $section_fields, $section_name );
return apply_filters( 'graphql_get_setting_section_field_value', $value, $default_value, $option_name, $section_fields, $section_name );
}

/**
Expand Down Expand Up @@ -838,12 +838,12 @@ function graphql_get_endpoint_url() {
if ( ! function_exists( 'array_key_first' ) ) {

/**
* @param array $array
* @param array $arr
*
* @return int|string|null
*/
function array_key_first( array $array ) {
foreach ( $array as $key => $value ) {
function array_key_first( array $arr ) {
foreach ( $arr as $key => $value ) {
return $key;
}
return null;
Expand All @@ -860,13 +860,13 @@ function array_key_first( array $array ) {
if ( ! function_exists( 'array_key_last' ) ) {

/**
* @param array $array
* @param array $arr
*
* @return int|string|null
*/
function array_key_last( array $array ) {
end( $array );
function array_key_last( array $arr ) {
end( $arr );

return key( $array );
return key( $arr );
}
}
2 changes: 1 addition & 1 deletion cli/wp-cli.php
View file
Open in desktop
Expand Up @@ -52,7 +52,7 @@ public function generate_static_schema( $args, $assoc_args ) {
*/
WP_CLI::line( 'Saving the Schema...' );

file_put_contents( $file_path, $printed ); // phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_read_file_put_contents
file_put_contents( $file_path, $printed ); // phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_operations_file_put_contents

/**
* All done!
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@
"appsero/client": "1.2.1"
},
"require-dev": {
"automattic/vipwpcs": "^2.2",
"automattic/vipwpcs": "^3.0",
"codeception/module-asserts": "^1.0",
"codeception/module-cli": "^1.0",
"codeception/module-db": "^1.0",
Expand Down