Skip to content

Commit

Permalink
Merge branch 'master' into patch-15
Browse files Browse the repository at this point in the history
  • Loading branch information
mmalferov authored Feb 22, 2025
2 parents 4cac1ef + 366a10b commit 80b958b
Show file tree
Hide file tree
Showing 62 changed files with 177 additions and 116 deletions.
4 changes: 2 additions & 2 deletions appendices/about.xml
Original file line number Diff line number Diff line change
Expand Up @@ -340,9 +340,9 @@ Returns the length of given string.
</para>
<para>
If an error is found in this manual, in any language, please report them
using the issue tracker of the respective language repository at <link xlink:href="https://github.com/php/?q=doc">https://github.com/php</link>;
using the issue tracker of the respective language repository at <link xlink:href="&url.php.git;">&url.php.git;</link>;
for instance, errors in the English manual should be reported at
<link xlink:href="https://github.com/php/doc-en/issues">https://github.com/php/doc-en/issues</link>.
<link xlink:href="&url.php.git;doc-en/issues">&url.php.git;doc-en/issues</link>.
All documentation related
problems, including those about manual formats, should be submitted as bug
reports.
Expand Down
2 changes: 1 addition & 1 deletion appendices/migration84/incompatible.xml
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@
As a consequence, this means <literal>{,3}</literal> is now recognized
as a quantifier instead of as text.
Furthermore, the meaning of some character classes in UCP mode has changed.
Consult the <link xlink:href="https://github.com/PCRE2Project/pcre2/blob/master/NEWS">PCRE2 Changelog</link>
Consult the <link xlink:href="&url.pcre2.changelog;">PCRE2 Changelog</link>
for a full changelog.
</simpara>
</sect2>
Expand Down
2 changes: 1 addition & 1 deletion faq/obtaining.xml
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@
</question>
<answer>
<para>
See the PHP Wiki for the latest instructions: <link xlink:href="https://wiki.php.net/internals/windows/stepbystepbuild">Step by Step Build Instructions</link>
See the PHP Wiki for the latest instructions: <link xlink:href="&url.php.win.build2;">Step by Step Build Instructions</link>

</para>
</answer>
Expand Down
6 changes: 3 additions & 3 deletions install/cloud/azure.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<itemizedlist spacing="compact">
<listitem>
<para>Azure portal: create, edit settings and delete web sites. <link xlink:href="https://portal.azure.com/">Azure Portal</link>
<para>Azure portal: create, edit settings and delete web sites. <link xlink:href="&url.azure.portal;">Azure Portal</link>
</para>
</listitem>
<listitem>
Expand All @@ -37,10 +37,10 @@
</listitem>
</itemizedlist>

<para>There is also a PHP SDK for programmatically using many Azure Services from your PHP code. See <link xlink:href="https://github.com/Azure/azure-sdk-for-php">Azure SDK for PHP</link>.
<para>There is also a PHP SDK for programmatically using many Azure Services from your PHP code. See <link xlink:href="&url.azure.php.sdk;">Azure SDK for PHP</link>.
</para>

<para>For more information, see <link xlink:href="https://azure.microsoft.com/en-us/develop/php/">Azure PHP Developer Center</link>
<para>For more information, see <link xlink:href="&url.azure.php;">Azure PHP Developer Center</link>
</para>

<sect2>
Expand Down
8 changes: 4 additions & 4 deletions install/cloud/digitalocean.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
<itemizedlist spacing="compact">
<listitem>
<para>
<link xlink:href="https://www.cloudways.com/en/managed-hosting-for-digital-ocean.php">Cloudways</link>:
<link xlink:href="&url.docean.cloudways;">Cloudways</link>:
One-click deployment of major PHP applications:
WordPress, Magento, Drupal, Laravel, and more.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://www.digitalocean.com/products/droplets">Droplet</link>:
<link xlink:href="&url.docean.droplet;">Droplet</link>:
Virtual machine boxes and installing
<link xlink:href="https://www.digitalocean.com/community/tutorials/how-to-install-linux-apache-mysql-php-lamp-stack-on-ubuntu-16-04">
Lamp stack on a Linux server
Expand All @@ -25,7 +25,7 @@
</listitem>
<listitem>
<para>
<link xlink:href="https://www.digitalocean.com/products/app-platform">App Platform</link>:
<link xlink:href="&url.docean.app.platform;">App Platform</link>:
Managed infrastructure to build, deploy, and scale apps quickly.
Learn
<link xlink:href="https://docs.digitalocean.com/products/app-platform/getting-started/sample-apps/php/">
Expand All @@ -35,7 +35,7 @@
</listitem>
<listitem>
<para>
<link xlink:href="https://www.digitalocean.com/products/functions">Functions</link>:
<link xlink:href="&url.docean.functions;">Functions</link>:
Serverless platform that allows developers to run code without provisioning or managing servers.
PHP is supported natively.
Learn
Expand Down
2 changes: 1 addition & 1 deletion install/macos/packages.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</simpara>
<simpara>
An easy way to install PHP on macOS is with the
<link xlink:href="https://brew.sh/">Homebrew</link> packaging manager.
<link xlink:href="&url.brew;">Homebrew</link> packaging manager.
</simpara>
<orderedlist>
<listitem>
Expand Down
18 changes: 9 additions & 9 deletions install/unix/litespeed.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
<para>
To obtain and install either LiteSpeed Web Server or OpenLiteSpeed Web Server, visit the
LiteSpeed Web Server documentation
<link xlink:href="https://docs.litespeedtech.com/products/lsws/installation/">install page</link>
<link xlink:href="&url.litespeed.lsws;">install page</link>
or OpenLiteSpeed documentation
<link xlink:href="https://openlitespeed.org/kb/category/installation/more-installation-methods/">install page</link>.
<link xlink:href="&url.litespeed.install;">install page</link>.
</para>
</listitem>

Expand Down Expand Up @@ -126,7 +126,7 @@ Zend Engine v2.6.0, Copyright (c) 1998-2015 Zend Technologies
now be running with support for PHP as an SAPI extension. There are many more
configuration options available for LSWS / OLS and PHP. For more information,
check out the LiteSpeed documentation about
<link xlink:href="https://docs.litespeedtech.com/extapp/php/configuration/control/">PHP</link>.
<link xlink:href="&url.litespeed.php;">PHP</link>.
</para>

<para>
Expand Down Expand Up @@ -214,8 +214,8 @@ PHP_LSAPI_MAX_REQUESTS=500 PHP_LSAPI_CHILDREN=35 /path/to/lsphp -b IP_address:po
Currently LiteSpeed PHP can be used with LiteSpeed Web Server,
OpenLiteSpeed Web Server, and Apache mod_lsapi. For steps on
server-side configuration, visit the documentation pages for
<link xlink:href="https://docs.litespeedtech.com/extapp/php/getting_started/">LiteSpeed Web Server</link>
and <link xlink:href="https://openlitespeed.org/kb/category/installation/php-installation-guides/">OpenLiteSpeed</link>.
<link xlink:href="&url.litespeed.web.server;">LiteSpeed Web Server</link>
and <link xlink:href="&url.litespeed.open;">OpenLiteSpeed</link>.
</para>

<para>
Expand All @@ -225,25 +225,25 @@ PHP_LSAPI_MAX_REQUESTS=500 PHP_LSAPI_CHILDREN=35 /path/to/lsphp -b IP_address:po
<para>
CentOS:
On CentOS, LSPHP can be installed from the LiteSpeed Repository or the Remi
Repository using <link xlink:href="https://docs.litespeedtech.com/extapp/php/getting_started/#litespeed-repo-search-packages">RPM</link>.
Repository using <link xlink:href="&url.litespeed.packages;">RPM</link>.
</para>

<para>
Debian:
On Debian, LSPHP can be installed from the LiteSpeed Repository using
<link xlink:href="https://docs.litespeedtech.com/extapp/php/getting_started/#litespeed-repo-search-packages">apt</link>.
<link xlink:href="&url.litespeed.packages;">apt</link>.
</para>

<para>
cPanel:
Visit the respective <link xlink:href="https://docs.litespeedtech.com/cp/cpanel/quickstart/#easyapache-integration">documentation page</link>
Visit the respective <link xlink:href="&url.litespeed.cpanel;">documentation page</link>
about how to install LSPHP with cPanel and LSWS/OLS using EasyApache 4.
</para>

<para>
Plesk:
Plesk can be used with LSPHP on CentOS, CloudLinux, Debian, and Ubuntu,
for more details on this, visit the respective <link xlink:href="https://docs.litespeedtech.com/cp/plesk/">documentation page</link>
for more details on this, visit the respective <link xlink:href="&url.litespeed.plesk;">documentation page</link>
</para>
</sect1>

Expand Down
2 changes: 1 addition & 1 deletion install/unix/openbsd.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Follow the instructions shown with each package!
requires Xorg to be installed. Unless already installed at base install by
adding the <filename>xbase.tgz</filename> file set, this can be added at
post-installation (see
<link xlink:href="https://www.openbsd.org/faq/faq4.html#FilesNeeded">OpenBSD FAQ#4</link>).
<link xlink:href="&url.openbsd.faq4;">OpenBSD FAQ#4</link>).
</simpara>
</listitem>
</itemizedlist>
Expand Down
4 changes: 2 additions & 2 deletions install/windows/iis.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
On Windows Server, the IIS role can be added via the Server Manager.
The CGI Role Feature needs to be included.
On Windows Desktop, IIS has to be added via the Control Panel's Add/Remove Programs.
The Microsoft documentation has <link xlink:href="https://docs.microsoft.com/en-us/previous-versions/ms181052(v=vs.80)">detailed instructions for enabling IIS</link>.
The Microsoft documentation has <link xlink:href="&url.iis.enable;">detailed instructions for enabling IIS</link>.
For development,
<link xlink:href="https://www.microsoft.com/en-us/download/details.aspx?id=48264">IIS/Express</link> can also be used.
<link xlink:href="&url.iis.express;">IIS/Express</link> can also be used.
</simpara>
<note>
<simpara>
Expand Down
5 changes: 2 additions & 3 deletions install/windows/manual.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,8 @@
<simplesect xml:id="install.windows.pecl" annotations="chunk:false">
<title>Pre-built PECL Extensions</title>
<para>
PECL extensions that are pre-built for Windows are available from
<link xlink:href="&url.pecl.windows.releases;">the PECL downloads
section of the PHP Windows website</link>.
Pre-built Windows versions of PECL extensions are distributed as DLL
files on the extension's PECL page.
</para>
<para>
Binaries are not available for extensions that use features specific
Expand Down
2 changes: 1 addition & 1 deletion install/windows/recommended.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ opcache.enable_cli=On

If high performance is needed, use the object cache in the applications.

See: <link xlink:href="http://pecl.php.net/package/WinCache">http://pecl.php.net/package/WinCache</link>
See: <link xlink:href="&url.pecl.package;WinCache">&url.pecl.package;WinCache</link>
to download a WinCache DLL (or <filename>WINCACHE_<replaceable>*</replaceable>.tgz</filename>)
to the PHP extensions directory
(<link linkend="ini.extension-dir">extension_dir</link> in the <filename>php.ini</filename>).
Expand Down
6 changes: 3 additions & 3 deletions install/windows/tools.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<title>Third-party tools for installing PHP</title>
&warn.install.third-party-support;
<para>
<link xlink:href="https://www.apachefriends.org/">XAMPP</link>,
<link xlink:href="https://www.wampserver.com">WampServer</link>, and
<link xlink:href="https://bitnami.com">Bitnami</link>
<link xlink:href="&url.xampp;">XAMPP</link>,
<link xlink:href="&url.wampserver;">WampServer</link>, and
<link xlink:href="&url.bitnami;">Bitnami</link>
will also setup PHP applications for use with Apache on Windows.
</para>
</sect1>
Expand Down
2 changes: 1 addition & 1 deletion reference/com/compersisthelper/loadfromfile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<listitem>
<simpara>
The access mode to be used when opening the file. Possible values are
taken from the <link xlink:href="https://docs.microsoft.com/en-us/windows/win32/stg/stgm-constants">STGM enumeration</link>.
taken from the <link xlink:href="&url.com.stgm.enum;">STGM enumeration</link>.
The method can treat this value as a suggestion, adding more restrictive
permissions if necessary. If <parameter>flags</parameter> is <literal>0</literal>,
the implementation is supposed to open the file using whatever default
Expand Down
2 changes: 1 addition & 1 deletion reference/ds/book.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
Efficient data structures for PHP 7, provided as an alternative to the &array;.
</para>
<para>
See <link xlink:href="https://medium.com/p/9dda7af674cd">this blog post</link>
See <link xlink:href="&url.blog.data.structures;">this blog post</link>
for benchmarks, discussion and frequently asked questions.
</para>
</preface>
Expand Down
2 changes: 1 addition & 1 deletion reference/ds/ds/map/diff.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
&reftitle.seealso;
<para>
<simplelist>
<member><link xlink:href="https://en.wikipedia.org/wiki/Complement_(set_theory)">Complement</link> on Wikipedia</member>
<member><link xlink:href="&url.wiki.complement;">Complement</link> on Wikipedia</member>
</simplelist>
</para>
</refsect1>
Expand Down
2 changes: 1 addition & 1 deletion reference/ds/ds/map/intersect.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
&reftitle.seealso;
<para>
<simplelist>
<member><link xlink:href="https://en.wikipedia.org/wiki/Intersection_(set_theory)">Intersection</link> on Wikipedia</member>
<member><link xlink:href="&url.wiki.intersection;">Intersection</link> on Wikipedia</member>
</simplelist>
</para>
</refsect1>
Expand Down
2 changes: 1 addition & 1 deletion reference/ds/ds/map/union.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
&reftitle.seealso;
<para>
<simplelist>
<member><link xlink:href="https://en.wikipedia.org/wiki/Union_(set_theory)">Union</link> on Wikipedia</member>
<member><link xlink:href="&url.wiki.union.set;">Union</link> on Wikipedia</member>
</simplelist>
</para>
</refsect1>
Expand Down
2 changes: 1 addition & 1 deletion reference/ds/ds/map/xor.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
&reftitle.seealso;
<para>
<simplelist>
<member><link xlink:href="https://en.wikipedia.org/wiki/Symmetric_difference">Symmetric Difference</link> on Wikipedia</member>
<member><link xlink:href="&url.wiki.symmetric.difference;">Symmetric Difference</link> on Wikipedia</member>
</simplelist>
</para>
</refsect1>
Expand Down
2 changes: 1 addition & 1 deletion reference/ds/ds/set/diff.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
&reftitle.seealso;
<para>
<simplelist>
<member><link xlink:href="https://en.wikipedia.org/wiki/Complement_(set_theory)">Complement</link> on Wikipedia</member>
<member><link xlink:href="&url.wiki.complement;">Complement</link> on Wikipedia</member>
</simplelist>
</para>
</refsect1>
Expand Down
2 changes: 1 addition & 1 deletion reference/ds/ds/set/intersect.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
&reftitle.seealso;
<para>
<simplelist>
<member><link xlink:href="https://en.wikipedia.org/wiki/Intersection_(set_theory)">Intersection</link> on Wikipedia</member>
<member><link xlink:href="&url.wiki.intersection;">Intersection</link> on Wikipedia</member>
</simplelist>
</para>
</refsect1>
Expand Down
2 changes: 1 addition & 1 deletion reference/ds/ds/set/union.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
&reftitle.seealso;
<para>
<simplelist>
<member><link xlink:href="https://en.wikipedia.org/wiki/Union_(set_theory)">Union</link> on Wikipedia</member>
<member><link xlink:href="&url.wiki.union.set;">Union</link> on Wikipedia</member>
</simplelist>
</para>
</refsect1>
Expand Down
2 changes: 1 addition & 1 deletion reference/ds/ds/set/xor.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
&reftitle.seealso;
<para>
<simplelist>
<member><link xlink:href="https://en.wikipedia.org/wiki/Symmetric_difference">Symmetric Difference</link> on Wikipedia</member>
<member><link xlink:href="&url.wiki.symmetric.difference;">Symmetric Difference</link> on Wikipedia</member>
</simplelist>
</para>
</refsect1>
Expand Down
9 changes: 1 addition & 8 deletions reference/ds/setup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,10 @@ phpize --clean

</para>

<para>

If you're on Windows, you can
<link xlink:href="https://pecl.php.net/package/ds">download a compiled .dll on PECL</link>

</para>

<note>
<para>
If you're using Composer, it's highly recommended that you include
<link xlink:href="https://packagist.org/packages/php-ds/php-ds">php-ds/php-ds</link>
<link xlink:href="&url.packagist.package;php-ds/php-ds">php-ds/php-ds</link>
in your project so that your code is still functional in an environment where the
extension is not installed. The extension will take priority if installed.
</para>
Expand Down
2 changes: 1 addition & 1 deletion reference/eio/functions/eio-open.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<para>One of <emphasis>EIO_S_I*</emphasis> constants, or their combination
(via bitwise OR operator). The constants have the same meaning as their
<emphasis>S_I*</emphasis> counterparts defined in <link
xlink:href="http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_stat.h.html">sys/stat.h</link>
xlink:href="&url.sys.stat.header;">sys/stat.h</link>
C header file. Required, if a file is created. Otherwise ignored.
</para>
</listitem>
Expand Down
8 changes: 4 additions & 4 deletions reference/ev/ev.xml
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@
<literal>inotify</literal>
API for its
<link
xlink:href="http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#code_ev_stat_code_did_the_file_attri">ev_stat</link>
xlink:href="&url.ev.stat;">ev_stat</link>
watchers. The flag can be useful to conserve inotify file descriptors,
as otherwise each loop using
<literal>ev_stat</literal>
Expand All @@ -328,10 +328,10 @@
<literal>signalfd</literal>
API for its
<link
xlink:href="http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#code_ev_signal_code_signal_me_when_a">ev_signal</link>
xlink:href="&url.ev.signal;">ev_signal</link>
(and
<link
xlink:href="http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#code_ev_child_code_watch_out_for_pro">ev_child</link>
xlink:href="&url.ev.child;">ev_child</link>
) watchers. This API delivers signals synchronously, which makes it
both faster and might make it possible to get the queued signal data.
It can also simplify signal handling with threads, as long as signals
Expand Down Expand Up @@ -772,7 +772,7 @@
<literal>Ev</literal>
registers
<link
xlink:href="http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#FUNCTIONS_CONTROLLING_EVENT_LOOPS_CO">ev_loop_fork</link>
xlink:href="&url.ev.loop;">ev_loop_fork</link>
call by means of
<literal>pthread_atfork</literal>
(if available).
Expand Down
4 changes: 2 additions & 2 deletions reference/ev/evtimer/construct.xml
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,10 @@ END
<classname>EvPeriodic</classname>
</member>
<member>
<link xlink:href="http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#code_ev_timer_code_relative_and_opti">ev_timer - relative and optionally repeating timeouts</link>
<link xlink:href="&url.ev.timer;">ev_timer - relative and optionally repeating timeouts</link>
</member>
<member>
<link xlink:href="http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#Be_smart_about_timeouts">Be smart about timeouts</link>
<link xlink:href="&url.ev.timeouts;">Be smart about timeouts</link>
</member>
</simplelist>
</refsect1>
Expand Down
2 changes: 1 addition & 1 deletion reference/event/eventbuffer/enablelocking.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<simplelist>
<member>
<link
xlink:href="http://www.wangafu.net/~nickm/libevent-book/Ref7_evbuffer.html#_evbuffers_and_thread_safety">Evbuffers and Thread-safety</link>
xlink:href="&url.ev.buffers.threads;">Evbuffers and Thread-safety</link>
</member>
</simplelist>
</refsect1>
Expand Down
2 changes: 1 addition & 1 deletion reference/event/setup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<para>
This extension requires
<link
xlink:href="http://libevent.org/">libevent</link>
xlink:href="&url.libevent;">libevent</link>
library. Most modern distributions provide packages for libevent.
</para>
<para>
Expand Down
Loading

0 comments on commit 80b958b

Please sign in to comment.