vrana Fri Oct 1 04:07:19 2004 EDT
Modified files:
/phpdoc/en/appendices migration5.xml reserved.xml
Log:
Return old_function, mark PHP 5 keywords, add more PHP 5 keywords
http://cvs.php.net/diff.php/phpdoc/en/appendices/migration5.xml?r1=1.37&r2=1.38&ty=u
Index: phpdoc/en/appendices/migration5.xml
diff -u phpdoc/en/appendices/migration5.xml:1.37
phpdoc/en/appendices/migration5.xml:1.38
--- phpdoc/en/appendices/migration5.xml:1.37 Sun Sep 12 05:57:43 2004
+++ phpdoc/en/appendices/migration5.xml Fri Oct 1 04:07:16 2004
@@ -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
http://cvs.php.net/diff.php/phpdoc/en/appendices/reserved.xml?r1=1.48&r2=1.49&ty=u
Index: phpdoc/en/appendices/reserved.xml
diff -u phpdoc/en/appendices/reserved.xml:1.48 phpdoc/en/appendices/reserved.xml:1.49
--- phpdoc/en/appendices/reserved.xml:1.48 Thu Sep 30 09:44:04 2004
+++ phpdoc/en/appendices/reserved.xml Fri Oct 1 04:07:16 2004
@@ -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>
