Merge pull request #453 from Yoast/JRF/composer-update-yoastcs

Update to YoastCS 3.3.0

Author: jrfnl

admin-functions.php

@@ -142,7 +142,7 @@ function duplicate_post_plugin_upgrade() {
 			'new_draft'         => '1',
 			'clone'             => '1',
 			'rewrite_republish' => '1',
-		]
+		],
 	);
 	add_option( 'duplicate_post_show_link_in', $show_links_in_defaults );
 
@@ -228,7 +228,7 @@ function duplicate_post_show_update_notice() {
 	$title = sprintf(
 		/* translators: %s: Yoast Duplicate Post. */
 		esc_html__( 'You\'ve successfully installed %s!', 'duplicate-post' ),
-		'Yoast Duplicate Post'
+		'Yoast Duplicate Post',
 	);
 
 	$img_path = plugins_url( '/duplicate_post_yoast_icon-125x125.png', __FILE__ );
@@ -453,7 +453,7 @@ function duplicate_post_copy_attachments( $new_id, $post ) {
 			'numberposts' => -1,
 			'post_status' => 'any',
 			'post_parent' => $post->ID,
-		]
+		],
 	);
 	// Clone old attachments.
 	foreach ( $children as $child ) {
@@ -518,7 +518,7 @@ function duplicate_post_copy_children( $new_id, $post, $status = '' ) {
 			'numberposts' => -1,
 			'post_status' => 'any',
 			'post_parent' => $post->ID,
-		]
+		],
 	);
 
 	foreach ( $children as $child ) {
@@ -543,7 +543,7 @@ function duplicate_post_copy_comments( $new_id, $post ) {
 			'post_id' => $post->ID,
 			'order'   => 'ASC',
 			'orderby' => 'comment_date_gmt',
-		]
+		],
 	);
 
 	$old_id_to_new = [];
@@ -619,8 +619,8 @@ function duplicate_post_create_duplicate( $post, $status = '', $parent_id = '' )
 		wp_die(
 			esc_html(
 				__( 'Copy features for this post type are not enabled in options page', 'duplicate-post' ) . ': '
-				. $post->post_type
-			)
+				. $post->post_type,
+			),
 		);
 	}
 

common-functions.php

@@ -77,11 +77,8 @@ function duplicate_post_clone_post_link( $link = null, $before = '', $after = ''
 		return;
 	}
 
-	if ( $link === null ) {
-		$link = __( 'Copy to a new draft', 'duplicate-post' );
-	}
-
-	$link = '<a class="post-clone-link" href="' . esc_url( $url ) . '">' . esc_html( $link ) . '</a>';
+	$link ??= __( 'Copy to a new draft', 'duplicate-post' );
+	$link   = '<a class="post-clone-link" href="' . esc_url( $url ) . '">' . esc_html( $link ) . '</a>';
 
 	/**
 	 * Filter on the clone link HTML.

compat/wpml-functions.php

@@ -64,7 +64,7 @@ function duplicate_post_wpml_copy_translations( $post_id, $post, $status = '' )
 							'post_' . $translation->post_type,
 							$new_trid,
 							$code,
-							$current_language
+							$current_language,
 						);
 					}
 				}
@@ -112,7 +112,7 @@ function duplicate_wpml_string_packages() { // phpcs:ignore WordPress.NamingConv
 									$new_string->id,
 									$language,
 									$translated_string['value'],
-									$translated_string['status']
+									$translated_string['status'],
 								);
 							}
 						}

composer.json

@@ -29,7 +29,7 @@
 	},
 	"require-dev": {
 		"yoast/wp-test-utils": "^1.2.0",
-		"yoast/yoastcs": "^3.2.0"
+		"yoast/yoastcs": "^3.3.0"
 	},
 	"autoload": {
 		"classmap": [

config/composer/actions.php

@@ -120,7 +120,7 @@ private static function check_cs_for_changed_files( $compare ) {
 		$command    = \sprintf(
 			'composer check-cs-warnings -- %s %s',
 			\implode( ' ', \array_map( 'escapeshellarg', $php_files ) ),
-			$extra_args
+			$extra_args,
 		);
 		\system( $command, $exit_code );
 
@@ -196,7 +196,7 @@ private static function filter_files( array $files, string $extension ): array {
 			$files,
 			static function ( $file ) use ( $extension ) {
 				return \substr( $file, ( 0 - \strlen( $extension ) ) ) === $extension;
-			}
+			},
 		);
 	}
 }

duplicate-post.php

@@ -93,7 +93,7 @@ function duplicate_post_plugin_actions( $actions ) {
 			menu_page_url( 'duplicatepost', false ),
 			/* translators: Hidden accessibility text. */
 			'aria-label="' . __( 'Settings for Duplicate Post', 'duplicate-post' ) . '"',
-			esc_html__( 'Settings', 'duplicate-post' )
+			esc_html__( 'Settings', 'duplicate-post' ),
 		),
 	];
 

options.php

@@ -15,7 +15,7 @@
 $duplicate_post_options_page = new Options_Page(
 	new Options(),
 	new Options_Form_Generator( new Options_Inputs() ),
-	new Asset_Manager()
+	new Asset_Manager(),
 );
 
 $duplicate_post_options_page->register_hooks();

src/admin/options-form-generator.php

@@ -78,7 +78,7 @@ public function generate_options_input( array $options, $parent_option = '' ) {
 						$option,
 						$option_values['value'],
 						$id,
-						$this->is_checked( $option, $option_values, $parent_option )
+						$this->is_checked( $option, $option_values, $parent_option ),
 					);
 
 					$output .= \sprintf( '<label for="%s">%s</label>', $id, \esc_html( $option_values['label'] ) );
@@ -176,7 +176,7 @@ public function generate_taxonomy_exclusion_list() {
 						'checked' => \in_array( $taxonomy->name, $taxonomies_blacklist, true ),
 						'label'   => $taxonomy->labels->name . ' [' . $taxonomy->name . ']',
 					],
-				]
+				],
 			);
 			$output .= '</div>';
 		}
@@ -212,7 +212,7 @@ public function generate_roles_permission_list() {
 							'checked' => $role->has_cap( 'copy_posts' ),
 							'label'   => \translate_user_role( $display_name ),
 						],
-					]
+					],
 				);
 			}
 		}
@@ -246,7 +246,7 @@ public function generate_post_types_list() {
 						'checked' => $this->is_post_type_enabled( $post_type_object->name ),
 						'label'   => $post_type_object->labels->name,
 					],
-				]
+				],
 			);
 		}
 

src/admin/options-inputs.php

@@ -25,7 +25,7 @@ protected function input( $type, $name, $value, $id, $attributes = '' ) {
 			\esc_attr( $name ),
 			\esc_attr( $id ),
 			\esc_attr( $value ),
-			$attributes
+			$attributes,
 		);
 	}
 

src/admin/options-page.php

@@ -77,7 +77,7 @@ public function register_menu() {
 			\__( 'Duplicate Post', 'duplicate-post' ),
 			'manage_options',
 			'duplicatepost',
-			[ $this, 'generate_page' ]
+			[ $this, 'generate_page' ],
 		);
 
 		\add_action( $page_hook, [ $this, 'enqueue_assets' ] );