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

build/Makefile.global

@@ -129,7 +129,7 @@ distclean: clean
 	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h
 	rm -f main/build-defs.h scripts/phpize
 	rm -f ext/date/lib/timelib_config.h ext/mbstring/libmbfl/config.h
-	rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 sapi/phpdbg/phpdbg.1 ext/phar/phar.1 ext/phar/phar.phar.1
+	rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cli/tests/php_history sapi/cgi/php-cgi.1 sapi/phpdbg/phpdbg.1 ext/phar/phar.1 ext/phar/phar.phar.1
 	rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
 	rm -f ext/phar/phar.phar ext/phar/phar.php
 	if test "$(srcdir)" != "$(builddir)"; then \

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/017.phpt

@@ -11,9 +11,18 @@ if (readline_info('done') !== NULL) {
 ?>
 --FILE--
 <?php
-$php = getenv('TEST_PHP_EXECUTABLE_ESCAPED');
-$ini = getenv('TEST_PHP_EXTRA_ARGS');
-$descriptorspec = [['pipe', 'r'], STDOUT, STDERR];
+function runReplCodes($codes) {
+    $php = getenv('TEST_PHP_EXECUTABLE_ESCAPED');
+    $ini = getenv('TEST_PHP_EXTRA_ARGS');
+    $descriptorspec = [['pipe', 'r'], STDOUT, STDERR];
+    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);
+    }
+}
 
 $codes = array();
 
@@ -52,17 +61,26 @@ function a_function_with_some_name() {
 a_function_w	);
 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);
-}
-
+runReplCodes($codes);
 echo "\nDone\n";
+
 $dir = PHP_OS_FAMILY == 'Windows' ? getenv("USERPROFILE") : getenv("HOME");
 var_dump(file_exists($dir . '/.php_history'));
+
+define("TMPDIR", __DIR__ . "/");
+$php_history_tmp = TMPDIR . "php_history";
+putenv('PHP_HISTFILE=' . $php_history_tmp);
+var_dump(file_exists($php_history_tmp));
+
+$last[6] = <<<EOT
+echo 'Hello world';
+exit
+EOT;
+runReplCodes($last);
+echo "\nDone\n";
+
+$php_history_path = PHP_OS_FAMILY == 'Windows' ? getenv("USERPROFILE") : $php_history_tmp;
+var_dump(file_exists($php_history_path));
 ?>
 --EXPECT--
 --------------
@@ -108,3 +126,14 @@ Parse error: Unmatched ')' in php shell code on line 1
 
 Done
 bool(true)
+bool(false)
+
+--------------
+Snippet no. 6:
+--------------
+Interactive shell
+
+Hello world
+
+Done
+bool(true)