sapi/cli: Don't set ini-settings mid-expression in interactive shell

Author: ReimarPB

ext/readline/readline_cli.c

@@ -649,7 +649,16 @@ static int readline_shell_run(void) /* {{{ */
 
 		len = strlen(line);
 
-		if (line[0] == '#' && line[1] != '[') {
+		if (pos + len + 2 > size) {
+			size = pos + len + 2;
+			code = erealloc(code, size);
+		}
+		memcpy(&code[pos], line, len);
+		pos += len;
+		code[pos] = '\n';
+		code[++pos] = '\0';
+
+		if (line[0] == '#' && line[1] != '[' && cli_is_valid_code(code, pos, &prompt)) {
 			char *param = strstr(&line[1], "=");
 			if (param) {
 				zend_string *cmd;
@@ -661,21 +670,9 @@ static int readline_shell_run(void) /* {{{ */
 				add_history(line);
 
 				zend_string_release_ex(prompt, 0);
-				/* TODO: This might be wrong! */
-				prompt = cli_get_prompt("php", '>');
-				continue;
 			}
 		}
 
-		if (pos + len + 2 > size) {
-			size = pos + len + 2;
-			code = erealloc(code, size);
-		}
-		memcpy(&code[pos], line, len);
-		pos += len;
-		code[pos] = '\n';
-		code[++pos] = '\0';
-
 		if (*line) {
 			add_history(line);
 			history_lines_to_write += 1;