From 5b435385c5ba116ef47bcd7769fceed935b7fd94 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Fri, 1 Oct 2004 08:07:16 +0000 Subject: [PATCH] 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 --- appendices/migration5.xml | 8 +++++++- appendices/reserved.xml | 38 ++++++++++++++++++++++++++++---------- 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/appendices/migration5.xml b/appendices/migration5.xml index a9741d35d9..cc4c362a40 100755 --- a/appendices/migration5.xml +++ b/appendices/migration5.xml @@ -1,5 +1,5 @@ - + Migrating from PHP 4 to PHP 5 @@ -24,6 +24,12 @@ pay attention to the following backward incompatible changes: + + + There are some new reserved + keywords. + + strrpos and strripos now use diff --git a/appendices/reserved.xml b/appendices/reserved.xml index 3517bb4311..a7a5d96e1f 100755 --- a/appendices/reserved.xml +++ b/appendices/reserved.xml @@ -1,5 +1,5 @@ - + List of Reserved Words @@ -39,7 +39,7 @@ __FILE__ - exception + exception (PHP 5) @@ -206,37 +206,55 @@ __METHOD__ - final + final (PHP 5) - php_user_filter + php_user_filter (PHP 5) - interface + interface (PHP 5) - implements + implements (PHP 5) extends - public + public (PHP 5) - private + private (PHP 5) - protected + protected (PHP 5) - abstract + abstract (PHP 5) + clone (PHP 5) + + + try (PHP 5) + + + catch (PHP 5) + + + + + throw (PHP 5) + + + cfunction (PHP 4 only) + + + old_function (PHP 4 only)