From 521b5b67c33fdf574427791e171bdde52fe1bf73 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <vrana@php.net>
Date: Wed, 20 Jun 2012 06:51:11 +0000
Subject: [PATCH] PHP 5.4 tokens

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@326263 c90b9560-bf6c-de11-be94-00142212c4b1
---
 appendices/tokens.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/appendices/tokens.xml b/appendices/tokens.xml
index 819bb372b7..16c0dece37 100644
--- a/appendices/tokens.xml
+++ b/appendices/tokens.xml
@@ -408,6 +408,11 @@
       (available since PHP 5.0.0)
      </entry>
     </row>
+    <row>
+     <entry><constant>T_INSTEADOF</constant></entry>
+     <entry>insteadof</entry>
+     <entry><xref linkend="language.oop5.traits"/> (available since PHP 5.4.0)</entry>
+    </row>
     <row>
      <entry><constant>T_INT_CAST</constant></entry>
      <entry>(int) or (integer)</entry>
@@ -704,6 +709,16 @@
      <entry>throw</entry>
      <entry><xref linkend="language.exceptions"/> (available since PHP 5.0.0)</entry>
     </row>
+    <row>
+     <entry><constant>T_TRAIT</constant></entry>
+     <entry>trait</entry>
+     <entry><xref linkend="language.oop5.traits"/> (available since PHP 5.4.0)</entry>
+    </row>
+    <row>
+     <entry><constant>T_TRAIT_C</constant></entry>
+     <entry>__TRAIT__</entry>
+     <entry><link linkend="constant.trait">__TRAIT__</link> (available since PHP 5.4.0)</entry>
+    </row>
     <row>
      <entry><constant>T_TRY</constant></entry>
      <entry>try</entry>