address PR issues

Author: DavidCramer

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-media.php

@@ -1812,7 +1812,7 @@ public function setup() {
 	 * @return array
 	 */
 	public function match_file_name_with_cloudinary_source( $image_meta, $attachment_id ) {
-		if ( is_array( $image_meta ) && isset( $image_meta['file'] ) && $this->has_public_id( $attachment_id ) ) {
+		if ( is_array( $image_meta ) && ! empty( $image_meta['file'] ) && $this->has_public_id( $attachment_id ) ) {
 			$cld_file = 'v' . $this->get_cloudinary_version( $attachment_id ) . '/' . $this->get_cloudinary_id( $attachment_id );
 			if ( false === strpos( $image_meta['file'], $cld_file ) ) {
 				$image_meta['file'] = $cld_file;

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/media/class-filter.php

@@ -712,19 +712,15 @@ public function filter_image_block_pre_render( $block, $source_block ) {
 	public function init_rest_filters() {
 		// Gutenberg compatibility.
 		add_filter( 'rest_prepare_attachment', array( $this, 'filter_attachment_for_rest' ) );
-		$types  = get_post_types_by_support( 'editor' );
-		$filter = $this;
-		array_map(
-			function ( $type ) use ( $filter ) {
-				$post_type = get_post_type_object( $type );
-				// Check if this is a rest supported type.
-				if ( true === $post_type->show_in_rest ) {
-					// Add filter only to rest supported types.
-					add_filter( 'rest_prepare_' . $type, array( $filter, 'pre_filter_rest_content' ), 10, 3 );
-				}
-			},
-			$types
-		);
+		$types = get_post_types_by_support( 'editor' );
+		foreach ( $types as $type ) {
+			$post_type = get_post_type_object( $type );
+			// Check if this is a rest supported type.
+			if ( true === $post_type->show_in_rest ) {
+				// Add filter only to rest supported types.
+				add_filter( 'rest_prepare_' . $type, array( $this, 'pre_filter_rest_content' ), 10, 3 );
+			}
+		}
 	}
 
 	/**