Merge pull request #2902 from justlevine/chore/handle-unused-variables

jasonbahl · web-flow · commit 67b5a6d19810 · 2023-08-15T08:23:49.000-06:00
chore: handle unused variables (phpcs)
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -158,4 +158,9 @@
 	<rule ref="SlevomatCodingStandard.PHP.TypeCast" />
 
 	<rule ref="SlevomatCodingStandard.Variables.DuplicateAssignmentToVariable" />
+	<rule ref="SlevomatCodingStandard.Variables.UnusedVariable" >
+		<properties>
+			<property name="ignoreUnusedValuesWhenOnlyKeysAreUsedInForeach" value="true" />
+		</properties>
+	</rule>
 </ruleset>
diff --git a/src/Admin/Settings/SettingsRegistry.php b/src/Admin/Settings/SettingsRegistry.php
@@ -448,7 +448,6 @@ public function callback_wysiwyg( array $args ) {
 	public function callback_file( array $args ) {
 		$value = esc_attr( $this->get_option( $args['id'], $args['section'], $args['std'] ) );
 		$size  = isset( $args['size'] ) && ! is_null( $args['size'] ) ? $args['size'] : 'regular';
-		$id    = $args['section'] . '[' . $args['id'] . ']';
 		$label = isset( $args['options']['button_label'] ) ? $args['options']['button_label'] : __( 'Choose File', 'wp-graphql' );
 
 		$html  = sprintf( '<input type="text" class="%1$s-text wpsa-url" id="%2$s[%3$s]" name="%2$s[%3$s]" value="%4$s">', $size, $args['section'], $args['id'], $value );
@@ -583,7 +582,7 @@ public function get_sanitize_callback( $slug = '' ) {
 		}
 
 		// Iterate over registered fields and see if we can find proper callback
-		foreach ( $this->settings_fields as $section => $options ) {
+		foreach ( $this->settings_fields as $options ) {
 			foreach ( $options as $option ) {
 				if ( $slug !== $option['name'] ) {
 					continue;
diff --git a/src/Data/NodeResolver.php b/src/Data/NodeResolver.php
@@ -532,7 +532,7 @@ public function parse_request( string $uri, $extra_query_vars = '' ) {
 		}
 
 		// Convert urldecoded spaces back into '+'.
-		foreach ( get_taxonomies( [ 'show_in_graphql' => true ], 'objects' ) as $taxonomy => $t ) {
+		foreach ( get_taxonomies( [ 'show_in_graphql' => true ], 'objects' ) as $t ) {
 			if ( $t->query_var && isset( $this->wp->query_vars[ $t->query_var ] ) ) {
 				$this->wp->query_vars[ $t->query_var ] = str_replace( ' ', '+', $this->wp->query_vars[ $t->query_var ] );
 			}
diff --git a/src/Model/Post.php b/src/Model/Post.php
@@ -549,7 +549,7 @@ protected function init() {
 						if ( empty( $registered_templates ) ) {
 							return $template;
 						}
-						$post_type     = $this->data->post_type;
+
 						$set_template  = get_post_meta( $this->data->ID, '_wp_page_template', true );
 						$template_name = get_page_template_slug( $this->data->ID );
 
diff --git a/src/Mutation/MediaItemCreate.php b/src/Mutation/MediaItemCreate.php
@@ -155,7 +155,7 @@ public static function mutate_and_get_payload() {
 			$sanitized_file_path = sanitize_file_name( $input['filePath'] );
 
 			// Check that the filetype is allowed
-			$check_file = wp_check_filetype( $uploaded_file_url );
+			$check_file = wp_check_filetype( $sanitized_file_path );
 
 			// if the file doesn't pass the check, throw an error
 			if ( ! $check_file['ext'] || ! $check_file['type'] || ! wp_http_validate_url( $uploaded_file_url ) ) {
diff --git a/src/Type/Enum/TimezoneEnum.php b/src/Type/Enum/TimezoneEnum.php
@@ -43,7 +43,7 @@ public static function register_type() {
 			load_textdomain( 'continents-cities', $mofile );
 			$mo_loaded = true;
 		}
-	
+
 		$zonen = [];
 		foreach ( timezone_identifiers_list() as $zone ) {
 			$zone = explode( '/', $zone );
@@ -72,18 +72,13 @@ public static function register_type() {
 		}
 		usort( $zonen, '_wp_timezone_choice_usort_callback' );
 
-		foreach ( $zonen as $key => $zone ) {
+		foreach ( $zonen as $zone ) {
 			// Build value in an array to join later
 			$value = [ $zone['continent'] ];
 			if ( empty( $zone['city'] ) ) {
 				// It's at the continent level (generally won't happen)
 				$display = $zone['t_continent'];
 			} else {
-				// It's inside a continent group
-				// Continent optgroup
-				if ( ! isset( $zonen[ $key - 1 ] ) || $zonen[ $key - 1 ]['continent'] !== $zone['continent'] ) {
-					$label = $zone['t_continent'];
-				}
 				// Add the city to the value
 				$value[] = $zone['city'];
 				$display = $zone['t_city'];
diff --git a/src/Type/InterfaceType/ContentTemplate.php b/src/Type/InterfaceType/ContentTemplate.php
@@ -47,7 +47,7 @@ public static function register_content_template_types() {
 		}
 
 		// Register each template to the schema
-		foreach ( $page_templates as $file => $name ) {
+		foreach ( $page_templates as $name ) {
 			$name          = ucwords( $name );
 			$replaced_name = preg_replace( '/[^\w]/', '', $name );
 
diff --git a/src/Type/ObjectType/MediaSize.php b/src/Type/ObjectType/MediaSize.php
@@ -42,11 +42,10 @@ public static function register_type() {
 						'type'        => 'Int',
 						'description' => __( 'The filesize of the resource', 'wp-graphql' ),
 						'resolve'     => static function ( $image, $args, $context, $info ) {
-							$src_url = null;
-
 							if ( ! empty( $image['ID'] ) && ! empty( $image['file'] ) ) {
 								$original_file = get_attached_file( absint( $image['ID'] ) );
 								$filesize_path = ! empty( $original_file ) ? path_join( dirname( $original_file ), $image['file'] ) : null;
+
 								return ! empty( $filesize_path ) ? filesize( $filesize_path ) : null;
 							}
 
diff --git a/src/Type/ObjectType/RootQuery.php b/src/Type/ObjectType/RootQuery.php
@@ -824,8 +824,8 @@ static function ( $post ) use ( $post_type_object ) {
 					),
 					'args'              => $post_by_args,
 					'resolve'           => static function ( $source, array $args, $context ) use ( $post_type_object ) {
-						$post_object = null;
-						$post_id     = 0;
+						$post_id = 0;
+
 						if ( ! empty( $args['id'] ) ) {
 							$id_components = Relay::fromGlobalId( $args['id'] );
 							if ( empty( $id_components['id'] ) || empty( $id_components['type'] ) ) {

Original file line number	Diff line number	Diff line change
`@@ -532,7 +532,7 @@ public function parse_request( string $uri, $extra_query_vars = '' ) {`
`532`	`532`	`}`
`533`	`533`
`534`	`534`	`// Convert urldecoded spaces back into '+'.`
`535`		`- foreach ( get_taxonomies( [ 'show_in_graphql' => true ], 'objects' ) as $taxonomy => $t ) {`
	`535`	`+ foreach ( get_taxonomies( [ 'show_in_graphql' => true ], 'objects' ) as $t ) {`
`536`	`536`	`if ( $t->query_var && isset( $this->wp->query_vars[ $t->query_var ] ) ) {`
`537`	`537`	`$this->wp->query_vars[ $t->query_var ] = str_replace( ' ', '+', $this->wp->query_vars[ $t->query_var ] );`
`538`	`538`	`}`
Original file line number	Diff line number	Diff line change
`@@ -549,7 +549,7 @@ protected function init() {`
`549`	`549`	`if ( empty( $registered_templates ) ) {`
`550`	`550`	`return $template;`
`551`	`551`	`}`
`552`		`- $post_type = $this->data->post_type;`
	`552`	`+`
`553`	`553`	`$set_template = get_post_meta( $this->data->ID, '_wp_page_template', true );`
`554`	`554`	`$template_name = get_page_template_slug( $this->data->ID );`
`555`	`555`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public static function register_content_template_types() {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`// Register each template to the schema`
`50`		`- foreach ( $page_templates as $file => $name ) {`
	`50`	`+ foreach ( $page_templates as $name ) {`
`51`	`51`	`$name = ucwords( $name );`
`52`	`52`	`$replaced_name = preg_replace( '/[^\w]/', '', $name );`
`53`	`53`