Skip to content

ext/readline: declare true as the return type of readline_completion_function() #23433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lacatoire wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −5
Open

ext/readline: declare true as the return type of readline_completion_function() #23433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions UPGRADING
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,12 @@ PHP 8.6 UPGRADE NOTES
- Phar:
. Phar::mungServer() now supports reference values.

- Readline:
. readline_completion_function() now declares true as its return type. The
function assigns a static callback and then tests whether the assignment
landed, which is a tautology; an invalid callback throws a TypeError via
ZPP before the function body is reached.

- Sockets:
. socket_addrinfo_lookup() now has an additional optional argument $error
when not null, and on failure, gives the error code (one of the EAI_*
Expand Down
4 changes: 2 additions & 2 deletions ext/readline/readline.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,8 +489,8 @@ PHP_FUNCTION(readline_completion_function)

/* NOTE: The rl_attempted_completion_function variable (and others) are part of the readline library, not php */
rl_attempted_completion_function = php_readline_completion_cb;
RETURN_BOOL(rl_attempted_completion_function != NULL);

RETURN_TRUE;
}

/* }}} */
Expand Down
2 changes: 1 addition & 1 deletion ext/readline/readline.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function readline_read_history(?string $filename = null): bool {}

function readline_write_history(?string $filename = null): bool {}

function readline_completion_function(callable $callback): bool {}
function readline_completion_function(callable $callback): true {}


#ifdef HAVE_RL_CALLBACK_READ_CHAR
Expand Down
4 changes: 2 additions & 2 deletions ext/readline/readline_arginfo.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading