Update to PEAR 1.7.2, Image_Canvas 0.3.1, Image_Color 1.0.3, Image_Graph 0.7.2, XML_Parser 1.3.1.

Removed PHP_Compat, and references to it. Removed ionCube/Zend/mmCache compatibility checks in test.php script. Changed minimum PHP requirement to 5.0 in test.php script.
2009-01-04 19:22:54 -05:00
parent 60b674c776
commit fae6352bf2
384 changed files with 34150 additions and 44524 deletions
--- a/includes/pear/PEAR/Task/Common.php
+++ b/includes/pear/PEAR/Task/Common.php
@@ -13,9 +13,9 @@
 * @category   pear
 * @package    PEAR
 * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2005 The PHP Group
+ * @copyright  1997-2008 The PHP Group
 * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Common.php,v 1.14 2005/09/18 06:32:00 cellog Exp $
+ * @version    CVS: $Id: Common.php,v 1.18 2008/05/13 21:28:20 cellog Exp $
 * @link       http://pear.php.net/package/PEAR
 * @since      File available since Release 1.4.0a1
 */
@@ -51,9 +51,9 @@ define('PEAR_TASK_PACKAGEANDINSTALL', 3);
 * @category   pear
 * @package    PEAR
 * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2005 The PHP Group
+ * @copyright  1997-2008 The PHP Group
 * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.4.5
+ * @version    Release: 1.7.2
 * @link       http://pear.php.net/package/PEAR
 * @since      Class available since Release 1.4.0a1
 * @abstract
@@ -121,7 +121,7 @@ class PEAR_Task_Common
     * @static
     * @abstract
     */
-    function validXml($pkg, $xml, &$config, $fileXml)
+    function validateXml($pkg, $xml, $config, $fileXml)
    {
    }

--- a/includes/pear/PEAR/Task/Postinstallscript.php
+++ b/includes/pear/PEAR/Task/Postinstallscript.php
@@ -13,9 +13,9 @@
 * @category   pear
 * @package    PEAR
 * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2005 The PHP Group
+ * @copyright  1997-2008 The PHP Group
 * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Postinstallscript.php,v 1.16 2005/10/19 04:52:54 cellog Exp $
+ * @version    CVS: $Id: Postinstallscript.php,v 1.20 2008/05/13 21:28:20 cellog Exp $
 * @link       http://pear.php.net/package/PEAR
 * @since      File available since Release 1.4.0a1
 */
@@ -31,9 +31,9 @@ require_once 'PEAR/Task/Common.php';
 * @category   pear
 * @package    PEAR
 * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2005 The PHP Group
+ * @copyright  1997-2008 The PHP Group
 * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.4.5
+ * @version    Release: 1.7.2
 * @link       http://pear.php.net/package/PEAR
 * @since      Class available since Release 1.4.0a1
 */
@@ -62,7 +62,7 @@ class PEAR_Task_Postinstallscript extends PEAR_Task_Common
     * @param array the entire parsed <file> tag
     * @static
     */
-    function validateXml($pkg, $xml, &$config, $fileXml)
+    function validateXml($pkg, $xml, $config, $fileXml)
    {
        if ($fileXml['role'] != 'php') {
            return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
@@ -80,10 +80,14 @@ class PEAR_Task_Postinstallscript extends PEAR_Task_Common
                $fileXml['name'] . '" could not be retrieved for processing!');
        } else {
            $analysis = $pkg->analyzeSourceCode($file, true);
-            if (PEAR::isError($analysis)) {
+            if (!$analysis) {
                PEAR::popErrorHandling();
+                $warnings = '';
+                foreach ($pkg->getValidationWarnings() as $warn) {
+                    $warnings .= $warn['message'] . "\n";
+                }
                return array(PEAR_TASK_ERROR_INVALID, 'Analysis of post-install script "' .
-                    $fileXml['name'] . '" failed');
+                    $fileXml['name'] . '" failed: ' . $warnings);
            }
            if (count($analysis['declared_classes']) != 1) {
                PEAR::popErrorHandling();
--- a/includes/pear/PEAR/Task/Postinstallscript/rw.php
+++ b/includes/pear/PEAR/Task/Postinstallscript/rw.php
@@ -13,9 +13,9 @@
 * @category   pear
 * @package    PEAR
 * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2005 The PHP Group
+ * @copyright  1997-2008 The PHP Group
 * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: rw.php,v 1.10 2005/10/19 04:47:34 cellog Exp $
+ * @version    CVS: $Id: rw.php,v 1.12 2008/01/03 20:26:37 cellog Exp $
 * @link       http://pear.php.net/package/PEAR
 * @since      File available since Release 1.4.0a10
 */
@@ -28,9 +28,9 @@ require_once 'PEAR/Task/Postinstallscript.php';
 * @category   pear
 * @package    PEAR
 * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2005 The PHP Group
+ * @copyright  1997-2008 The PHP Group
 * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.4.5
+ * @version    Release: 1.7.2
 * @link       http://pear.php.net/package/PEAR
 * @since      Class available since Release 1.4.0a10
 */
--- a/includes/pear/PEAR/Task/Replace.php
+++ b/includes/pear/PEAR/Task/Replace.php
@@ -13,9 +13,9 @@
 * @category   pear
 * @package    PEAR
 * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2005 The PHP Group
+ * @copyright  1997-2008 The PHP Group
 * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Replace.php,v 1.12 2005/10/02 06:29:39 cellog Exp $
+ * @version    CVS: $Id: Replace.php,v 1.17 2008/05/13 21:28:20 cellog Exp $
 * @link       http://pear.php.net/package/PEAR
 * @since      File available since Release 1.4.0a1
 */
@@ -28,9 +28,9 @@ require_once 'PEAR/Task/Common.php';
 * @category   pear
 * @package    PEAR
 * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2005 The PHP Group
+ * @copyright  1997-2008 The PHP Group
 * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.4.5
+ * @version    Release: 1.7.2
 * @link       http://pear.php.net/package/PEAR
 * @since      Class available since Release 1.4.0a1
 */
@@ -47,7 +47,7 @@ class PEAR_Task_Replace extends PEAR_Task_Common
     * @param PEAR_Config
     * @static
     */
-    function validateXml($pkg, $xml, &$config, $fileXml)
+    function validateXml($pkg, $xml, $config, $fileXml)
    {
        if (!isset($xml['attribs'])) {
            return array(PEAR_TASK_ERROR_NOATTRIBS);
@@ -89,7 +89,7 @@ class PEAR_Task_Replace extends PEAR_Task_Common
            }
        } else {
            return array(PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE, 'type', $xml['attribs']['type'],
-                array('pear-config', 'package-info'));
+                array('pear-config', 'package-info', 'php-const'));
        }
        return true;
    }
@@ -126,7 +126,7 @@ class PEAR_Task_Replace extends PEAR_Task_Common
                }
                if ($a['to'] == 'master_server') {
                    $chan = $this->registry->getChannel($pkg->getChannel());
-                    if ($chan) {
+                    if (!PEAR::isError($chan)) {
                        $to = $chan->getServer();
                    } else {
                        $this->logger->log(0, "$dest: invalid pear-config replacement: $a[to]");
--- a/includes/pear/PEAR/Task/Replace/rw.php
+++ b/includes/pear/PEAR/Task/Replace/rw.php
@@ -13,9 +13,9 @@
 * @category   pear
 * @package    PEAR
 * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2005 The PHP Group
+ * @copyright  1997-2008 The PHP Group
 * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: rw.php,v 1.2 2005/05/20 22:57:42 cellog Exp $
+ * @version    CVS: $Id: rw.php,v 1.4 2008/01/03 20:26:37 cellog Exp $
 * @link       http://pear.php.net/package/PEAR
 * @since      File available since Release 1.4.0a10
 */
@@ -28,9 +28,9 @@ require_once 'PEAR/Task/Replace.php';
 * @category   pear
 * @package    PEAR
 * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2005 The PHP Group
+ * @copyright  1997-2008 The PHP Group
 * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.4.5
+ * @version    Release: 1.7.2
 * @link       http://pear.php.net/package/PEAR
 * @since      Class available since Release 1.4.0a10
 */
--- a/includes/pear/PEAR/Task/Unixeol.php
+++ b/includes/pear/PEAR/Task/Unixeol.php
@@ -13,9 +13,9 @@
 * @category   pear
 * @package    PEAR
 * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2005 The PHP Group
+ * @copyright  1997-2008 The PHP Group
 * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Unixeol.php,v 1.7 2005/10/02 06:29:39 cellog Exp $
+ * @version    CVS: $Id: Unixeol.php,v 1.10 2008/05/13 21:28:20 cellog Exp $
 * @link       http://pear.php.net/package/PEAR
 * @since      File available since Release 1.4.0a1
 */
@@ -28,9 +28,9 @@ require_once 'PEAR/Task/Common.php';
 * @category   pear
 * @package    PEAR
 * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2005 The PHP Group
+ * @copyright  1997-2008 The PHP Group
 * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.4.5
+ * @version    Release: 1.7.2
 * @link       http://pear.php.net/package/PEAR
 * @since      Class available since Release 1.4.0a1
 */
@@ -47,7 +47,7 @@ class PEAR_Task_Unixeol extends PEAR_Task_Common
     * @param PEAR_Config
     * @static
     */
-    function validateXml($pkg, $xml, &$config, $fileXml)
+    function validateXml($pkg, $xml, $config, $fileXml)
    {
        if ($xml != '') {
            return array(PEAR_TASK_ERROR_INVALID, 'no attributes allowed');
--- a/includes/pear/PEAR/Task/Unixeol/rw.php
+++ b/includes/pear/PEAR/Task/Unixeol/rw.php
@@ -13,9 +13,9 @@
 * @category   pear
 * @package    PEAR
 * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2005 The PHP Group
+ * @copyright  1997-2008 The PHP Group
 * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: rw.php,v 1.3 2005/10/18 23:42:13 cellog Exp $
+ * @version    CVS: $Id: rw.php,v 1.5 2008/01/03 20:26:37 cellog Exp $
 * @link       http://pear.php.net/package/PEAR
 * @since      File available since Release 1.4.0a10
 */
@@ -28,9 +28,9 @@ require_once 'PEAR/Task/Unixeol.php';
 * @category   pear
 * @package    PEAR
 * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2005 The PHP Group
+ * @copyright  1997-2008 The PHP Group
 * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.4.5
+ * @version    Release: 1.7.2
 * @link       http://pear.php.net/package/PEAR
 * @since      Class available since Release 1.4.0a10
 */
--- a/includes/pear/PEAR/Task/Windowseol.php
+++ b/includes/pear/PEAR/Task/Windowseol.php
@@ -13,9 +13,9 @@
 * @category   pear
 * @package    PEAR
 * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2005 The PHP Group
+ * @copyright  1997-2008 The PHP Group
 * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Windowseol.php,v 1.6 2005/10/02 06:29:39 cellog Exp $
+ * @version    CVS: $Id: Windowseol.php,v 1.9 2008/05/13 21:28:20 cellog Exp $
 * @link       http://pear.php.net/package/PEAR
 * @since      File available since Release 1.4.0a1
 */
@@ -28,9 +28,9 @@ require_once 'PEAR/Task/Common.php';
 * @category   pear
 * @package    PEAR
 * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2005 The PHP Group
+ * @copyright  1997-2008 The PHP Group
 * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.4.5
+ * @version    Release: 1.7.2
 * @link       http://pear.php.net/package/PEAR
 * @since      Class available since Release 1.4.0a1
 */
@@ -47,7 +47,7 @@ class PEAR_Task_Windowseol extends PEAR_Task_Common
     * @param PEAR_Config
     * @static
     */
-    function validateXml($pkg, $xml, &$config, $fileXml)
+    function validateXml($pkg, $xml, $config, $fileXml)
    {
        if ($xml != '') {
            return array(PEAR_TASK_ERROR_INVALID, 'no attributes allowed');
--- a/includes/pear/PEAR/Task/Windowseol/rw.php
+++ b/includes/pear/PEAR/Task/Windowseol/rw.php
@@ -13,9 +13,9 @@
 * @category   pear
 * @package    PEAR
 * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2005 The PHP Group
+ * @copyright  1997-2008 The PHP Group
 * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: rw.php,v 1.3 2005/10/18 23:42:00 cellog Exp $
+ * @version    CVS: $Id: rw.php,v 1.5 2008/01/03 20:26:37 cellog Exp $
 * @link       http://pear.php.net/package/PEAR
 * @since      File available since Release 1.4.0a10
 */
@@ -28,9 +28,9 @@ require_once 'PEAR/Task/Windowseol.php';
 * @category   pear
 * @package    PEAR
 * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2005 The PHP Group
+ * @copyright  1997-2008 The PHP Group
 * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.4.5
+ * @version    Release: 1.7.2
 * @link       http://pear.php.net/package/PEAR
 * @since      Class available since Release 1.4.0a10
 */