cloudinary · bruckercloud · Aug 23, 2023 · Jun 19, 2023 · Jun 19, 2023 · Jun 19, 2023
diff --git a/.version b/.version
@@ -1 +1 @@
-3.1.3
+3.1.4
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/languages/cloudinary.pot b/languages/cloudinary.pot
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cloudinary STABLETAG\n"
 "Report-Msgid-Bugs-To: https://github.com/cloudinary/cloudinary_wordpress\n"
-"POT-Creation-Date: 2023-06-15 08:49:55+00:00\n"
+"POT-Creation-Date: 2023-08-22 09:32:35+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -63,11 +63,11 @@ msgstr[1] ""
 msgid "No items found."
 msgstr ""
 
-#: php/cache/class-cache-point.php:958 php/class-assets.php:1142
+#: php/cache/class-cache-point.php:962 php/class-assets.php:1142
 msgid "Cloudinary Asset"
 msgstr ""
 
-#: php/cache/class-cache-point.php:959 php/class-assets.php:1143
+#: php/cache/class-cache-point.php:963 php/class-assets.php:1143
 msgid "Post type to represent a non-media library asset."
 msgstr ""
 
@@ -502,66 +502,66 @@ msgstr ""
 msgid "Unsynced"
 msgstr ""
 
-#: php/class-media.php:453
+#: php/class-media.php:455
 #. translators: variable is file size.
 msgid ""
 "File size exceeds the maximum of %s. This media asset will be served from "
 "WordPress."
 msgstr ""
 
-#: php/class-media.php:2033
+#: php/class-media.php:2035
 msgid "Import"
 msgstr ""
 
 #. Plugin Name of the plugin/theme
 msgid "Cloudinary"
 msgstr ""
 
-#: php/class-media.php:2389
+#: php/class-media.php:2391
 msgid "The delivery for this asset is disabled."
 msgstr ""
 
-#: php/class-media.php:2393
+#: php/class-media.php:2395
 msgid "Not syncable. This is an external media."
 msgstr ""
 
-#: php/class-media.php:2397
+#: php/class-media.php:2399
 msgid "This media is Fetch type."
 msgstr ""
 
-#: php/class-media.php:2401
+#: php/class-media.php:2403
 msgid "This media is Sprite type."
 msgstr ""
 
-#: php/class-media.php:2411
+#: php/class-media.php:2413
 msgid "Not Synced"
 msgstr ""
 
-#: php/class-media.php:2416
+#: php/class-media.php:2418
 msgid "Synced"
 msgstr ""
 
-#: php/class-media.php:3057
+#: php/class-media.php:3061
 msgid "No Cloudinary filters"
 msgstr ""
 
-#: php/class-media.php:3157
+#: php/class-media.php:3161
 msgid "Media Settings"
 msgstr ""
 
-#: php/class-media.php:3160
+#: php/class-media.php:3164
 msgid "Media Display"
 msgstr ""
 
-#: php/class-media.php:3164 php/media/class-global-transformations.php:620
+#: php/class-media.php:3168 php/media/class-global-transformations.php:620
 #: php/ui/component/class-asset-preview.php:73
 #: php/ui/component/class-plan-details.php:119
 #: php/ui/component/class-plan-status.php:128
 #: ui-definitions/settings-sidebar.php:36
 msgid "Transformations"
 msgstr ""
 
-#: php/class-media.php:3165
+#: php/class-media.php:3169
 msgid ""
 "Cloudinary allows you to easily transform your images on-the-fly to any "
 "required format, style and dimension, and also optimizes images for minimal "
@@ -570,12 +570,12 @@ msgid ""
 "transformation and delivery URLs."
 msgstr ""
 
-#: php/class-media.php:3170 ui-definitions/settings-image.php:164
+#: php/class-media.php:3174 ui-definitions/settings-image.php:164
 #: ui-definitions/settings-video.php:216
 msgid "See examples"
 msgstr ""
 
-#: php/class-plugin.php:755
+#: php/class-plugin.php:762
 msgid "Visit plugin site"
 msgstr ""
 
@@ -1100,26 +1100,26 @@ msgstr ""
 msgid "No posts"
 msgstr ""
 
-#: php/sync/class-sync-queue.php:560
+#: php/sync/class-sync-queue.php:561
 #. translators: variable is queue type.
 msgid "Stopping queue:  %s."
 msgstr ""
 
-#: php/sync/class-sync-queue.php:599
+#: php/sync/class-sync-queue.php:600
 #. translators: variable is queue type.
 msgid "Queue:  %s - not running."
 msgstr ""
 
-#: php/sync/class-sync-queue.php:651
+#: php/sync/class-sync-queue.php:652
 #. translators: variable is thread name.
 msgid "Starting thread %s."
 msgstr ""
 
-#: php/sync/class-sync-queue.php:905
+#: php/sync/class-sync-queue.php:906
 msgid "Resuming Maybe"
 msgstr ""
 
-#: php/sync/class-sync-queue.php:914
+#: php/sync/class-sync-queue.php:915
 #. translators: variable is thread name.
 msgid "Thread %s Stopped."
 msgstr ""

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
+	 */
+	public $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'],