Merge branch 'develop' into feature/APP-704-add-base

elementor · Nov 5, 2024 · c9c7a4f · c9c7a4f
2 parents 96fec7c + ae23a19
commit c9c7a4f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/.github/scripts/update-version-in-files.js b/.github/scripts/update-version-in-files.js
@@ -1,6 +1,8 @@
 'use strict';
 
 const fs = require( "fs" );
+const MAIN_FILE_NAME = 'pojo-accessibility.php';
+const VERSION_CONSTANT = 'EA11Y_VERSION';
 
 const { VERSION } = process.env;
  if ( ! VERSION ) {
@@ -39,17 +41,17 @@ const run = async () => {
 			]
 		);
 
-		// update version in image-optimization.php
-		await replaceInFileWithArray( './image-optimization.php',
+		// update version in MAIN_FILE_NAME
+		await replaceInFileWithArray( `./${MAIN_FILE_NAME}`,
 			[
 				{
 					from:  /\* Version: (.*)/m,
 					to: `* Version: ${ VERSION }`,
 				},
 				{
-					from:  /define\( \'IMAGE_OPTIMIZER_VERSION\', \'(.*)\' \)\;/m,
-					to: `define( 'IMAGE_OPTIMIZER_VERSION', '${ VERSION }' );`,
-				},
+					from:  new RegExp(`define\\( '${VERSION_CONSTANT}', '(.*)' \\);`, 'm' ),
+					to: `define( '${VERSION_CONSTANT}', '${VERSION}' );`,
+				}
 			]
 		);
 

diff --git a/classes/logger.php b/classes/logger.php
@@ -19,9 +19,9 @@ private static function log( string $log_level, $message ): void {
 		$function = $backtrace[2]['function'];
 
 		if ( $class ) {
-			$message = '[Site Mailer]: ' . $log_level . ' in ' . "$class$type$function()" . ': ' . $message;
+			$message = '[EA11Y]: ' . $log_level . ' in ' . "$class$type$function()" . ': ' . $message;
 		} else {
-			$message = '[Site Mailer]: ' . $log_level . ' in ' . "$function()" . ': ' . $message;
+			$message = '[EA11Y]: ' . $log_level . ' in ' . "$function()" . ': ' . $message;
 		}
 
 		error_log( $message ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_error_log

diff --git a/classes/utils/assets.php b/classes/utils/assets.php
@@ -2,6 +2,10 @@
 
 namespace EA11y\Classes\Utils;
 
+use const EA11Y_ASSETS_PATH;
+use const EA11Y_ASSETS_URL;
+use const EA11Y_VERSION;
+
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }

diff --git a/ruleset.xml b/ruleset.xml
@@ -4,7 +4,7 @@
 
 	<arg name="parallel" value="8" />
 
-	<config name="text_domain" value="site-mailer" />
+	<config name="text_domain" value="pojo-accessibility" />
 
 	<exclude-pattern>vendor/</exclude-pattern>
 	<exclude-pattern>tmp/</exclude-pattern>