From 29df5bf1c20e236ae1b30eefe7ccbedf1cde39d4 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Mon, 11 Jan 2010 13:19:46 +0100
Subject: Upgraded GeSHi to 1.0.8.6

---
 inc/geshi/php.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'inc/geshi/php.php')

diff --git a/inc/geshi/php.php b/inc/geshi/php.php
index b96c947ed..9b0bc822d 100644
--- a/inc/geshi/php.php
+++ b/inc/geshi/php.php
@@ -4,7 +4,7 @@
  * --------
  * Author: Nigel McNie (nigel@geshi.org)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.4
+ * Release Version: 1.0.8.6
  * Date Started: 2004/06/20
  *
  * PHP language file for GeSHi.
@@ -90,14 +90,14 @@ $language_data = array(
             'as','break','case','continue','default','do','else','elseif',
             'endfor','endforeach','endif','endswitch','endwhile','for',
             'foreach','if','include','include_once','require','require_once',
-            'return','switch','while',
+            'return','switch','throw','while',
 
             'echo','print'
             ),
         2 => array(
             '&amp;new','&lt;/script&gt;','&lt;?php','&lt;script language',
             'class','const','declare','extends','function','global','interface',
-            'namespace','new','private','public','self','var'
+            'namespace','new','private','protected','public','self','use','var'
             ),
         3 => array(
             'abs','acos','acosh','addcslashes','addslashes','aggregate',
@@ -1077,7 +1077,7 @@ $language_data = array(
         3 => array(
             '<script language="php">' => '</script>'
             ),
-        4 => "/(?<start><\\?(?>php\b)?)(?:".
+        4 => "/(?P<start><\\?(?>php\b)?)(?:".
             "(?>[^\"'?\\/<]+)|".
             "\\?(?!>)|".
             "(?>'(?>[^'\\\\]|\\\\'|\\\\\\\|\\\\)*')|".
@@ -1086,9 +1086,9 @@ $language_data = array(
             "\\/\\/(?>.*?$)|".
             "\\/(?=[^*\\/])|".
             "<(?!<<)|".
-            "<<<(?<phpdoc>\w+)\s.*?\s\k<phpdoc>".
-            ")*(?<end>\\?>|\Z)/sm",
-        5 => "/(?<start><%)(?:".
+            "<<<(?P<phpdoc>\w+)\s.*?\s\k<phpdoc>".
+            ")*(?P<end>\\?>|\Z)/sm",
+        5 => "/(?P<start><%)(?:".
             "(?>[^\"'%\\/<]+)|".
             "%(?!>)|".
             "(?>'(?>[^'\\\\]|\\\\'|\\\\\\\|\\\\)*')|".
@@ -1097,8 +1097,8 @@ $language_data = array(
             "\\/\\/(?>.*?$)|".
             "\\/(?=[^*\\/])|".
             "<(?!<<)|".
-            "<<<(?<phpdoc>\w+)\s.*?\s\k<phpdoc>".
-            ")*(?<end>%>)/sm",
+            "<<<(?P<phpdoc>\w+)\s.*?\s\k<phpdoc>".
+            ")*(?P<end>%>)/sm",
         ),
     'HIGHLIGHT_STRICT_BLOCK' => array(
         0 => true,
-- 
cgit v1.2.3