Refactor to use closure pattern for improved readability

Co-authored-by: swissspidy <841956+swissspidy@users.noreply.github.com>

Author: Copilot

src/EvalFile_Command.php

@@ -58,6 +58,10 @@ public function __invoke( $args, $assoc_args ) {
 				WP_CLI::error( '"-" and "--use-include" parameters cannot be used at the same time' );
 		}
 
+		$execute_closure = function () use ( $file, $args, $use_include ) {
+			self::execute_eval( $file, $args, $use_include );
+		};
+
 		$hook           = Utils\get_flag_value( $assoc_args, 'hook' );
 		$skip_wordpress = Utils\get_flag_value( $assoc_args, 'skip-wordpress' );
 
@@ -66,20 +70,15 @@ public function __invoke( $args, $assoc_args ) {
 		}
 
 		if ( $hook ) {
-			WP_CLI::add_wp_hook(
-				$hook,
-				function () use ( $file, $args, $use_include ) {
-					self::execute_eval( $file, $args, $use_include );
-				}
-			);
+			WP_CLI::add_wp_hook( $hook, $execute_closure );
 		}
 
 		if ( null === $skip_wordpress ) {
 			WP_CLI::get_runner()->load_wordpress();
 		}
 
 		if ( ! $hook ) {
-			self::execute_eval( $file, $args, $use_include );
+			$execute_closure();
 		}
 	}
 

src/Eval_Command.php

@@ -39,6 +39,10 @@ class Eval_Command extends WP_CLI_Command {
 	 */
 	public function __invoke( $args, $assoc_args ) {
 
+		$execute_closure = function () use ( $args ) {
+			eval( $args[0] );
+		};
+
 		$hook           = Utils\get_flag_value( $assoc_args, 'hook' );
 		$skip_wordpress = Utils\get_flag_value( $assoc_args, 'skip-wordpress' );
 
@@ -47,21 +51,15 @@ public function __invoke( $args, $assoc_args ) {
 		}
 
 		if ( $hook ) {
-			$code = $args[0];
-			WP_CLI::add_wp_hook(
-				$hook,
-				function () use ( $code ) {
-					eval( $code );
-				}
-			);
+			WP_CLI::add_wp_hook( $hook, $execute_closure );
 		}
 
 		if ( null === $skip_wordpress ) {
 			WP_CLI::get_runner()->load_wordpress();
 		}
 
 		if ( ! $hook ) {
-			eval( $args[0] );
+			$execute_closure();
 		}
 	}
 }