From e4a46658ae4631c97b7794640556056e16d97f5c Mon Sep 17 00:00:00 2001
From: Tom Wiesing <tkw01536@gmail.com>
Date: Mon, 16 Jan 2023 13:48:10 +0100
Subject: [PATCH] internal/phpx: Decrease server code size

---
 internal/phpx/server.go  |  5 ++++-
 internal/phpx/server.php | 43 ++++++++++++++++++++--------------------
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/internal/phpx/server.go b/internal/phpx/server.go
index f7bebb7..dd4f3da 100644
--- a/internal/phpx/server.go
+++ b/internal/phpx/server.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"io"
 	"os"
+	"regexp"
 	"strings"
 	"sync"
 
@@ -233,6 +234,8 @@ var serverPHP string
 
 // pre-process the server.php code to make it shorter
 func init() {
+	minifier := regexp.MustCompile(`\s*([=)(.,{}])\s*`)
+
 	// remove the first '<?php' line
 	lines := strings.Split(serverPHP, "\n")[1:]
 	for i, line := range lines {
@@ -244,5 +247,5 @@ func init() {
 		return !strings.HasPrefix(line, "//")
 	})
 
-	serverPHP = strings.Join(lines, "")
+	serverPHP = minifier.ReplaceAllString(strings.Join(lines, ""), "$1")
 }
diff --git a/internal/phpx/server.php b/internal/phpx/server.php
index af8f2f9..ef97454 100644
--- a/internal/phpx/server.php
+++ b/internal/phpx/server.php
@@ -4,43 +4,44 @@
 // It is passed as a *command line literal * directly to 'drush:script'.
 //
 // As such it is preprocessed and shortened.
+// This preprocessing is script-specific, and any changes in here might break that optimization.
 // It should only contain comments at the beginning of each line, and only starting with '//'.
 // See server.go.
 
+// define a json_encode alias, this saves a single character!
+// (we also reuse it in the error string)
+$E = 'json_encode';
+
 // prevent STDIN from being buffered
 stream_set_read_buffer(STDIN,0);
 
-// stop outputting errors when executing
-ob_start(null,0,PHP_OUTPUT_HANDLER_CLEANABLE);
+while(1) {
+	// stop outputting errors when executing
+	ob_start(null,0,PHP_OUTPUT_HANDLER_CLEANABLE);
 
-
-while(1){
 	// read the next line to get an end-of-line marker
-	$marker = fgets(STDIN);
-	if (!$marker) break;
+	$m = fgets(STDIN) or exit(0);
 
 	// accumulate the buffer until the marker is reached
 	// bail out if there is an unexpected end of input
-	$buffer = "";
-	while(1) {
-		$line = fgets(STDIN);
-		if (!$line) break 2;
-		if ($line === $marker) break;
-		$buffer .= $line . "\n";
+	for($b = $l = ""; $l !== $m;) {
+		$b .= $l;
+		$l = fgets(STDIN) or exit(1);
 	}
 
-    // execute it
-	try{
-		$json = json_encode([eval($buffer),""]);
-	}catch(Throwable $t){
-		$json = json_encode([null,(string)$t]);
+	// execute the code, and json_encode it
+	try {
+		$j = $E([eval($b),""]);
+	} catch(Throwable $t) {
+		$j = $E([null,(string)$t]);
 	}
-	if($json===false) {
-		$json = '[null,"Error encoding result"]';
+
+	// if something went wrong, return an error.
+	if($j === false) {
+		$j = '[null,"' . $E . ' Error"]';
 	}
 
     // and write out the result
 	ob_end_clean();
-	fwrite(STDOUT,"$json\n");
-    ob_start(null,0,PHP_OUTPUT_HANDLER_CLEANABLE);
+	fwrite(STDOUT,"$j\n");
 }
\ No newline at end of file