Skip to content

Commit 543f5be

Browse files
authored
Various sync with EN (#2133)
1 parent db4b8d3 commit 543f5be

25 files changed

Lines changed: 109 additions & 149 deletions

File tree

appendices/reserved.xml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- EN-Revision: 010542d1dcb9b1d5cd397a77ed580e50de25aca7 Maintainer: yannick Status: ready -->
2+
<!-- EN-Revision: 8ad03fd9aeaa81467ba3e46a4770c9786428efd8 Maintainer: yannick Status: ready -->
33
<!-- Reviewed: no -->
44
<appendix xml:id="reserved" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
55
<title>Mots réservés en PHP</title>
@@ -146,7 +146,7 @@
146146
<link linkend="control-structures.for">for</link>
147147
</entry>
148148
<entry>
149-
&foreach;
149+
<link linkend="control-structures.foreach">foreach</link>
150150
</entry>
151151
</row>
152152
<row>
@@ -291,30 +291,33 @@
291291
<tbody>
292292
<row>
293293
<entry>
294-
<link linkend="language.constants.predefined">__CLASS__</link>
294+
<link linkend="language.constants.magic">__CLASS__</link>
295295
</entry>
296296
<entry>
297-
<link linkend="language.constants.predefined">__DIR__</link>
297+
<link linkend="language.constants.magic">__DIR__</link>
298298
</entry>
299299
<entry>
300-
<link linkend="language.constants.predefined">__FILE__</link>
300+
<link linkend="language.constants.magic">__FILE__</link>
301301
</entry>
302302
<entry>
303-
<link linkend="language.constants.predefined">__FUNCTION__</link>
303+
<link linkend="language.constants.magic">__FUNCTION__</link>
304304
</entry>
305305
<entry>
306-
<link linkend="language.constants.predefined">__LINE__</link>
307-
</entry>
308-
<entry>
309-
<link linkend="language.constants.predefined">__METHOD__</link>
306+
<link linkend="language.constants.magic">__LINE__</link>
310307
</entry>
311308
</row>
312309
<row>
310+
<entry>
311+
<link linkend="language.constants.magic">__METHOD__</link>
312+
</entry>
313+
<entry>
314+
<link linkend="language.constants.magic">__PROPERTY__</link>
315+
</entry>
313316
<entry>
314317
<link linkend="language.namespaces.nsconstants">__NAMESPACE__</link>
315318
</entry>
316319
<entry>
317-
<link linkend="language.constants.predefined">__TRAIT__</link>
320+
<link linkend="language.constants.magic">__TRAIT__</link>
318321
</entry>
319322
<entry>
320323
</entry>

appendices/tokens.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- EN-Revision: 9418ae19ae6ab1d3f1536db986830362b207b1d6 Maintainer: girgias Status: ready -->
2+
<!-- EN-Revision: 8147380995947a4c51bc04c266ccd1e87f664700 Maintainer: girgias Status: ready -->
33
<!-- Reviewed: no -->
44
<appendix xml:id="tokens" xmlns="http://docbook.org/ns/docbook">
55
<title>Liste des jetons de l'analyseur</title>
@@ -41,6 +41,7 @@
4141
<?php
4242
// Antérieur à PHP 7.4.0, T_FN n'est pas définie.
4343
defined('T_FN') || define('T_FN', 10001);
44+
?>
4445
]]>
4546
</programlisting>
4647
</para>

reference/componere/componere/value/construct.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- EN-Revision: 4d298e618cce8d4cca3bc6a296666848080dd510 Maintainer: Fan2Shrek Status: ready -->
2+
<!-- EN-Revision: e16648669d3b9ae6f5c0d238de225d103301cfc2 Maintainer: Fan2Shrek Status: ready -->
33
<!-- Reviewed: yes -->
44
<refentry xml:id="componere-value.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
55
<refnamediv>
@@ -11,7 +11,7 @@
1111
&reftitle.description;
1212
<constructorsynopsis>
1313
<modifier>public</modifier> <methodname>Componere\Value::__construct</methodname>
14-
<methodparam choice="opt"><parameter>default</parameter></methodparam>
14+
<methodparam choice="opt"><type>mixed</type><parameter>default</parameter></methodparam>
1515
</constructorsynopsis>
1616
<para>
1717

reference/componere/functions/componere.cast.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- EN-Revision: b76d2e6b367d581a5df7f4cfd969cf2c2138cb70 Maintainer: Fan2Shrek Status: ready -->
2+
<!-- EN-Revision: e16648669d3b9ae6f5c0d238de225d103301cfc2 Maintainer: Fan2Shrek Status: ready -->
33
<!-- Reviewed: yes -->
44
<refentry xml:id="componere.cast" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
55
<refnamediv>
@@ -10,9 +10,9 @@
1010
<refsect1 role="description">
1111
&reftitle.description;
1212
<methodsynopsis>
13-
<type>Type</type><methodname>Componere\cast</methodname>
14-
<methodparam><type>Type</type><parameter>type</parameter></methodparam>
15-
<methodparam><parameter>object</parameter></methodparam>
13+
<type>object</type><methodname>Componere\cast</methodname>
14+
<methodparam><type>string</type><parameter>type</parameter></methodparam>
15+
<methodparam><type>object</type><parameter>object</parameter></methodparam>
1616
</methodsynopsis>
1717
</refsect1>
1818

reference/componere/functions/componere.cast_by_ref.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- EN-Revision: b76d2e6b367d581a5df7f4cfd969cf2c2138cb70 Maintainer: Fan2Shrek Status: ready -->
2+
<!-- EN-Revision: e16648669d3b9ae6f5c0d238de225d103301cfc2 Maintainer: Fan2Shrek Status: ready -->
33
<!-- Reviewed: yes -->
44
<refentry xml:id="componere.cast_by_ref" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
55
<refnamediv>
@@ -10,9 +10,9 @@
1010
<refsect1 role="description">
1111
&reftitle.description;
1212
<methodsynopsis>
13-
<type>Type</type><methodname>Componere\cast_by_ref</methodname>
14-
<methodparam><type>Type</type><parameter>type</parameter></methodparam>
15-
<methodparam><parameter>object</parameter></methodparam>
13+
<type>object</type><methodname>Componere\cast_by_ref</methodname>
14+
<methodparam><type>string</type><parameter>type</parameter></methodparam>
15+
<methodparam><type>object</type><parameter>object</parameter></methodparam>
1616
</methodsynopsis>
1717
</refsect1>
1818

0 commit comments

Comments
 (0)