svn: /phpdoc/en/trunk/appendices/ reserved.xml
| From: | Thomas Punt | Date: | Wed, 24 Feb 2016 14:09:57 +0000 |
| Subject: | svn: /phpdoc/en/trunk/appendices/ reserved.xml | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-14036@lists.php.net to get a copy of this message | ||
tpunt Wed, 24 Feb 2016 14:09:57 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=338660
Log:
Resolve doc bug #71578
Bug: https://bugs.php.net/71578 (Re-Opened) object, mixed
and numeric are not reserved words
Changed paths:
U phpdoc/en/trunk/appendices/reserved.xml
Modified: phpdoc/en/trunk/appendices/reserved.xml
===================================================================
--- phpdoc/en/trunk/appendices/reserved.xml 2016-02-24 10:33:38 UTC (rev 338659)
+++ phpdoc/en/trunk/appendices/reserved.xml 2016-02-24 14:09:57 UTC (rev 338660)
@@ -457,12 +457,10 @@
</sect1>
&appendices.reserved.constants;
<sect1 xml:id="reserved.other-reserved-words">
- <title>List of other reserved words </title>
+ <title>List of other reserved words</title>
<simpara>
- These words cannot be used to name a class, interface or a trait.
- These words are also prohibited from being used in namespaces.
- Some of the words are reserved to enable future PHP features without
- breaking backward compatibility.
+ The following words cannot be used to name a class, interface or trait, and
+ they are also prohibited from being used in namespaces.
</simpara>
<para>
<table>
@@ -493,11 +491,26 @@
<entry>
null (as of PHP 7)
</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </para>
+ <para>
+ The following list of words have had soft reservations placed on them.
+ Whilst they may still be used as class, interface, and trait names (as well
+ as in namespaces), usage of them is highly discouraged since they may be
+ used in future versions of PHP.
+ </para>
+ <para>
+ <table>
+ <title>Soft reserved words</title>
+ <tgroup cols="5">
+ <tbody>
+ <row>
<entry>
resource (as of PHP 7)
</entry>
- </row>
- <row>
<entry>
object (as of PHP 7)
</entry>
@@ -515,7 +528,6 @@
</table>
</para>
</sect1>
-
</appendix>
<!-- Keep this comment at the end of the file