cli: allow to change ~/.php_history with PHP_HISTFILE

Author: spk

.gitignore

@@ -126,6 +126,7 @@ config.h.in
 /ext/phar/phar.php
 /pear/install-pear-nozlib.phar
 /sapi/cgi/php-cgi
+/sapi/cli/tests/php_history
 /sapi/fpm/php-fpm
 /sapi/phpdbg/phpdbg
 /scripts/php-config

ext/readline/readline_cli.c

@@ -617,7 +617,12 @@ static int readline_shell_run(void) /* {{{ */
 	}
 
 #ifndef PHP_WIN32
-	history_file = tilde_expand("~/.php_history");
+#define PHP_HISTFILE_ENV "PHP_HISTFILE"
+	if (getenv(PHP_HISTFILE_ENV)) {
+		spprintf(&history_file, MAXPATHLEN, "%s", getenv(PHP_HISTFILE_ENV));
+	} else {
+		spprintf(&history_file, MAXPATHLEN, "%s/.php_history", getenv("HOME"));
+	}
 #else
 	spprintf(&history_file, MAX_PATH, "%s/.php_history", getenv("USERPROFILE"));
 #endif
@@ -717,11 +722,7 @@ static int readline_shell_run(void) /* {{{ */
 
 		php_last_char = '\0';
 	}
-#ifdef PHP_WIN32
 	efree(history_file);
-#else
-	free(history_file);
-#endif
 	efree(code);
 	zend_string_release_ex(prompt, 0);
 	return EG(exit_status);

sapi/cli/tests/php_history_001.phpt

@@ -0,0 +1,48 @@
+--TEST--
+CLI -a and libedit
+--EXTENSIONS--
+readline
+--SKIPIF--
+<?php
+include "skipif.inc";
+if (readline_info('done') !== NULL) {
+    die ("skip need readline support using libedit");
+}
+?>
+--FILE--
+<?php
+define("TMPDIR", __DIR__ . "/");
+$php_history_path = TMPDIR . "php_history";
+putenv('PHP_HISTFILE=' . $php_history_path);
+$php = getenv('TEST_PHP_EXECUTABLE_ESCAPED');
+$ini = getenv('TEST_PHP_EXTRA_ARGS');
+$descriptorspec = [['pipe', 'r'], STDOUT, STDERR];
+
+$codes = array();
+
+$codes[1] = <<<EOT
+echo 'Hello world';
+exit
+EOT;
+
+foreach ($codes as $key => $code) {
+    echo "\n--------------\nSnippet no. $key:\n--------------\n";
+    $proc = proc_open("$php $ini -a", $descriptorspec, $pipes);
+    fwrite($pipes[0], $code);
+    fclose($pipes[0]);
+    proc_close($proc);
+}
+
+echo "\nDone\n";
+var_dump(file_exists($php_history_path));
+?>
+--EXPECT--
+--------------
+Snippet no. 1:
+--------------
+Interactive shell
+
+Hello world
+
+Done
+bool(true)