Merge branch 'develop' into uat

Author: Marco Pereirinha

css/gallery-block-rtl.css

@@ -49,6 +49,10 @@
 	align-items: center;
 }
 
+.wp-block-cloudinary-gallery .block-editor-media-placeholder .components-placeholder__label .dashicon {
+	margin-right: 8px;
+}
+
 /* stylelint-disable */
 .wp-block-cloudinary-gallery .block-editor-media-placeholder.is-appender .components-placeholder__label {
 	display: none;

css/gallery-block.css

@@ -25,3 +25,21 @@ function get_plugin_instance() {
 
 	return $cloudinary_plugin;
 }
+
+/**
+ * Get an instance of the CLI Class.
+ */
+function cloudinary_cli_instance() {
+	if ( class_exists( '\WPCOM_VIP_CLI_Command' ) ) {
+		return new CLI_VIP();
+	}
+
+	return new CLI();
+}
+
+if ( defined( 'WP_CLI' ) && WP_CLI ) {
+	$plugin_instance = get_plugin_instance();
+	$cli             = cloudinary_cli_instance();
+	$cli->setup_cloudinary( $plugin_instance );
+	\WP_CLI::add_command( 'cloudinary', $cli );
+}

css/src/gallery.scss

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-components/build-style/style.css', 'wp-data', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '5d10da56cc3f0e4a9cf2b2a3e7ee85d0');
+<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-components/build-style/style.css', 'wp-data', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '2695e94cb7e3a139b92189c7f3552ac8');

instance.php

@@ -248,6 +248,7 @@ if ( wp.media && window.CLDN ) {
 			 * Render callback for the content region in the `upload` mode.
 			 */
 			cloudinaryContent() {
+				this.$el.addClass( 'hide-toolbar' );
 				const state = this.state();
 				const view = new Cloudinary( {
 					controller: this,

js/cloudinary.js

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Cloudinary CLI for VIP.
+ *
+ * @package Cloudinary
+ */
+
+namespace Cloudinary;
+
+use Cloudinary\Traits\CLI_Trait;
+
+/**
+ * CLI VIP class.
+ *
+ * @since   2.5.1
+ */
+class CLI_VIP extends \WPCOM_VIP_CLI_Command {
+
+	use CLI_Trait;
+
+	/**
+	 * Output the Intro.
+	 *
+	 * @since   2.5.1
+	 * @link    http://patorjk.com/software/taag/#p=display&c=echo&f=Calvin%20S&t=Cloudinary%20CLI
+	 */
+	public function do_intro() {
+		static $intro;
+		if ( ! $intro ) {
+			\WP_CLI::log( '' );
+			\WP_CLI::log( '╔═╗┬  ┌─┐┬ ┬┌┬┐┬┌┐┌┌─┐┬─┐┬ ┬  ╔═╗╦  ╦  ╦  ╦╦╔═╗' );
+			\WP_CLI::log( '║  │  │ ││ │ ││││││├─┤├┬┘└┬┘  ║  ║  ║  ╚╗╔╝║╠═╝' );
+			\WP_CLI::log( '╚═╝┴─┘└─┘└─┘─┴┘┴┘└┘┴ ┴┴└─ ┴   ╚═╝╩═╝╩   ╚╝ ╩╩  ' );
+			$intro = true;
+		}
+	}
+}

js/gallery-block.asset.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Cloudinary CLI.
+ *
+ * @package Cloudinary
+ */
+
+namespace Cloudinary;
+
+use Cloudinary\Traits\CLI_Trait;
+
+/**
+ * CLI class.
+ *
+ * @since   2.5.1
+ */
+class CLI extends \WP_CLI_Command { // phpcs:ignore WordPressVIPMinimum.Classes.RestrictedExtendClasses.wp_cli
+
+	use CLI_Trait;
+
+	/**
+	 * Workaround to prevent memory leaks from growing variables
+	 */
+	protected function stop_the_insanity() {
+		global $wpdb, $wp_object_cache;
+		$wpdb->queries = array();
+		if ( is_object( $wp_object_cache ) ) {
+			$wp_object_cache->group_ops      = array();
+			$wp_object_cache->stats          = array();
+			$wp_object_cache->memcache_debug = array();
+			$wp_object_cache->cache          = array();
+			if ( method_exists( $wp_object_cache, '__remoteset' ) ) {
+				$wp_object_cache->__remoteset();
+			}
+		}
+	}
+}