mirror of
https://github.com/sigmasternchen/php-doc-en
synced 2025-03-15 16:38:54 +00:00
Fix Doc Bug #62191: array missclassified as keyword
I merged the language construct list into the main keyword list, as the distinction makes no sense. All keywords listed are part of a language construct of some sorts. Also I added the new PHP 5.4 keywords callable, insteadof and trait and removed the PHP 4 keywords cfunction and old_function (as well as the "as of PHP 5" inline changelog entries). git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@325969 c90b9560-bf6c-de11-be94-00142212c4b1
This commit is contained in:
Nikita Popov
parent
55713d3fa0
commit
e70f20002a
1 changed files with 91 additions and 91 deletions
|
|
@ -15,7 +15,7 @@
|
|||
<title>List of Keywords</title>
|
||||
<simpara>
|
||||
These words have special meaning in PHP. Some of them represent things
|
||||
which look like functions, some look like constants, and so on--but
|
||||
which look like functions, some look like constants, and so on - but
|
||||
they're not, really: they are language constructs. You cannot use any
|
||||
of the following words as constants, class names, function or method names.
|
||||
Using them as variable names is generally OK, but could lead to confusion.
|
||||
|
|
@ -27,7 +27,10 @@
|
|||
<tbody>
|
||||
<row>
|
||||
<entry>
|
||||
<link linkend="language.oop5.abstract">abstract</link> (as of PHP 5)
|
||||
<function>__halt_compiler</function>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.oop5.abstract">abstract</link>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.operators.logical">and</link>
|
||||
|
|
@ -38,28 +41,28 @@
|
|||
<entry>
|
||||
<link linkend="control-structures.foreach">as</link>
|
||||
</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>
|
||||
<link linkend="control-structures.break">break</link>
|
||||
</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>
|
||||
<link linkend="language.types.callable">callable</link> (as of PHP 5.4)
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="control-structures.switch">case</link>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.exceptions">catch</link> (as of PHP 5)
|
||||
</entry>
|
||||
<entry>
|
||||
cfunction (PHP 4 only)
|
||||
<link linkend="language.exceptions">catch</link>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="keyword.class">class</link>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.oop5.cloning">clone</link> (as of PHP 5)
|
||||
</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>
|
||||
<link linkend="language.oop5.cloning">clone</link>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.oop5.constants">const</link>
|
||||
</entry>
|
||||
|
|
@ -72,17 +75,28 @@
|
|||
<entry>
|
||||
<link linkend="control-structures.switch">default</link>
|
||||
</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>
|
||||
<function>die</function>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="control-structures.do.while">do</link>
|
||||
</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>
|
||||
<function>echo</function>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="control-structures.else">else</link>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="control-structures.elseif">elseif</link>
|
||||
</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>
|
||||
<function>empty</function>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="control-structures.declare">enddeclare</link>
|
||||
</entry>
|
||||
|
|
@ -92,11 +106,11 @@
|
|||
<entry>
|
||||
<link linkend="control-structures.alternative-syntax">endforeach</link>
|
||||
</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>
|
||||
<link linkend="control-structures.alternative-syntax">endif</link>
|
||||
</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>
|
||||
<link linkend="control-structures.alternative-syntax">endswitch</link>
|
||||
</entry>
|
||||
|
|
@ -104,13 +118,19 @@
|
|||
<link linkend="control-structures.alternative-syntax">endwhile</link>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="keyword.class">extends</link>
|
||||
<function>eval</function>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.oop5.final">final</link> (as of PHP 5)
|
||||
<function>exit</function>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="keyword.class">extends</link>
|
||||
</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>
|
||||
<link linkend="language.oop5.final">final</link>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="control-structures.for">for</link>
|
||||
</entry>
|
||||
|
|
@ -123,22 +143,39 @@
|
|||
<entry>
|
||||
<link linkend="language.variables.scope">global</link>
|
||||
</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>
|
||||
<link linkend="control-structures.goto">goto</link> (as of PHP 5.3)
|
||||
</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>
|
||||
<link linkend="control-structures.if">if</link>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.oop5.interfaces">implements</link> (as of PHP 5)
|
||||
<link linkend="language.oop5.interfaces">implements</link>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.oop5.interfaces">interface</link> (as of PHP 5)
|
||||
<function>include</function>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.operators.type">instanceof</link> (as of PHP 5)
|
||||
<function>include_once</function>
|
||||
</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>
|
||||
<link linkend="language.operators.type">instanceof</link>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.oop5.traits.conflict">insteadof</link> (as of PHP 5.4)
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.oop5.interfaces">interface</link>
|
||||
</entry>
|
||||
<entry>
|
||||
<function>isset</function>
|
||||
</entry>
|
||||
<entry>
|
||||
<function>list</function>
|
||||
</entry>
|
||||
</row>
|
||||
<row>
|
||||
|
|
@ -148,23 +185,34 @@
|
|||
<entry>
|
||||
<link linkend="keyword.class">new</link>
|
||||
</entry>
|
||||
<entry>
|
||||
old_function (PHP 4 only)
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.operators.logical">or</link>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.oop5.visibility">private</link> (as of PHP 5)
|
||||
<function>print</function>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.oop5.visibility">private</link>
|
||||
</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>
|
||||
<link linkend="language.oop5.visibility">protected</link> (as of PHP 5)
|
||||
<link linkend="language.oop5.visibility">protected</link>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.oop5.visibility">public</link> (as of PHP 5)
|
||||
<link linkend="language.oop5.visibility">public</link>
|
||||
</entry>
|
||||
<entry>
|
||||
<function>require</function>
|
||||
</entry>
|
||||
<entry>
|
||||
<function>require_once</function>
|
||||
</entry>
|
||||
<entry>
|
||||
<function>return</function>
|
||||
</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>
|
||||
<link linkend="language.variables.scope">static</link>
|
||||
</entry>
|
||||
|
|
@ -172,12 +220,18 @@
|
|||
<link linkend="control-structures.switch">switch</link>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.exceptions">throw</link> (as of PHP 5)
|
||||
<link linkend="language.exceptions">throw</link>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.oop5.traits">trait</link> (as of PHP 5.4)
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.exceptions">try</link>
|
||||
</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>
|
||||
<link linkend="language.exceptions">try</link> (as of PHP 5)
|
||||
<function>unset</function>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.namespaces">use</link>
|
||||
|
|
@ -195,6 +249,7 @@
|
|||
</tbody>
|
||||
</tgroup>
|
||||
</table>
|
||||
|
||||
<table>
|
||||
<title>Compile-time constants</title>
|
||||
<tgroup cols="5">
|
||||
|
|
@ -210,10 +265,10 @@
|
|||
<link linkend="language.constants.predefined">__FILE__</link>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.constants.predefined">__LINE__</link>
|
||||
<link linkend="language.constants.predefined">__FUNCTION__</link>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.constants.predefined">__FUNCTION__</link>
|
||||
<link linkend="language.constants.predefined">__LINE__</link>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.constants.predefined">__METHOD__</link>
|
||||
|
|
@ -221,7 +276,10 @@
|
|||
</row>
|
||||
<row>
|
||||
<entry>
|
||||
<link linkend="language.namespaces">__NAMESPACE__</link> (as of PHP 5.3)
|
||||
<link linkend="language.namespaces.nsconstants">__NAMESPACE__</link> (as of PHP 5.3)
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.constants.predefined">__TRAIT__</link> (as of PHP 5.4)
|
||||
</entry>
|
||||
<entry>
|
||||
</entry>
|
||||
|
|
@ -235,64 +293,6 @@
|
|||
</tbody>
|
||||
</tgroup>
|
||||
</table>
|
||||
<table>
|
||||
<title>Language constructs</title>
|
||||
<tgroup cols="5">
|
||||
<tbody>
|
||||
<row>
|
||||
<entry>
|
||||
<function>die</function>
|
||||
</entry>
|
||||
<entry>
|
||||
<function>echo</function>
|
||||
</entry>
|
||||
<entry>
|
||||
<function>empty</function>
|
||||
</entry>
|
||||
<entry>
|
||||
<function>exit</function>
|
||||
</entry>
|
||||
<entry>
|
||||
<function>eval</function>
|
||||
</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>
|
||||
<function>include</function>
|
||||
</entry>
|
||||
<entry>
|
||||
<function>include_once</function>
|
||||
</entry>
|
||||
<entry>
|
||||
<function>isset</function>
|
||||
</entry>
|
||||
<entry>
|
||||
<function>list</function>
|
||||
</entry>
|
||||
<entry>
|
||||
<function>require</function>
|
||||
</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>
|
||||
<function>require_once</function>
|
||||
</entry>
|
||||
<entry>
|
||||
<function>return</function>
|
||||
</entry>
|
||||
<entry>
|
||||
<function>print</function>
|
||||
</entry>
|
||||
<entry>
|
||||
<function>unset</function>
|
||||
</entry>
|
||||
<entry>
|
||||
<function>__halt_compiler</function>
|
||||
</entry>
|
||||
</row>
|
||||
</tbody>
|
||||
</tgroup>
|
||||
</table>
|
||||
</sect1>
|
||||
|
||||
<sect1 xml:id="reserved.classes">
|
||||
|
|
|
|||
Loading…
Reference in a new issue