From: Pierre Joye <pajoye@php.net>
Date: Sun, 25 Jan 2004 23:42:43 +0000 (+0000)
Subject: MFH
X-Git-Tag: php-4.3.5RC2~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aef84ceb0033324fc8da4400a62a655004d5d2f3;p=php

MFH
---

diff --git a/pear/CMD.php b/pear/CMD.php
index ea578b29c2..7e82ff24b5 100755
--- a/pear/CMD.php
+++ b/pear/CMD.php
@@ -1,7 +1,7 @@
 <?php
 //
 // +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
+// | PHP Version 5                                                        |
 // +----------------------------------------------------------------------+
 // | Copyright (c) 1997-2004 The PHP Group                                |
 // +----------------------------------------------------------------------+
diff --git a/pear/CODING_STANDARDS b/pear/CODING_STANDARDS
index b42a70fbb8..b443ea8004 100644
--- a/pear/CODING_STANDARDS
+++ b/pear/CODING_STANDARDS
@@ -1,5 +1,5 @@
 ===========================================================================
-|| PEAR Coding Standards                                                 ||
+|  PEAR Coding Standards                                                  |
 ===========================================================================
 
 $Id$
diff --git a/pear/PEAR.php b/pear/PEAR.php
index fcdf3ac36a..7af397313c 100644
--- a/pear/PEAR.php
+++ b/pear/PEAR.php
@@ -232,8 +232,8 @@ class PEAR
      */
     function isError($data, $code = null)
     {
-        if (is_object($data) && (get_class($data) == 'pear_error' ||
-                                 is_subclass_of($data, 'pear_error'))) {
+        if (is_object($data) && (strtolower(get_class($data)) == 'pear_error' ||
+                                 is_subclass_of($data, 'PEAR_Error'))) {
             if (is_null($code)) {
                 return true;
             } elseif (is_string($code)) {
@@ -290,7 +290,7 @@ class PEAR
     function setErrorHandling($mode = null, $options = null)
     {
         if (isset($this) &&
-            (get_class($this) == 'pear' || is_subclass_of($this, 'pear'))) {
+            (strtolower(get_class($this)) == 'pear' || is_subclass_of($this, 'PEAR'))) {
             $setmode     = &$this->_default_error_mode;
             $setoptions  = &$this->_default_error_options;
         } else {
@@ -416,7 +416,7 @@ class PEAR
             // $error_code is a non-empty array here;
             // we walk through it trying to unset all
             // values
-            foreach($error_code AS $key => $error) {
+            foreach($error_code as $key => $error) {
                 if ($this->_checkDelExpect($error)) {
                     $deleted =  true;
                 } else {
@@ -538,7 +538,7 @@ class PEAR
      * @param string $message
      *
      */
-    function &throwError($message = null,
+    function throwError($message = null,
                          $code = null,
                          $userinfo = null)
     {
@@ -568,7 +568,7 @@ class PEAR
     {
         $stack = &$GLOBALS['_PEAR_error_handler_stack'];
         if (isset($this) &&
-            (get_class($this) == 'pear' || is_subclass_of($this, 'pear'))) {
+            (strtolower(get_class($this)) == 'pear' || is_subclass_of($this, 'PEAR'))) {
             $def_mode    = &$this->_default_error_mode;
             $def_options = &$this->_default_error_options;
         } else {
@@ -578,7 +578,7 @@ class PEAR
         $stack[] = array($def_mode, $def_options);
 
         if (isset($this) &&
-            (get_class($this) == 'pear' || is_subclass_of($this, 'pear'))) {
+            (strtolower(get_class($this)) == 'pear' || is_subclass_of($this, 'PEAR'))) {
             $this->setErrorHandling($mode, $options);
         } else {
             PEAR::setErrorHandling($mode, $options);
@@ -604,7 +604,7 @@ class PEAR
         list($mode, $options) = $stack[sizeof($stack) - 1];
         array_pop($stack);
         if (isset($this) &&
-            (get_class($this) == 'pear' || is_subclass_of($this, 'pear'))) {
+            (strtolower(get_class($this)) == 'pear' || is_subclass_of($this, 'PEAR'))) {
             $this->setErrorHandling($mode, $options);
         } else {
             PEAR::setErrorHandling($mode, $options);
diff --git a/pear/System.php b/pear/System.php
index 2881a6a17a..1d5cd55aed 100644
--- a/pear/System.php
+++ b/pear/System.php
@@ -1,7 +1,7 @@
 <?php
 //
 // +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
+// | PHP Version 5                                                        |
 // +----------------------------------------------------------------------+
 // | Copyright (c) 1997-2004 The PHP Group                                |
 // +----------------------------------------------------------------------+
@@ -68,7 +68,7 @@ class System
         if (!is_array($argv) && $argv !== null) {
             $argv = preg_split('/\s+/', $argv);
         }
-        return Console_Getopt::getopt($argv, $short_options);
+        return Console_Getopt::getopt2($argv, $short_options);
     }
 
     /**
@@ -226,6 +226,14 @@ class System
             if ($opt[0] == 'p') {
                 $create_parents = true;
             } elseif($opt[0] == 'm') {
+                // if the mode is clearly an octal number (starts with 0)
+                // convert it to decimal
+                if (strlen($opt[1]) && $opt[1]{0} == '0') {
+                    $opt[1] = octdec($opt[1]);
+                } else {
+                    // convert to int
+                    $opt[1] += 0;
+                }
                 $mode = $opt[1];
             }
         }
diff --git a/pear/package-Console_Getopt.xml b/pear/package-Console_Getopt.xml
index fa3275c2f3..57769e6b92 100644
--- a/pear/package-Console_Getopt.xml
+++ b/pear/package-Console_Getopt.xml
@@ -21,6 +21,12 @@ short and long options.</description>
       <name>Stig Bakken</name>
       <email>stig@php.net</email>
     </maintainer>
+    <maintainer>
+      <user>cellog</user>
+      <role>helper</role>
+      <name>Greg Beaver</name>
+      <email>cellog@php.net</email>
+    </maintainer>
   </maintainers>
   <release>
     <version>1.2</version>
@@ -28,9 +34,9 @@ short and long options.</description>
     <notes>Fix to preserve BC with 1.0 and allow correct behaviour for new users</notes>
     <state>stable</state>
     <filelist>
-     <dir name="Console">
-      <file role="php" name="Getopt.php"/>
-     </dir>
+      <dir name="Console">
+        <file role="php" name="Getopt.php"/>
+      </dir>
     </filelist>
   </release>
   <changelog>
@@ -46,29 +52,29 @@ short and long options.</description>
       </filelist>
     </release>
    <release>
-     <version>0.11</version>
-     <date>2002-05-26</date>
-     <notes>POSIX getopt compatibility fix: treat first element of args
-       array as command name
-     </notes>
-     <state>beta</state>
-     <filelist>
-       <dir name="Console">
-         <file role="php" name="Getopt.php"/>
-       </dir>
-     </filelist>
-   </release>
-   <release>
-     <version>0.10</version>
-     <date>2002-05-12</date>
-     <notes>Packaging fix</notes>
-     <state>beta</state>
-   </release>
-   <release>
-     <version>0.9</version>
-     <date>2002-05-12</date>
-     <notes>Initial release</notes>
-     <state>beta</state>
-   </release>
+      <version>0.11</version>
+      <date>2002-05-26</date>
+      <notes>POSIX getopt compatibility fix: treat first element of args
+        array as command name
+      </notes>
+      <state>beta</state>
+      <filelist>
+        <dir name="Console">
+          <file role="php" name="Getopt.php"/>
+        </dir>
+      </filelist>
+    </release>
+    <release>
+      <version>0.10</version>
+      <date>2002-05-12</date>
+      <notes>Packaging fix</notes>
+      <state>beta</state>
+    </release>
+    <release>
+      <version>0.9</version>
+      <date>2002-05-12</date>
+      <notes>Initial release</notes>
+      <state>beta</state>
+    </release>
   </changelog>
- </package>
+</package>
diff --git a/pear/package-PEAR.xml b/pear/package-PEAR.xml
index 16a6b2b88b..bed951bb13 100644
--- a/pear/package-PEAR.xml
+++ b/pear/package-PEAR.xml
@@ -47,8 +47,8 @@
     </maintainer>
   </maintainers>
   <release>
-    <version>1.3b5</version>
-    <date>2003-12-19</date>
+    <version>1.3b6</version>
+    <date>2004-01-26</date>
     <state>beta</state>
     <notes>
 PEAR Installer:
@@ -58,6 +58,7 @@ PEAR Installer:
 * Bug #248 --force command does not work as expected
 * Bug #293 [Patch] PEAR_Error not calling static method callbacks for error-handler
 * Bug #324 pear -G gives Fatal Error (PHP-GTK not installed, but error is at engine level)
+* Bug #594 PEAR_Common::analyzeSourceCode fails on string with $var and {
 * Moved download code into its own class
 * Fully unit tested the installer, packager, downloader, and PEAR_Common
 
@@ -125,8 +126,8 @@ PEAR Installer:
       <dep type="pkg" rel="ge" version="1.1">Archive_Tar</dep>
       <dep type="pkg" rel="ge" version="1.2">Console_Getopt</dep>
       <dep type="pkg" rel="ge" version="1.0.4">XML_RPC</dep>
-      <dep type="ext" rel="has" optional="yes">xmlrpc</dep>
       <dep type="ext" rel="has">xml</dep>
+      <dep type="ext" rel="has">pcre</dep>
     </deps>
   </release>
 </package>
diff --git a/pear/package.dtd b/pear/package.dtd
index 2474efadfa..0c4c667a5d 100644
--- a/pear/package.dtd
+++ b/pear/package.dtd
@@ -1,5 +1,5 @@
 <!--
-     $Id: package.dtd,v 1.27.4.9 2004-01-25 23:35:02 pajoye Exp $
+     $Id: package.dtd,v 1.27.4.10 2004-01-25 23:42:43 pajoye Exp $
 
      This is the PEAR package description, version 1.0.
      It should be used with the informal public identifier: