[DOC-CVS] [doc-en] master: Document socket_set_timeout() deprecation in PHP 8.5 (#5669)
[email protected] (Louis-Arnaud via GitHub)
| Newsgroups | php.doc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: Louis-Arnaud (lacatoire)
Committer: GitHub (web-flow)
Pusher: lacatoire
Date: 2026-08-24T14:29:57+02:00
Commit: https://github.com/php/doc-en/commit/13682c8c7717db18862829bfc3ce9dc4a006079d
Raw diff: https://github.com/php/doc-en/commit/13682c8c7717db18862829bfc3ce9dc4a006079d.diff
Document socket_set_timeout() deprecation in PHP 8.5 (#5669)
* network: document the socket_set_timeout() deprecation in PHP 8.5
* curl: fix para to simpara in curl_multi_exec
Two <para> containing only inline content must be <simpara>,
fixing the DocBook style check failure introduced by #3944.
Changed paths:
M reference/curl/functions/curl-multi-exec.xml
M reference/network/functions/socket-set-timeout.xml
M reference/network/versions.xml
Diff:
diff --git a/reference/curl/functions/curl-multi-exec.xml b/reference/curl/functions/curl-multi-exec.xml
index 46482aa38932..71ff0392cdb4 100644
--- a/reference/curl/functions/curl-multi-exec.xml
+++ b/reference/curl/functions/curl-multi-exec.xml
@@ -13,10 +13,10 @@
<methodparam><type>CurlMultiHandle</type><parameter>multi_handle</parameter></methodparam>
<methodparam><type>int</type><parameter role="reference">still_running</parameter></methodparam>
</methodsynopsis>
- <para>
+ <simpara>
Processes each of the handles in the stack. This method can be called whether or not a handle
needs to read or write data.
- </para>
+ </simpara>
</refsect1>
<refsect1 role="parameters">
@@ -38,9 +38,9 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
- <para>
+ <simpara>
A cURL code defined in the cURL <link linkend="curl.constants">Predefined Constants</link>.
- </para>
+ </simpara>
<note>
<para>
This only returns errors regarding the whole multi stack. There might still have
diff --git a/reference/network/functions/socket-set-timeout.xml b/reference/network/functions/socket-set-timeout.xml
index ef36a33d6073..f18052d7d7aa 100644
--- a/reference/network/functions/socket-set-timeout.xml
+++ b/reference/network/functions/socket-set-timeout.xml
@@ -3,9 +3,13 @@
<refentry xml:id="function.socket-set-timeout" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>socket_set_timeout</refname>
- <refpurpose>&Alias; <function>stream_set_timeout</function></refpurpose>
+ <refpurpose>&Alias; <function>stream_set_timeout</function></refpurpose>
</refnamediv>
+ <refsynopsisdiv>
+ &warn.deprecated.function-8-5-0;
+ </refsynopsisdiv>
+
<refsect1 role="description">
&reftitle.description;
<simpara>
@@ -13,6 +17,14 @@
<function>stream_set_timeout</function>.
</simpara>
</refsect1>
+
+ <refsect1 role="seealso">
+ &reftitle.seealso;
+ <simplelist>
+ <member><function>stream_set_timeout</function></member>
+ </simplelist>
+ </refsect1>
+
</refentry>
<!-- Keep this comment at the end of the file
diff --git a/reference/network/versions.xml b/reference/network/versions.xml
index 76fc6f8702c0..01ef8bcd1ab8 100644
--- a/reference/network/versions.xml
+++ b/reference/network/versions.xml
@@ -37,7 +37,7 @@
<function name="setrawcookie" from="PHP 5, PHP 7, PHP 8"/>
<function name="socket_get_status" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
<function name="socket_set_blocking" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
- <function name="socket_set_timeout" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
+ <function name="socket_set_timeout" from="PHP 4, PHP 5, PHP 7, PHP 8" deprecated="PHP 8.5.0"/>
<function name="syslog" from="PHP 4, PHP 5, PHP 7, PHP 8"/>
</versions>