Skip to content

[Sync-En] Sync array_filter, php://input, call_user_func_array, object comparison and SessionHandlerInterface #3697

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

Merged
lacatoire merged 1 commit into from
Oct 19, 2026
Merged

[Sync-En] Sync array_filter, php://input, call_user_func_array, object comparison and SessionHandlerInterface #3697

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
4 changes: 2 additions & 2 deletions language/oop5/object-comparison.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- EN-Revision: dff848b17dafaabfb7662ffb5fecfcb04e3b771d Maintainer: lacatoire Status: ready -->
<!-- EN-Revision: a2a11180e43d242a92dd299eab74b1ea68bb7de6 Maintainer: lacatoire Status: ready -->
<sect1 xml:id="language.oop5.object-comparison" xmlns="http://docbook.org/ns/docbook">
<title>Comparaison d'objets</title>
<para>
Expand Down Expand Up @@ -30,7 +30,7 @@ function bool2str($bool)
}
}

function compareObjects(&$o1, &$o2)
function compareObjects($o1, $o2)
{
echo 'o1 == o2 : '.bool2str($o1 == $o2)."\n";
echo 'o1 != o2 : '.bool2str($o1 != $o2)."\n";
Expand Down
28 changes: 14 additions & 14 deletions language/wrappers/php.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- EN-Revision: f56de7ebe7a1a85ce9e44a2bf6b77b07adfe3ae4 Maintainer: yannick Status: ready -->
<!-- Reviewed: no -->
<!-- EN-Revision: 6de6d6a839a44f594b4f82609bfafb95bdb3d3ff Maintainer: yannick Status: ready -->

<refentry xml:id="wrappers.php" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false" role="stream_wrapper">
<refnamediv>
Expand Down Expand Up @@ -43,6 +42,7 @@
<simpara>
<filename>php://input</filename> est un flux en lecture seule qui permet
de lire des données brutes depuis le corps de la requête.
Il peut être ouvert et lu autant de fois que nécessaire.
<filename>php://input</filename> n'est pas disponible dans les requêtes POST avec
<literal>enctype="multipart/form-data"</literal> si l'option
<link linkend="ini.enable-post-data-reading">enable_post_data_reading</link>
Expand Down Expand Up @@ -171,7 +171,7 @@
</refsect2>
</refsect1>

<refsect1 role="options"><!-- {{{ -->
<refsect1 role="options">
&reftitle.options;
<para>
<table>
Expand Down Expand Up @@ -277,11 +277,11 @@
</tgroup>
</table>
</para>
</refsect1> <!-- }}} -->
</refsect1>

<refsect1 role="examples"><!-- {{{ -->
<refsect1 role="examples">
&reftitle.examples;
<example><!-- {{{ -->
<example>
<title>php://temp/maxmemory</title>
<para>
Ce paramètre optionnel permet de configurer la limite
Expand All @@ -303,8 +303,8 @@ echo stream_get_contents($fp);
?>
]]>
</programlisting>
</example><!-- }}} -->
<example><!-- {{{ -->
</example>
<example>
<title>php://filter/resource=&lt;flux à filtrer&gt;</title>
<para>
Ce paramètre doit être placé à la fin de la spécification
Expand All @@ -322,8 +322,8 @@ readfile("php://filter/resource=http://www.example.com");
?>
]]>
</programlisting>
</example><!-- }}} -->
<example><!-- {{{ -->
</example>
<example>
<title>php://filter/read=&lt;liste de filtres à appliquer lors de la lecture&gt;</title>
<para>
Ce paramètre prend un ou plusieurs noms de filtres séparés par
Expand All @@ -342,8 +342,8 @@ readfile("php://filter/read=string.toupper|string.rot13/resource=http://www.exam
?>
]]>
</programlisting>
</example><!-- }}} -->
<example><!-- {{{ -->
</example>
<example>
<title>php://filter/write=&lt;liste des filtres à appliquer lors de l'écriture&gt;</title>
<para>
Ce paramètre prend un ou plusieurs noms de filtres séparés par
Expand All @@ -359,7 +359,7 @@ file_put_contents("php://filter/write=string.rot13/resource=example.txt","Hello
?>
]]>
</programlisting>
</example><!-- }}} -->
</example>
<example>
<title>php://memory et php://temp ne sont pas réutilisables</title>
<para>
Expand Down Expand Up @@ -396,7 +396,7 @@ print_r($json_array);
]]>
</programlisting>
</example>
</refsect1><!-- }}} -->
</refsect1>
</refentry>

<!-- Keep this comment at the end of the file
Expand Down
7 changes: 5 additions & 2 deletions reference/array/functions/array-filter.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- EN-Revision: 596c11440dc232b8ed1836d7e3afe2ed5b225a7b Maintainer: girgias Status: ready -->
<!-- Reviewed: yes -->
<!-- EN-Revision: 00eb00696f9e9989ffa539be35571429b25333b8 Maintainer: girgias Status: ready -->
<refentry xml:id="function.array-filter" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>array_filter</refname>
Expand Down Expand Up @@ -82,6 +81,10 @@
Par défaut <literal>0</literal>, qui passera la valeur comme
seul argument de <parameter>callback</parameter>.
</para>
<simpara>
Si <parameter>callback</parameter> vaut &null;, <parameter>mode</parameter>
est ignoré et seules les valeurs sont vérifiées.
</simpara>
</listitem>
</varlistentry>

Expand Down
5 changes: 2 additions & 3 deletions reference/funchand/functions/call-user-func-array.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 5832a97c699c5e1bc808ee900447fe751af0d540 Maintainer: yannick Status: ready -->
<!-- Reviewed: yes -->
<!-- EN-Revision: 0c5d173aa7bec12135c8a42bced037f8850e4610 Maintainer: yannick Status: ready -->
<refentry xml:id="function.call-user-func-array" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>call_user_func_array</refname>
Expand Down Expand Up @@ -251,6 +249,7 @@ Fatal error: Uncaught Error: Cannot use positional argument after named argument
<para>
<simplelist>
<member><function>call_user_func</function></member>
<member><link linkend="functions.variable-arg-list">Déballage d'arguments</link></member>
<member><methodname>ReflectionFunction::invokeArgs</methodname></member>
<member><methodname>ReflectionMethod::invokeArgs</methodname></member>
</simplelist>
Expand Down
14 changes: 6 additions & 8 deletions reference/session/sessionhandlerinterface.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- EN-Revision: 8859c8b96cd9e80652813f7bcf561432a5e9f934 Maintainer: jpauli Status: ready -->
<!-- Reviewed: no -->
<!-- EN-Revision: a5b4d03a0135c5feb0beec7d7b99effaacab0505 Maintainer: jpauli Status: ready -->
<reference xml:id="class.sessionhandlerinterface" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">

<title>L'interface SessionHandlerInterface</title>
Expand Down Expand Up @@ -36,9 +35,7 @@
</oointerface>

<classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.sessionhandlerinterface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='SessionHandlerInterface'])">
<xi:fallback/>
</xi:include>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.sessionhandlerinterface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='SessionHandlerInterface'])"/>
</classsynopsis>
<!-- }}} -->

Expand Down Expand Up @@ -118,13 +115,14 @@ class MySessionHandler implements SessionHandlerInterface
#[\ReturnTypeWillChange]
public function gc($maxlifetime)
{
$deleted = 0;
foreach (glob("$this->savePath/sess_*") as $file) {
if (filemtime($file) + $maxlifetime < time() && file_exists($file)) {
unlink($file);
if (filemtime($file) + $maxlifetime < time() && file_exists($file) && unlink($file)) {
$deleted++;
}
}

return true;
return $deleted;
}
}

Expand Down
Loading