svn: /pear/pear-core/tags/PEAR-1.9.2/PEAR/PackageFile/v2/ Validator.php

[email protected] (Helgi Þormar Þorbjörnsson) Sun, 27 Feb 2011 18:58:21 +0000
Newsgroups php.pear.cvs,php.pear.core
Message-ID <[email protected]>
dufuz                                    Sun, 27 Feb 2011 18:58:21 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=308729

Log:
Fixed Bug #18218: "pear package" does not allow the use of late static binding [dufuz and Christer Edvartsen]

# Backported from trunk

Bug: http://pear.php.net/bugs/18218 (unknown) 
      
Changed paths:
    U   pear/pear-core/tags/PEAR-1.9.2/PEAR/PackageFile/v2/Validator.php

Modified: pear/pear-core/tags/PEAR-1.9.2/PEAR/PackageFile/v2/Validator.php
===================================================================
--- pear/pear-core/tags/PEAR-1.9.2/PEAR/PackageFile/v2/Validator.php	2011-02-27 18:58:02 UTC (rev 308728)
+++ pear/pear-core/tags/PEAR-1.9.2/PEAR/PackageFile/v2/Validator.php	2011-02-27 18:58:21 UTC (rev 308729)
@@ -2044,7 +2044,8 @@
                     }
                     continue 2;
                 case T_DOUBLE_COLON:
-                    if (!($tokens[$i - 1][0] == T_WHITESPACE || $tokens[$i - 1][0] == T_STRING)) {
+                    $token = $tokens[$i - 1][0];
+                    if (!($token == T_WHITESPACE || $token == T_STRING || $token == T_STATIC)) {
                         if (isset($this->_stack)) {
                             $this->_stack->push(__FUNCTION__, 'warning', array('file' => $file),
                                 'Parser error: invalid PHP found in file "%file%"');