fix method to read asseets.json file index & fix default img

Author: lphoumpakka

inc/Services/Assets.php

@@ -20,6 +20,11 @@ class Assets implements Service {
 	 */
 	private $assets_tools;
 
+	/**
+	 * @var array $assets_json_index
+	 */
+	protected $assets_json_index;
+
 	/**
 	 * @param Service_Container $container
 	 */
@@ -126,32 +131,23 @@ public function get_min_file( string $type ): string {
 			return '';
 		}
 
-		if ( ! file_exists( \get_theme_file_path( '/dist/assets.json' ) ) ) {
-			return '';
-		}
-
-		$json   = file_get_contents( \get_theme_file_path( '/dist/assets.json' ) ); //phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents
-		$assets = json_decode( $json, true );
-
-		if ( empty( $assets ) || JSON_ERROR_NONE !== json_last_error() ) {
-			return '';
-		}
+		$assets = $this->get_assets_json_index_file();
 
 		switch ( $type ) {
 			case 'css':
-				$file = $assets['app.css'];
+				$file = $assets['app.css'] ?? '';
 				break;
 			case 'editor.css':
-				$file = $assets['editor.css'];
+				$file = $assets['editor.css'] ?? '';
 				break;
 			case 'login':
-				$file = $assets['login.css'];
+				$file = $assets['login.css'] ?? '';
 				break;
 			case 'editor.js':
-				$file = $assets['editor.js'];
+				$file = $assets['editor.js'] ?? '';
 				break;
 			case 'js':
-				$file = $assets['app.js'];
+				$file = $assets['app.js'] ?? '';
 				break;
 			default:
 				$file = null;
@@ -170,6 +166,36 @@ public function get_min_file( string $type ): string {
 		return $file;
 	}
 
+	/**
+	 * Read and get assets json index only once
+	 *
+	 * @return array
+	 *
+	 * @author Léonard Phoumpakka
+	 */
+	protected function get_assets_json_index_file(): array {
+		if ( isset( $this->assets_json_index ) ) {
+			return $this->assets_json_index;
+		}
+
+		$this->assets_json_index = [];
+
+		if ( ! file_exists( \get_theme_file_path( '/dist/assets.json' ) ) ) {
+			return $this->assets_json_index;
+		}
+
+		$json   = file_get_contents( \get_theme_file_path( '/dist/assets.json' ) ); //phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents
+		$assets = json_decode( $json, true );
+
+		if ( empty( $assets ) || JSON_ERROR_NONE !== json_last_error() ) {
+			return $this->assets_json_index;
+		}
+
+		$this->assets_json_index = $assets;
+
+		return $this->assets_json_index;
+	}
+
 	/**
 	 * Retrieve data for a compiled asset file.
 	 *

inc/Services/Theme.php

@@ -18,8 +18,14 @@ public function register( Service_Container $container ): void {}
 	 */
 	public function boot( Service_Container $container ): void {
 		$this->after_setup_theme();
-		add_filter( 'ari_responsive_image_default_img_path', [ $this, 'set_ari_responsive_image_default_img_path' ] );
-		add_filter( 'ari_responsive_image_default_img_name', [ $this, 'set_ari_responsive_image_default_img_name' ] );
+		/**
+		 * @psalm-suppress PossiblyInvalidMethodCall
+		 * @psalm-suppress UndefinedInterfaceMethod
+		 */
+		if ( Framework::get_container()->get_service( 'assets' )->is_minified() ) {
+			add_filter( 'ari_responsive_image_default_img_path', [ $this, 'set_ari_responsive_image_default_img_path' ] );
+			add_filter( 'ari_responsive_image_default_img_name', [ $this, 'set_ari_responsive_image_default_img_name' ] );
+		}
 	}
 
 	/**
@@ -86,14 +92,6 @@ private function i18n(): void {
 	 *
 	 */
 	public function set_ari_responsive_image_default_img_path( string $attr ): string {
-		/**
-		 * @psalm-suppress PossiblyInvalidMethodCall
-		 * @psalm-suppress UndefinedInterfaceMethod
-		 */
-		if ( ! Framework::get_container()->get_service( 'assets' )->is_minified() ) {
-			return $attr;
-		}
-
 		return '/dist/';
 	}
 
@@ -106,15 +104,7 @@ public function set_ari_responsive_image_default_img_path( string $attr ): strin
 	 *
 	 */
 	public function set_ari_responsive_image_default_img_name( string $default_img ): string {
-		/**
-		 * @psalm-suppress PossiblyInvalidMethodCall
-		 * @psalm-suppress UndefinedInterfaceMethod
-		 */
-		if ( ! Framework::get_container()->get_service( 'assets' )->is_minified() ) {
-			return $default_img;
-		}
-
-		return $this->get_min_image( $default_img );
+		return $this->get_min_default_image( $default_img );
 	}
 
 	/**
@@ -124,24 +114,9 @@ public function set_ari_responsive_image_default_img_name( string $default_img )
 	 *
 	 * @return string
 	 *
+	 * @author Léonard Phoumpakka
 	 */
-	protected function get_min_image( string $original_image ): string {
-
-		if ( empty( $original_image ) ) {
-			return $original_image;
-		}
-
-		if ( ! file_exists( \get_theme_file_path( '/dist/assets.json' ) ) ) {
-			return $original_image;
-		}
-
-		$json   = file_get_contents( \get_theme_file_path( '/dist/assets.json' ) ); //phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents
-		$assets = json_decode( $json, true );
-
-		if ( empty( $assets ) || JSON_ERROR_NONE !== json_last_error() ) {
-			return $original_image;
-		}
-
-		return $assets[ 'assets/' . $original_image ] ?: $original_image;
+	public function get_min_default_image( string $original_image ): string {
+		return Framework::get_container()->get_service( 'assets' )->get_min_file( 'assets/' . $original_image );
 	}
 }