Merge branch 'develop' into uat

Marco Pereirinha · Marco Pereirinha · commit 506f8e2ce35f · 2023-08-22T10:27:16.000+01:00
diff --git a/composer.json b/composer.json
@@ -8,9 +8,9 @@
   },
   "require-dev": {
     "wp-coding-standards/wpcs": "^2.3",
-    "automattic/vipwpcs": "^2.2",
+    "automattic/vipwpcs": "dev-develop",
     "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
-    "phpcompatibility/phpcompatibility-wp": "^2.1",
+    "phpcompatibility/phpcompatibility-wp": "dev-master",
     "phpcompatibility/php-compatibility": "dev-develop as 9.99.99"
   },
   "config": {
diff --git a/composer.lock b/composer.lock
diff --git a/package-lock.json b/package-lock.json
diff --git a/php/cache/class-cache-point.php b/php/cache/class-cache-point.php
@@ -869,9 +869,13 @@ public function query_cached_items( $urls ) {
 				foreach ( $indexes as $key ) {
 					$url = $urls[ $key ];
 
-					if ( ! isset( $meta[ self::META_KEYS['cached_urls'] ][ $url ] )
-						 || $url === $meta[ self::META_KEYS['cached_urls'] ][ $url ]
-							&& $meta[ self::META_KEYS['last_updated'] ] < time() - MINUTE_IN_SECONDS * 10 ) {
+					if (
+						! isset( $meta[ self::META_KEYS['cached_urls'] ][ $url ] )
+						|| (
+							$url === $meta[ self::META_KEYS['cached_urls'] ][ $url ]
+							&& $meta[ self::META_KEYS['last_updated'] ] < time() - MINUTE_IN_SECONDS * 10
+						)
+					) {
 						// Send to upload prep.
 						$this->prepare_for_sync( $post->ID );
 						$meta[ self::META_KEYS['cached_urls'] ][ $url ] = $url;
@@ -972,6 +976,6 @@ protected function register_post_type() {
 			'rewrite'             => false,
 			'capability_type'     => 'page',
 		);
-		$this->post_type = register_post_type( self::POST_TYPE_SLUG, $args );
+		$this->post_type = register_post_type( self::POST_TYPE_SLUG, $args ); // phpcs:ignore WordPress.NamingConventions.ValidPostTypeSlug.NotStringLiteral
 	}
 }
diff --git a/php/class-assets.php b/php/class-assets.php
@@ -1156,7 +1156,7 @@ protected function register_post_type() {
 			'rewrite'             => false,
 			'capability_type'     => 'page',
 		);
-		$this->post_type = register_post_type( self::POST_TYPE_SLUG, $args );
+		$this->post_type = register_post_type( self::POST_TYPE_SLUG, $args ); // phpcs:ignore WordPress.NamingConventions.ValidPostTypeSlug.NotStringLiteral
 	}
 
 	/**
diff --git a/php/class-media.php b/php/class-media.php
@@ -356,6 +356,7 @@ public function maybe_file_exist_in_url( $url ) {
 		if ( ! filter_var( $url, FILTER_VALIDATE_URL ) ) {
 			return false;
 		}
+		// phpcs:disable WordPress.WP.AlternativeFunctions
 		$ch = curl_init( $url );
 		curl_setopt( $ch, CURLOPT_NOBODY, true );
 		curl_exec( $ch );
@@ -368,6 +369,7 @@ public function maybe_file_exist_in_url( $url ) {
 		}
 
 		curl_close( $ch );
+		// phpcs:enable
 
 		return $status;
 	}
@@ -990,8 +992,8 @@ public function get_transformations( $attachment_id, $transformations = array(),
 	 */
 	public function get_crop_transformations( $attachment_id, $size ) {
 		static $transformations = array();
-		$size_dim = $size['width'] . 'x' . $size['height'];
-		$key      = $attachment_id . $size_dim;
+		$size_dim               = $size['width'] . 'x' . $size['height'];
+		$key                    = $attachment_id . $size_dim;
 		if ( empty( $transformations[ $key ] ) ) {
 
 			if ( empty( $size['transformation'] ) ) {
@@ -3033,13 +3035,15 @@ public function apply_media_library_filters( $query ) {
 			if ( SYNC::META_KEYS['unsynced'] === $request ) {
 				global $wpdb;
 				$wpdb->cld_table = Utils::get_relationship_table();
-				$result          = $wpdb->get_col( "SELECT post_id FROM $wpdb->cld_table WHERE public_id IS NULL" );
+				$result          = $wpdb->get_col( "SELECT post_id FROM $wpdb->cld_table WHERE public_id IS NULL" ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery,WordPress.DB.DirectDatabaseQuery.NoCaching
 
+				// phpcs:disable WordPressVIPMinimum.Hooks.PreGetPosts.PreGetPosts
 				if ( ! empty( $result ) ) {
 					$query->set( 'post__in', $result );
 				} else {
 					$query->set( 'post__in', array( 0 ) );
 				}
+				// phpcs:enable
 			}
 		}
 	}
diff --git a/php/class-plugin.php b/php/class-plugin.php
@@ -82,6 +82,13 @@ final class Plugin {
 	 */
 	public $dir_url;
 
+	/**
+	 * The plugin file.
+	 *
+	 * @var string
+	 */
+	protected $plugin_file;
+
 	/**
 	 * Directory in plugin containing autoloaded classes.
 	 *
@@ -190,7 +197,7 @@ private function get_settings_page_structure() {
 
 		foreach ( $parts as $slug => $part ) {
 			if ( file_exists( $this->dir_path . "ui-definitions/settings-{$slug}.php" ) ) {
-				$parts[ $slug ] = include $this->dir_path . "ui-definitions/settings-{$slug}.php";
+				$parts[ $slug ] = include $this->dir_path . "ui-definitions/settings-{$slug}.php"; // phpcs:ignore WordPressVIPMinimum.Files.IncludingFile.UsingVariable
 			}
 		}
 
diff --git a/php/class-report.php b/php/class-report.php
@@ -223,7 +223,7 @@ static function( &$row ) {
 			"SELECT * FROM {$wpdb->cld_table} WHERE post_id = %d;",
 			$post->ID
 		);
-		$relationship    = $wpdb->get_row( $prepare ); // phpcs:ignore WordPress.DB.PreparedSQL
+		$relationship    = $wpdb->get_row( $prepare ); // phpcs:ignore WordPress.DB.PreparedSQL,WordPress.DB.DirectDatabaseQuery.DirectQuery,WordPress.DB.DirectDatabaseQuery.NoCaching
 
 		ksort( $attachment );
 		ksort( $meta );
diff --git a/php/class-string-replace.php b/php/class-string-replace.php
@@ -168,7 +168,7 @@ public function init_debug( $template ) {
 		if ( defined( 'CLD_DEBUG' ) && true === CLD_DEBUG && ! Utils::get_sanitized_text( '_bypass' ) ) {
 			$this->context = 'view';
 			ob_start();
-			include $template;
+			include $template; // phpcs:ignore WordPressVIPMinimum.Files.IncludingFile.UsingVariable
 			$html = ob_get_clean();
 			echo $this->replace_strings( $html ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 			$template = $this->plugin->template_path . 'blank-template.php';
diff --git a/php/class-utils.php b/php/class-utils.php
@@ -500,7 +500,7 @@ public static function pathinfo( $path, $flags = 15 ) {
 		 *
 		 * @see wp-includes/formatting.php
 		 */
-		$path = str_replace( array( '%2F', '%5C' ), '/', urlencode( $path ) );
+		$path = str_replace( array( '%2F', '%5C' ), '/', urlencode( $path ) ); // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.urlencode_urlencode
 
 		$pathinfo = pathinfo( $path, $flags );
 
@@ -914,4 +914,28 @@ public static function get_registered_sizes( $attachment_id = null ) {
 		 */
 		return apply_filters( 'cloudinary_registered_sizes', $all_sizes );
 	}
+
+	/**
+	 * Get the attachment ID from the attachment URL.
+	 *
+	 * @param string $url The attachment URL.
+	 *
+	 * @return int
+	 */
+	public static function attachment_url_to_postid( $url ) {
+		$key = "postid_{$url}";
+
+		if ( function_exists( 'wpcom_vip_attachment_url_to_postid' ) ) {
+			$attachment_id = wpcom_vip_attachment_url_to_postid( $url );
+		} else {
+			$attachment_id = wp_cache_get( $key, 'cloudinary' );
+		}
+
+		if ( empty( $attachment_id ) ) {
+			$attachment_id = attachment_url_to_postid( $url ); // phpcs:ignore WordPressVIPMinimum.Functions.RestrictedFunctions.attachment_url_to_postid_attachment_url_to_postid
+			wp_cache_set( $key, $attachment_id, 'cloudinary' );
+		}
+
+		return $attachment_id;
+	}
 }
diff --git a/php/connect/class-api.php b/php/connect/class-api.php
@@ -804,7 +804,7 @@ protected static function get_hostname( $upload_prefix ) {
 		$hostname = $upload_prefix;
 
 		if ( filter_var( $upload_prefix, FILTER_VALIDATE_URL ) ) {
-			$hostname = parse_url( $upload_prefix, PHP_URL_HOST );
+			$hostname = wp_parse_url( $upload_prefix, PHP_URL_HOST );
 		}
 
 		return $hostname;
diff --git a/php/media/class-filter.php b/php/media/class-filter.php
@@ -572,7 +572,7 @@ public function filter_video_embeds( $html, $id, $attachment ) {
 	public function pre_filter_rest_content( $response, $post, $request ) {
 		$context = $request->get_param( 'context' );
 		if ( 'edit' === $context ) {
-			$data                   = $response->get_data();
+			$data = $response->get_data();
 			// Handle meta if missing due to custom-fields not being supported.
 			if ( ! isset( $data['meta'] ) ) {
 				$data['meta'] = $request->get_param( 'meta' );
diff --git a/php/media/class-gallery.php b/php/media/class-gallery.php
@@ -212,7 +212,7 @@ public function enqueue_admin_scripts() {
 	 * @return array
 	 */
 	private function get_asset() {
-		$asset = require $this->plugin->dir_path . 'js/gallery.asset.php';
+		$asset = require $this->plugin->dir_path . 'js/gallery.asset.php'; // phpcs:ignore WordPressVIPMinimum.Files.IncludingFile.UsingVariable
 
 		$asset['dependencies'] = array_filter(
 			$asset['dependencies'],
diff --git a/php/media/class-video.php b/php/media/class-video.php
@@ -145,7 +145,7 @@ public function filter_video_shortcode( $html, $attr ) {
 			);
 			foreach ( $supported_formats as $format ) {
 				if ( ! empty( $attr[ $format ] ) ) {
-					$attr['id'] = attachment_url_to_postid( $attr[ $format ] );
+					$attr['id'] = Utils::attachment_url_to_postid( $attr[ $format ] );
 					break;
 				}
 			}
@@ -279,8 +279,8 @@ public function filter_video_block_pre_render( $block, $source_block ) {
 						if ( ! empty( $attributes['poster'] ) ) {
 							// Maybe local URL.
 							if ( ! $this->media->is_cloudinary_url( $attributes['poster'] ) ) {
-								$post_id = attachment_url_to_postid( $attributes['poster'] );
-								$url = $this->media->cloudinary_url( $post_id );
+								$post_id = Utils::attachment_url_to_postid( $attributes['poster'] );
+								$url     = $this->media->cloudinary_url( $post_id );
 								if ( $url ) {
 									$content = str_replace( $attributes['poster'], $url, $content );
 								}
@@ -367,7 +367,7 @@ protected function build_video_embed( $attachment_id, $attributes = array(), $ov
 
 			// Maybe poster is a local URL.
 			if ( empty( $poster_id ) ) {
-				$post_id   = attachment_url_to_postid( $attributes['poster'] );
+				$post_id   = Utils::attachment_url_to_postid( $attributes['poster'] );
 				$poster_id = $this->media->get_public_id( $post_id );
 			}
 
diff --git a/php/relate/class-relationship.php b/php/relate/class-relationship.php
@@ -216,7 +216,7 @@ public static function get_ids_by_public_id( $public_id ) {
 		global $wpdb;
 
 		$table_name = Utils::get_relationship_table();
-		$ids        = $wpdb->get_col( $wpdb->prepare( "SELECT post_id FROM {$table_name} WHERE public_id = %s", $public_id ) ); // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+		$ids        = $wpdb->get_col( $wpdb->prepare( "SELECT post_id FROM {$table_name} WHERE public_id = %s", $public_id ) ); // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared,WordPress.DB.DirectDatabaseQuery.DirectQuery,WordPress.DB.DirectDatabaseQuery.NoCaching
 
 		return array_map( 'intval', $ids );
 	}
diff --git a/php/sync/class-download-sync.php b/php/sync/class-download-sync.php
@@ -224,7 +224,7 @@ public function import_asset( $attachment_id, $file_path, $transformations = nul
 			$http_class = ABSPATH . WPINC . '/class-wp-http.php';
 		}
 		if ( ! class_exists( 'WP_Http' ) ) {
-			require_once $http_class;
+			require_once $http_class; // phpcs:ignore WordPressVIPMinimum.Files.IncludingFile.UsingVariable
 		}
 		require_once ABSPATH . 'wp-admin/includes/file.php';
 		require_once ABSPATH . 'wp-admin/includes/image.php';
diff --git a/php/sync/class-sync-queue.php b/php/sync/class-sync-queue.php
@@ -507,6 +507,7 @@ public function build_queue() {
 		} while ( $query->have_posts() );
 
 		$threads          = $this->add_to_queue( $ids );
+		$queue            = array();
 		$queue['total']   = array_sum( $threads );
 		$queue['threads'] = array_keys( $threads );
 		$queue['started'] = current_time( 'timestamp' ); // phpcs:ignore WordPress.DateTime.CurrentTimeTimestamp.Requested
@@ -611,7 +612,7 @@ public function start_queue( $type = 'queue' ) {
 	 * @return bool
 	 */
 	public function is_autosync_thread( $thread ) {
-		return in_array( $thread, $this->autosync_threads );
+		return in_array( $thread, $this->autosync_threads, true );
 	}
 
 	/**
@@ -828,17 +829,17 @@ public function get_threads( $type = 'queue' ) {
 	 */
 	public function add_to_queue( array $attachment_ids, $type = 'queue' ) {
 
-		$been_synced = array_filter( $attachment_ids, array( $this->sync, 'been_synced' ) );
-		$new_items   = array_diff( $attachment_ids, $been_synced );
-		$threads     = $this->get_threads( $type );
-		$new_thread  = array_shift( $threads );
+		$been_synced    = array_filter( $attachment_ids, array( $this->sync, 'been_synced' ) );
+		$new_items      = array_diff( $attachment_ids, $been_synced );
+		$threads        = $this->get_threads( $type );
+		$new_thread     = array_shift( $threads );
+		$active_threads = array();
 		if ( ! empty( $new_items ) ) {
 			$this->add_to_thread_queue( $new_thread, $new_items );
 			$active_threads[ $new_thread ] = count( $new_items );
 		}
 
 		$attachment_ids = $been_synced;
-		$active_threads = array();
 		if ( ! empty( $attachment_ids ) ) {
 			$chunk_size = ceil( count( $attachment_ids ) / count( $threads ) );
 			$chunks     = array_chunk( $attachment_ids, $chunk_size );
diff --git a/php/traits/trait-cli.php b/php/traits/trait-cli.php
@@ -466,11 +466,12 @@ protected function maybe_do_export( $unsynced_attachments, $errored_attachments
 	 * @return void
 	 */
 	protected function export_csv( $data, $type ) {
-		$filename = sanitize_file_name( 'cloudinary-' . $type . '-' . time() . '.csv' );
-		$fp       = fopen( $filename, 'wb+' );
+		$upload   = wp_get_upload_dir();
+		$filename = trailingslashit( $upload['path'] ) . sanitize_file_name( 'cloudinary-' . $type . '-' . time() . '.csv' );
+		$fp       = fopen( $filename, 'wb+' ); // phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_read_fopen
 
 		foreach ( $data as $fields ) {
-			fputcsv( $fp, $fields );
+			fputcsv( $fp, $fields ); // phpcs:ignore WordPressVIPMinimum.Functions.RestrictedFunctions.file_ops_fputcsv
 		}
 
 		fclose( $fp );
diff --git a/php/ui/component/class-info-box.php b/php/ui/component/class-info-box.php
@@ -68,7 +68,7 @@ protected function div( $struct ) {
 	 */
 	protected function wrap( $struct ) {
 		$struct = parent::wrap( $struct );
-		unset( $struct['attributes']['class'][ array_search( 'has-heading', $struct['attributes']['class'] ) ] );
+		unset( $struct['attributes']['class'][ array_search( 'has-heading', $struct['attributes']['class'], true ) ] );
 
 		return $struct;
 	}
diff --git a/php/ui/component/class-notice.php b/php/ui/component/class-notice.php
@@ -58,7 +58,7 @@ protected function wrap( $struct ) {
 	 * @return array
 	 */
 	protected function icon( $struct ) {
-		$struct['element'] = 'span';
+		$struct['element']             = 'span';
 		$struct['attributes']['class'] = array( 'cld-ui-icon' );
 		if ( $this->setting->has_param( 'icon' ) ) {
 			$struct['attributes']['class'][] = $this->setting->get_param( 'icon' );
diff --git a/php/ui/component/class-table.php b/php/ui/component/class-table.php
@@ -129,8 +129,8 @@ protected function build_body() {
 	 */
 	protected function body_row( $slug, $row ) {
 		$next_colspan = 1;
-
-		$columns = array();
+		$columns      = array();
+		$previous     = null;
 		foreach ( $this->columns as $column ) {
 
 			$col_slug                     = $slug . '_' . $column;
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -15,6 +15,7 @@
 	<arg name="extensions" value="php" />
 	<arg name="colors" />
 	<arg value="s" /><!-- Show sniff codes in all reports. -->
+	<arg name="severity" value="3" /><!-- Match WPVIP requirements. -->
 
 	<!-- Includes WordPress-Core, WordPress-Docs and WordPress-Extra rulesets. -->
 	<rule ref="WordPress" />
diff --git a/ui-definitions/components/wizard.php b/ui-definitions/components/wizard.php
@@ -152,7 +152,7 @@
 						<span class="spinner"></span>
 					</span>
 				</div>
-				<?php require $cloudinary->dir_path . 'php/templates/connection-string.php'; ?>
+				<?php require $cloudinary->dir_path . 'php/templates/connection-string.php'; // phpcs:ignore WordPressVIPMinimum.Files.IncludingFile.UsingVariable ?>
 			</div>
 		</div>
 		<div class="cld-wizard-content cld-wizard-optimize hidden" id="tab-3">
diff --git a/ui-definitions/settings-image.php b/ui-definitions/settings-image.php
@@ -150,7 +150,7 @@
 						'type'           => 'text',
 						'slug'           => 'image_freeform',
 						'title'          => __( 'Additional image transformations', 'cloudinary' ),
-						'default'       => '',
+						'default'        => '',
 						'tooltip_text'   => sprintf(
 						// translators: The link to transformation reference.
 							__(
diff --git a/ui-definitions/settings-pages.php b/ui-definitions/settings-pages.php
diff --git a/ui-definitions/settings-video.php b/ui-definitions/settings-video.php

Original file line number	Diff line number	Diff line change
`@@ -1156,7 +1156,7 @@ protected function register_post_type() {`
`1156`	`1156`	`'rewrite' => false,`
`1157`	`1157`	`'capability_type' => 'page',`
`1158`	`1158`	`);`
`1159`		`- $this->post_type = register_post_type( self::POST_TYPE_SLUG, $args );`
	`1159`	`+ $this->post_type = register_post_type( self::POST_TYPE_SLUG, $args ); // phpcs:ignore WordPress.NamingConventions.ValidPostTypeSlug.NotStringLiteral`
`1160`	`1160`	`}`
`1161`	`1161`
`1162`	`1162`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -356,6 +356,7 @@ public function maybe_file_exist_in_url( $url ) {`
`356`	`356`	`if ( ! filter_var( $url, FILTER_VALIDATE_URL ) ) {`
`357`	`357`	`return false;`
`358`	`358`	`}`
	`359`	`+ // phpcs:disable WordPress.WP.AlternativeFunctions`
`359`	`360`	`$ch = curl_init( $url );`
`360`	`361`	`curl_setopt( $ch, CURLOPT_NOBODY, true );`
`361`	`362`	`curl_exec( $ch );`
`@@ -368,6 +369,7 @@ public function maybe_file_exist_in_url( $url ) {`
`368`	`369`	`}`
`369`	`370`
`370`	`371`	`curl_close( $ch );`
	`372`	`+ // phpcs:enable`
`371`	`373`
`372`	`374`	`return $status;`
`373`	`375`	`}`
`@@ -990,8 +992,8 @@ public function get_transformations( $attachment_id, $transformations = array(),`
`990`	`992`	`*/`
`991`	`993`	`public function get_crop_transformations( $attachment_id, $size ) {`
`992`	`994`	`static $transformations = array();`
`993`		`- $size_dim = $size['width'] . 'x' . $size['height'];`
`994`		`- $key = $attachment_id . $size_dim;`
	`995`	`+ $size_dim = $size['width'] . 'x' . $size['height'];`
	`996`	`+ $key = $attachment_id . $size_dim;`
`995`	`997`	`if ( empty( $transformations[ $key ] ) ) {`
`996`	`998`
`997`	`999`	`if ( empty( $size['transformation'] ) ) {`
`@@ -3033,13 +3035,15 @@ public function apply_media_library_filters( $query ) {`
`3033`	`3035`	`if ( SYNC::META_KEYS['unsynced'] === $request ) {`
`3034`	`3036`	`global $wpdb;`
`3035`	`3037`	`$wpdb->cld_table = Utils::get_relationship_table();`
`3036`		`- $result = $wpdb->get_col( "SELECT post_id FROM $wpdb->cld_table WHERE public_id IS NULL" );`
	`3038`	`+ $result = $wpdb->get_col( "SELECT post_id FROM $wpdb->cld_table WHERE public_id IS NULL" ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery,WordPress.DB.DirectDatabaseQuery.NoCaching`
`3037`	`3039`
	`3040`	`+ // phpcs:disable WordPressVIPMinimum.Hooks.PreGetPosts.PreGetPosts`
`3038`	`3041`	`if ( ! empty( $result ) ) {`
`3039`	`3042`	`$query->set( 'post__in', $result );`
`3040`	`3043`	`} else {`
`3041`	`3044`	`$query->set( 'post__in', array( 0 ) );`
`3042`	`3045`	`}`
	`3046`	`+ // phpcs:enable`
`3043`	`3047`	`}`
`3044`	`3048`	`}`
`3045`	`3049`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,13 @@ final class Plugin {`
`82`	`82`	`*/`
`83`	`83`	`public $dir_url;`
`84`	`84`
	`85`	`+ /**`
	`86`	`+ * The plugin file.`
	`87`	`+ *`
	`88`	`+ * @var string`
	`89`	`+ */`
	`90`	`+ protected $plugin_file;`
	`91`	`+`
`85`	`92`	`/**`
`86`	`93`	`* Directory in plugin containing autoloaded classes.`
`87`	`94`	`*`
`@@ -190,7 +197,7 @@ private function get_settings_page_structure() {`
`190`	`197`
`191`	`198`	`foreach ( $parts as $slug => $part ) {`
`192`	`199`	`if ( file_exists( $this->dir_path . "ui-definitions/settings-{$slug}.php" ) ) {`
`193`		`- $parts[ $slug ] = include $this->dir_path . "ui-definitions/settings-{$slug}.php";`
	`200`	`+ $parts[ $slug ] = include $this->dir_path . "ui-definitions/settings-{$slug}.php"; // phpcs:ignore WordPressVIPMinimum.Files.IncludingFile.UsingVariable`
`194`	`201`	`}`
`195`	`202`	`}`
`196`	`203`