mirror of
https://github.com/sigmasternchen/php-doc-en
synced 2025-03-16 00:48:54 +00:00
Return old_function, mark PHP 5 keywords, add more PHP 5 keywords
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@169697 c90b9560-bf6c-de11-be94-00142212c4b1
This commit is contained in:
parent
78cf139559
commit
5b435385c5
2 changed files with 35 additions and 11 deletions
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||
<!-- $Revision: 1.37 $ -->
|
||||
<!-- $Revision: 1.38 $ -->
|
||||
<appendix id="migration5">
|
||||
<title>Migrating from PHP 4 to PHP 5</title>
|
||||
|
||||
|
@ -24,6 +24,12 @@
|
|||
pay attention to the following backward incompatible changes:
|
||||
</para>
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<simpara>
|
||||
There are some <link linkend="reserved.keywords">new reserved
|
||||
keywords</link>.
|
||||
</simpara>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<simpara>
|
||||
<function>strrpos</function> and <function>strripos</function> now use
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||
<!-- $Revision: 1.48 $ -->
|
||||
<!-- $Revision: 1.49 $ -->
|
||||
|
||||
<appendix id="reserved">
|
||||
<title>List of Reserved Words</title>
|
||||
|
@ -39,7 +39,7 @@
|
|||
<link linkend="language.constants.predefined">__FILE__</link>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="reserved.classes.php5">exception</link>
|
||||
<link linkend="reserved.classes.php5">exception</link> (PHP 5)
|
||||
</entry>
|
||||
</row>
|
||||
<row>
|
||||
|
@ -206,37 +206,55 @@
|
|||
<link linkend="language.constants.predefined">__METHOD__</link>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.oop5.final">final</link>
|
||||
<link linkend="language.oop5.final">final</link> (PHP 5)
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="reserved.classes.php5">php_user_filter</link>
|
||||
<link linkend="reserved.classes.php5">php_user_filter</link> (PHP 5)
|
||||
</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>
|
||||
<link linkend="language.oop5.interfaces">interface</link>
|
||||
<link linkend="language.oop5.interfaces">interface</link> (PHP 5)
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.oop5.interfaces">implements</link>
|
||||
<link linkend="language.oop5.interfaces">implements</link> (PHP 5)
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.oop5.basic">extends</link>
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.oop5.visibility">public</link>
|
||||
<link linkend="language.oop5.visibility">public</link> (PHP 5)
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.oop5.visibility">private</link>
|
||||
<link linkend="language.oop5.visibility">private</link> (PHP 5)
|
||||
</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>
|
||||
<link linkend="language.oop5.visibility">protected</link>
|
||||
<link linkend="language.oop5.visibility">protected</link> (PHP 5)
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="language.oop5.abstract">abstract</link>
|
||||
<link linkend="language.oop5.abstract">abstract</link> (PHP 5)
|
||||
</entry>
|
||||
<entry>
|
||||
clone (PHP 5)
|
||||
</entry>
|
||||
<entry>
|
||||
try (PHP 5)
|
||||
</entry>
|
||||
<entry>
|
||||
catch (PHP 5)
|
||||
</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>
|
||||
throw (PHP 5)
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="migration.old-function">cfunction</link> (PHP 4 only)
|
||||
</entry>
|
||||
<entry>
|
||||
<link linkend="migration.old-function">old_function</link> (PHP 4 only)
|
||||
</entry>
|
||||
<entry>
|
||||
</entry>
|
||||
|
|
Loading…
Reference in a new issue