WebSVN – Applications.gtt – Diff – /trunk/bibliotheque/pear/PEAR.php

+ *
  * PEAR class and PEAR_Error class
+ *
  * PHP versions 4 and 5
+ *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
  * @category   pear
  * @package    PEAR
  * @author     Sterling Hughes <sterling@php.net>
  * @author     Stig Bakken <ssb@php.net>
  * @author     Tomas V.V.Cox <cox@idecnet.com>
  * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2006 The PHP Group
+ * @copyright  1997-2010 The Authors
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: PEAR.php,v 1.101 2006/04/25 02:41:03 cellog Exp $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  */
  * WARNING: obsolete
  * @deprecated
  */
 define('PEAR_ERROR_EXCEPTION', 32);
 /**#@-*/
-define('PEAR_ZE2', (function_exists('version_compare') &&
-                    version_compare(zend_version(), "2-dev", "ge")));
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     define('OS_WINDOWS', true);
     define('OS_UNIX',    false);
     define('OS_WINDOWS', false);
     define('OS_UNIX',    true);
     define('PEAR_OS',    'Unix'); // blatant assumption
+}
-// instant backwards compatibility
-if (!defined('PATH_SEPARATOR')) {
-    if (OS_WINDOWS) {
-        define('PATH_SEPARATOR', ';');
-    } else {
-        define('PATH_SEPARATOR', ':');
-    }
-}
 $GLOBALS['_PEAR_default_error_mode']     = PEAR_ERROR_RETURN;
 $GLOBALS['_PEAR_default_error_options']  = E_USER_NOTICE;
 $GLOBALS['_PEAR_destructor_object_list'] = array();
 $GLOBALS['_PEAR_shutdown_funcs']         = array();
  * @package    PEAR
  * @author     Stig Bakken <ssb@php.net>
  * @author     Tomas V.V. Cox <cox@idecnet.com>
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.5.1
+ * @version    Release: 1.10.1
  * @link       http://pear.php.net/package/PEAR
  * @see        PEAR_Error
  * @since      Class available since PHP 4.0.2
  * @link        http://pear.php.net/manual/en/core.pear.php#core.pear.pear
  */
 class PEAR
+{
-    // {{{ properties
     /**
      * Whether to enable internal debug messages.
+     *
      * @var     bool
      * @access  private
      * @var     array
      * @access  private
      */
     var $_expected_errors = array();
+    /**
+     * List of methods that can be called both statically and non-statically.
-    // }}}
+     * @var array
+     */
+    protected static $bivalentMethods = array(
+        'setErrorHandling' => true,
+        'raiseError' => true,
+        'throwError' => true,
+        'pushErrorHandling' => true,
+        'popErrorHandling' => true,
-    // {{{ constructor
+    );
     /**
      * Constructor.  Registers this object in
      * @param string $error_class  (optional) which class to use for
      *        error objects, defaults to PEAR_Error.
      * @access public
      * @return void
      */
-    function PEAR($error_class = null)
+    function __construct($error_class = null)
+    {
         $classname = strtolower(get_class($this));
         if ($this->_debug) {
             print "PEAR constructor called, class=$classname\n";
+        }
         if ($error_class !== null) {
             $this->_error_class = $error_class;
+        }
         while ($classname && strcasecmp($classname, "pear")) {
             $destructor = "_$classname";
             if (method_exists($this, $destructor)) {
                 global $_PEAR_destructor_object_list;
                 $_PEAR_destructor_object_list[] = &$this;
                 $classname = get_parent_class($classname);
+            }
+        }
+    }
+    /**
+     * Only here for backwards compatibility.
+     * E.g. Archive_Tar calls $this->PEAR() in its constructor.
+     *
+     * @param string $error_class Which class to use for error objects,
+     *                            defaults to PEAR_Error.
+     */
+    public function PEAR($error_class = null)
-    // }}}
+    {
+        self::__construct($error_class);
     // {{{ destructor
     /**
      * Destructor (the emulated type of...).  Does nothing right now,
         if ($this->_debug) {
             printf("PEAR destructor called, class=%s\n", strtolower(get_class($this)));
+        }
+    }
+    public function __call($method, $arguments)
+    {
+        if (!isset(self::$bivalentMethods[$method])) {
+            trigger_error(
+                'Call to undefined method PEAR::' . $method . '()', E_USER_ERROR
+            );
+        }
+        return call_user_func_array(
+            array(get_class(), '_' . $method),
+            array_merge(array($this), $arguments)
+        );
+    }
+    public static function __callStatic($method, $arguments)
+    {
-    // }}}
+        if (!isset(self::$bivalentMethods[$method])) {
+            trigger_error(
+                'Call to undefined method PEAR::' . $method . '()', E_USER_ERROR
+            );
+        }
+        return call_user_func_array(
+            array(get_class(), '_' . $method),
+            array_merge(array(null), $arguments)
+        );
     // {{{ getStaticProperty()
     /**
     * If you have a class that's mostly/entirely static, and you need static
     * properties, you can use this method to simulate them. Eg. in your method(s)
     * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
-    * You MUST use a reference, or they will not persist!
     * You MUST use a reference, or they will not persist!
     * @access public
     * @param  string $class  The calling classname, to prevent clashes
     * @param  string $var    The variable to retrieve.
     * @return mixed   A reference to the variable. If not set it will be
     *                 auto initialised to NULL.
     */
-    function &getStaticProperty($class, $var)
+    public static function &getStaticProperty($class, $var)
+    {
         static $properties;
         if (!isset($properties[$class])) {
+            $properties[$class] = array();
             $properties[$class] = array();
         if (!array_key_exists($var, $properties[$class])) {
+            $properties[$class][$var] = null;
             $properties[$class][$var] = null;
-        return $properties[$class][$var];
-    }
-    // }}}
+        return $properties[$class][$var];
     // {{{ registerShutdownFunc()
     /**
-    * Use this function to register a shutdown method for static
-    * classes.
+    * Use this function to register a shutdown method for static
     * classes.
+    *
-    * @access public
+    * @param  mixed $func  The function name (or array of class/method) to call
-    * @param  mixed $func  The function name (or array of class/method) to call
+    * @param  mixed $args  The arguments to pass to the function
-    * @param  mixed $args  The arguments to pass to the function
+    *
     * @return void
     */
-    function registerShutdownFunc($func, $args = array())
+    public static function registerShutdownFunc($func, $args = array())
+    {
         // if we are called statically, there is a potential
         // that no shutdown func is registered.  Bug #6445
         if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
             register_shutdown_function("_PEAR_call_destructors");
             $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
-        }
-        $GLOBALS['_PEAR_shutdown_funcs'][] = array($func, $args);
-    }
+        }
-    // }}}
+        $GLOBALS['_PEAR_shutdown_funcs'][] = array($func, $args);
     // {{{ isError()
     /**
      * Tell whether a value is a PEAR error.
+     *
      * @param   mixed $data   the value to test
      * @param   int   $code   if $data is an error object, return true
      *                        only if $code is a string and
      *                        $obj->getMessage() == $code or
      *                        $code is an integer and $obj->getCode() == $code
      * @access  public
      * @return  bool    true if parameter is an error
+     */
+    public static function isError($data, $code = null)
+    {
-     */
+        if (!is_a($data, 'PEAR_Error')) {
-    function isError($data, $code = null)
+            return false;
-    {
+        }
-        if (is_a($data, 'PEAR_Error')) {
-            if (is_null($code)) {
-                return true;
-            } elseif (is_string($code)) {
-                return $data->getMessage() == $code;
+        if (is_null($code)) {
-            } else {
-                return $data->getCode() == $code;
+            return true;
-            }
+        } elseif (is_string($code)) {
-        }
-        return false;
+            return $data->getMessage() == $code;
+        }
-    // }}}
+        return $data->getCode() == $code;
     // {{{ setErrorHandling()
     /**
+     * Sets how errors generated by this object should be handled.
+     * Can be invoked both in objects and statically.  If called
+     * statically, setErrorHandling sets the default behaviour for all
-     * Sets how errors generated by this object should be handled.
+     * PEAR objects.  If called in an object, setErrorHandling sets
-     * Can be invoked both in objects and statically.  If called
+     * the default behaviour for that object.
      * statically, setErrorHandling sets the default behaviour for all
-     * PEAR objects.  If called in an object, setErrorHandling sets
+     * @param object $object
-     * the default behaviour for that object.
+     *        Object the method was called on (non-static mode)
      * @see PEAR_ERROR_CALLBACK
      * @see PEAR_ERROR_EXCEPTION
+     *
      * @since PHP 4.0.5
      */
+    protected static function _setErrorHandling(
-    function setErrorHandling($mode = null, $options = null)
+        $object, $mode = null, $options = null
-    {
+    ) {
-        if (isset($this) && is_a($this, 'PEAR')) {
+        if ($object !== null) {
-            $setmode     = &$this->_default_error_mode;
+            $setmode     = &$object->_default_error_mode;
-            $setoptions  = &$this->_default_error_options;
+            $setoptions  = &$object->_default_error_options;
         } else {
             $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
             $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
+        }
                 trigger_error("invalid error mode", E_USER_WARNING);
                 break;
+        }
+    }
-    // }}}
-    // {{{ expectError()
     /**
      * This method is used to tell which errors you expect to get.
      * Expected errors are always returned with error mode
      * PEAR_ERROR_RETURN.  Expected error codes are stored in a stack,
         if (is_array($code)) {
             array_push($this->_expected_errors, $code);
         } else {
             array_push($this->_expected_errors, array($code));
+        }
-        return sizeof($this->_expected_errors);
+        return count($this->_expected_errors);
+    }
-    // }}}
-    // {{{ popExpect()
     /**
      * This method pops one element off the expected error codes
      * stack.
+     *
     function popExpect()
+    {
         return array_pop($this->_expected_errors);
+    }
-    // }}}
-    // {{{ _checkDelExpect()
     /**
      * This method checks unsets an error code if available
+     *
      * @param mixed error code
      * @since PHP 4.3.0
      */
     function _checkDelExpect($error_code)
+    {
         $deleted = false;
-        foreach ($this->_expected_errors AS $key => $error_array) {
+        foreach ($this->_expected_errors as $key => $error_array) {
             if (in_array($error_code, $error_array)) {
                 unset($this->_expected_errors[$key][array_search($error_code, $error_array)]);
                 $deleted = true;
+            }
             // clean up empty arrays
             if (0 == count($this->_expected_errors[$key])) {
                 unset($this->_expected_errors[$key]);
+            }
+        }
         return $deleted;
-    }
-    // }}}
     // {{{ delExpect()
     /**
      * This method deletes all occurences of the specified element from
      * the expected error codes stack.
      * @since PHP 4.3.0
      */
     function delExpect($error_code)
+    {
         $deleted = false;
         if ((is_array($error_code) && (0 != count($error_code)))) {
-            // $error_code is a non-empty array here;
+            // $error_code is a non-empty array here; we walk through it trying
-            // we walk through it trying to unset all
-            // values
+            // to unset all values
-            foreach($error_code as $key => $error) {
+            foreach ($error_code as $key => $error) {
-                if ($this->_checkDelExpect($error)) {
+                $deleted =  $this->_checkDelExpect($error) ? true : false;
-                    $deleted =  true;
-                } else {
-                    $deleted = false;
-                }
+            }
             return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
         } elseif (!empty($error_code)) {
             // $error_code comes alone, trying to unset it
             if ($this->_checkDelExpect($error_code)) {
                 return true;
-            } else {
-                return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
+            }
-        } else {
-            // $error_code is empty
-            return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME
+            return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
+        }
-    }
+        // $error_code is empty
+        return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME
-    // }}}
     // {{{ raiseError()
     /**
      * This method is a wrapper that returns an instance of the
      *                  instantiated from this class, if specified.
+     *
      * @param bool $skipmsg If true, raiseError will only pass error codes,
      *                  the error message parameter will be dropped.
+     *
-     * @access public
      * @return object   a PEAR error object
      * @see PEAR::setErrorHandling
      * @since PHP 4.0.5
      */
+    protected static function _raiseError($object,
-    function &raiseError($message = null,
+                         $message = null,
                          $code = null,
                          $mode = null,
                          $options = null,
                          $userinfo = null,
                          $error_class = null,
             $error_class = $message->getType();
             $message->error_message_prefix = '';
             $message     = $message->getMessage();
+        }
+        if (
+            $object !== null &&
+            isset($object->_expected_errors) &&
+            count($object->_expected_errors) > 0 &&
+            count($exp = end($object->_expected_errors))
-        if (isset($this) && isset($this->_expected_errors) && sizeof($this->_expected_errors) > 0 && sizeof($exp = end($this->_expected_errors))) {
+        ) {
             if ($exp[0] == "*" ||
                 (is_int(reset($exp)) && in_array($code, $exp)) ||
+                (is_string(reset($exp)) && in_array($message, $exp))
-                (is_string(reset($exp)) && in_array($message, $exp))) {
+            ) {
                 $mode = PEAR_ERROR_RETURN;
+            }
+        }
         // No mode given, try global ones
         if ($mode === null) {
             // Class error handler
-            if (isset($this) && isset($this->_default_error_mode)) {
+            if ($object !== null && isset($object->_default_error_mode)) {
-                $mode    = $this->_default_error_mode;
+                $mode    = $object->_default_error_mode;
-                $options = $this->_default_error_options;
+                $options = $object->_default_error_options;
             // Global error handler
             } elseif (isset($GLOBALS['_PEAR_default_error_mode'])) {
                 $mode    = $GLOBALS['_PEAR_default_error_mode'];
                 $options = $GLOBALS['_PEAR_default_error_options'];
+            }
+        }
         if ($error_class !== null) {
             $ec = $error_class;
-        } elseif (isset($this) && isset($this->_error_class)) {
+        } elseif ($object !== null && isset($object->_error_class)) {
-            $ec = $this->_error_class;
+            $ec = $object->_error_class;
         } else {
+            $ec = 'PEAR_Error';
             $ec = 'PEAR_Error';
-        }
-        if ($skipmsg) {
-            $a = &new $ec($code, $mode, $options, $userinfo);
+        if ($skipmsg) {
-            return $a;
+            $a = new $ec($code, $mode, $options, $userinfo);
-        } else {
-            $a = &new $ec($message, $code, $mode, $options, $userinfo);
+        } else {
-            return $a;
-        }
+            $a = new $ec($message, $code, $mode, $options, $userinfo);
-    }
+        }
-    // }}}
+        return $a;
     // {{{ throwError()
     /**
+     * Simpler form of raiseError with fewer options.  In most cases
+     * message, code and userinfo are enough.
+     *
-     * Simpler form of raiseError with fewer options.  In most cases
+     * @param mixed $message a text error message or a PEAR error object
+     *
+     * @param int $code      a numeric error code (it is up to your class
+     *                  to define these if you want to use codes)
+     *
+     * @param string $userinfo If you need to pass along for example debug
-     * message, code and userinfo are enough.
+     *                  information, this parameter is meant for that.
      *
-     * @param string $message
-     *
-     */
+     * @return object   a PEAR error object
-    function &throwError($message = null,
-                         $code = null,
-                         $userinfo = null)
+     * @see PEAR::raiseError
-    {
-        if (isset($this) && is_a($this, 'PEAR')) {
+     */
-            $a = &$this->raiseError($message, $code, null, null, $userinfo);
+    protected static function _throwError($object, $message = null, $code = null, $userinfo = null)
             return $a;
+        if ($object !== null) {
+            $a = &$object->raiseError($message, $code, null, null, $userinfo);
+            return $a;
         } else {
-            $a = &PEAR::raiseError($message, $code, null, null, $userinfo);
-            return $a;
         $a = &PEAR::raiseError($message, $code, null, null, $userinfo);
-    }
+        return $a;
+    }
     // }}}
-    function staticPushErrorHandling($mode, $options = null)
+    public static function staticPushErrorHandling($mode, $options = null)
+    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
+        $stack       = &$GLOBALS['_PEAR_error_handler_stack'];
+        }
         $stack[] = array($mode, $options);
         return true;
+    }
-    function staticPopErrorHandling()
+    public static function staticPopErrorHandling()
+    {
         $stack = &$GLOBALS['_PEAR_error_handler_stack'];
         $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
         $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
                 break;
+        }
         return true;
+    }
-    // {{{ pushErrorHandling()
     /**
      * Push a new error handler on top of the error handler options stack. With this
      * you can easily override the actual error handler for some code and restore
      * it later with popErrorHandling.
+     *
      * @return bool Always true
+     *
      * @see PEAR::setErrorHandling
      */
-    function pushErrorHandling($mode, $options = null)
+    protected static function _pushErrorHandling($object, $mode, $options = null)
+    {
         $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        if (isset($this) && is_a($this, 'PEAR')) {
+        if ($object !== null) {
-            $def_mode    = &$this->_default_error_mode;
+            $def_mode    = &$object->_default_error_mode;
-            $def_options = &$this->_default_error_options;
+            $def_options = &$object->_default_error_options;
         } else {
             $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
             $def_options = &$GLOBALS['_PEAR_default_error_options'];
+        }
         $stack[] = array($def_mode, $def_options);
-        if (isset($this) && is_a($this, 'PEAR')) {
+        if ($object !== null) {
-            $this->setErrorHandling($mode, $options);
+            $object->setErrorHandling($mode, $options);
         } else {
             PEAR::setErrorHandling($mode, $options);
+        }
         $stack[] = array($mode, $options);
         return true;
-    }
-    // }}}
     // {{{ popErrorHandling()
     /**
     * Pop the last error handler used
+    *
     * @return bool Always true
+    *
     * @see PEAR::pushErrorHandling
     */
-    function popErrorHandling()
+    protected static function _popErrorHandling($object)
+    {
         $stack = &$GLOBALS['_PEAR_error_handler_stack'];
         array_pop($stack);
         list($mode, $options) = $stack[sizeof($stack) - 1];
         array_pop($stack);
-        if (isset($this) && is_a($this, 'PEAR')) {
+        if ($object !== null) {
-            $this->setErrorHandling($mode, $options);
+            $object->setErrorHandling($mode, $options);
         } else {
             PEAR::setErrorHandling($mode, $options);
+        }
-        return true;
-    }
-    // }}}
+        return true;
-    // {{{ loadExtension()
+    }
     /**
-    * OS independant PHP extension load. Remember to take care
+    * OS independent PHP extension load. Remember to take care
     * on the correct extension name for case sensitive OSes.
+    *
     * @param string $ext The extension name
     * @return bool Success or not on the dl() call
     */
-    function loadExtension($ext)
-    {
-        if (!extension_loaded($ext)) {
+    public static function loadExtension($ext)
-            // if either returns true dl() will produce a FATAL error, stop that
-            if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {
-                return false;
-            }
-            if (OS_WINDOWS) {
-                $suffix = '.dll';
-            } elseif (PHP_OS == 'HP-UX') {
-                $suffix = '.sl';
-            } elseif (PHP_OS == 'AIX') {
-                $suffix = '.a';
-            } elseif (PHP_OS == 'OSX') {
-                $suffix = '.bundle';
-            } else {
                 $suffix = '.so';
-            }
-            return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
+        if (extension_loaded($ext)) {
+            return true;
+        }
+        // if either returns true dl() will produce a FATAL error, stop that
+        if (
-        }
+            function_exists('dl') === false ||
-        return true;
+            ini_get('enable_dl') != 1
+        ) {
+            return false;
+        }
+        if (OS_WINDOWS) {
+            $suffix = '.dll';
+        } elseif (PHP_OS == 'HP-UX') {
+            $suffix = '.sl';
+        } elseif (PHP_OS == 'AIX') {
+            $suffix = '.a';
+        } elseif (PHP_OS == 'OSX') {
-    }
+            $suffix = '.bundle';
+        } else {
+            $suffix = '.so';
+        }
     // }}}
         return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
+    }
 // {{{ _PEAR_call_destructors()
 function _PEAR_call_destructors()
+{
-{
+    global $_PEAR_destructor_object_list;
+    if (is_array($_PEAR_destructor_object_list) &&
+        sizeof($_PEAR_destructor_object_list))
     global $_PEAR_destructor_object_list;
-    if (is_array($_PEAR_destructor_object_list) &&
+        reset($_PEAR_destructor_object_list);
-        sizeof($_PEAR_destructor_object_list))
+        $destructLifoExists = PEAR::getStaticProperty('PEAR', 'destructlifo');
-        reset($_PEAR_destructor_object_list);
+        if ($destructLifoExists) {
-        if (PEAR::getStaticProperty('PEAR', 'destructlifo')) {
+            $_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
             $_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
         // not called more than once.
         $_PEAR_destructor_object_list = array();
+    }
+    // Now call the shutdown functions
+    if (
-    // Now call the shutdown functions
+        isset($GLOBALS['_PEAR_shutdown_funcs']) &&
+        is_array($GLOBALS['_PEAR_shutdown_funcs']) &&
+        !empty($GLOBALS['_PEAR_shutdown_funcs'])
-    if (is_array($GLOBALS['_PEAR_shutdown_funcs']) AND !empty($GLOBALS['_PEAR_shutdown_funcs'])) {
+    ) {
         foreach ($GLOBALS['_PEAR_shutdown_funcs'] as $value) {
             call_user_func_array($value[0], $value[1]);
+        }
+    }
-}
+}
 // }}}
 /**
  * Standard PEAR error class for PHP 4
+ *
  * @package    PEAR
  * @author     Stig Bakken <ssb@php.net>
  * @author     Tomas V.V. Cox <cox@idecnet.com>
  * @author     Gregory Beaver <cellog@php.net>
  * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.5.1
+ * @version    Release: 1.10.1
  * @link       http://pear.php.net/manual/en/core.pear.pear-error.php
  * @see        PEAR::raiseError(), PEAR::throwError()
  * @since      Class available since PHP 4.0.2
  */
 class PEAR_Error
+{
-    // {{{ properties
     var $error_message_prefix = '';
     var $mode                 = PEAR_ERROR_RETURN;
     var $level                = E_USER_NOTICE;
     var $code                 = -1;
     var $message              = '';
     var $userinfo             = '';
     var $backtrace            = null;
-    // }}}
-    // {{{ constructor
     /**
      * PEAR_Error constructor
+     *
      * @param string $message  message
      * @param string $userinfo (optional) additional user/debug info
+     *
      * @access public
+     *
      */
-    function PEAR_Error($message = 'unknown error', $code = null,
+    function __construct($message = 'unknown error', $code = null,
                         $mode = null, $options = null, $userinfo = null)
+    {
         if ($mode === null) {
             $mode = PEAR_ERROR_RETURN;
+        }
         $this->message   = $message;
         $this->code      = $code;
         $this->mode      = $mode;
         $this->userinfo  = $userinfo;
-        if (!PEAR::getStaticProperty('PEAR_Error', 'skiptrace')) {
+        $skiptrace = PEAR::getStaticProperty('PEAR_Error', 'skiptrace');
+        if (!$skiptrace) {
             $this->backtrace = debug_backtrace();
             if (isset($this->backtrace[0]) && isset($this->backtrace[0]['object'])) {
                 unset($this->backtrace[0]['object']);
+            }
+        }
         if ($mode & PEAR_ERROR_CALLBACK) {
             $this->level = E_USER_NOTICE;
             $this->callback = $options;
         } else {
             if ($options === null) {
                 $options = E_USER_NOTICE;
+            }
             $this->level = $options;
             $this->callback = null;
+        }
         if ($this->mode & PEAR_ERROR_PRINT) {
             if (is_null($options) || is_int($options)) {
                 $format = "%s";
             } else {
                 $format = $options;
+            }
             printf($format, $this->getMessage());
+        }
         if ($this->mode & PEAR_ERROR_TRIGGER) {
             trigger_error($this->getMessage(), $this->level);
+        }
         if ($this->mode & PEAR_ERROR_DIE) {
             $msg = $this->getMessage();
             if (is_null($options) || is_int($options)) {
                 $format = "%s";
                 if (substr($msg, -1) != "\n") {
             } else {
                 $format = $options;
+            }
             die(sprintf($format, $msg));
+        }
-        if ($this->mode & PEAR_ERROR_CALLBACK) {
+        if ($this->mode & PEAR_ERROR_CALLBACK && is_callable($this->callback)) {
-            if (is_callable($this->callback)) {
-                call_user_func($this->callback, $this);
+            call_user_func($this->callback, $this);
-            }
+        }
         if ($this->mode & PEAR_ERROR_EXCEPTION) {
             trigger_error("PEAR_ERROR_EXCEPTION is obsolete, use class PEAR_Exception for exceptions", E_USER_WARNING);
             eval('$e = new Exception($this->message, $this->code);throw($e);');
+        }
+    }
+    /**
+     * Only here for backwards compatibility.
+     *
+     * Class "Cache_Error" still uses it, among others.
+     *
+     * @param string $message  Message
+     * @param int    $code     Error code
+     * @param int    $mode     Error mode
+     * @param mixed  $options  See __construct()
+     * @param string $userinfo Additional user/debug info
-    // }}}
+     */
+    public function PEAR_Error(
+        $message = 'unknown error', $code = null, $mode = null,
+        $options = null, $userinfo = null
+    ) {
+        self::__construct($message, $code, $mode, $options, $userinfo);
     // {{{ getMode()
     /**
      * Get the error mode from an error object.
+     *
      * @return int error mode
      * @access public
+     */
-     */
+    function getMode()
     function getMode() {
-        return $this->mode;
-    }
-    // }}}
+        return $this->mode;
     // {{{ getCallback()
     /**
      * Get the callback function/method from an error object.
+     *
      * @return mixed callback function or object/method array
+     * @access public
-     * @access public
+     */
-     */
+    function getCallback()
-    function getCallback() {
-        return $this->callback;
-    }
     // }}}
-    // {{{ getMessage()
+        return $this->callback;
+    }
     /**
     function getMessage()
+    {
         return ($this->error_message_prefix . $this->message);
+    }
-    // }}}
-    // {{{ getCode()
     /**
      * Get error code from an error object
+     *
      * @return int error code
      function getCode()
+     {
         return $this->code;
+     }
-    // }}}
-    // {{{ getType()
     /**
      * Get the name of this error/exception.
+     *
      * @return string error/exception name (type)
     function getType()
+    {
         return get_class($this);
+    }
-    // }}}
-    // {{{ getUserInfo()
     /**
      * Get additional user-supplied information.
+     *
      * @return string user-supplied information
     function getUserInfo()
+    {
         return $this->userinfo;
+    }
-    // }}}
-    // {{{ getDebugInfo()
     /**
      * Get additional debug information supplied by the application.
+     *
      * @return string debug information
     function getDebugInfo()
+    {
         return $this->getUserInfo();
+    }
-    // }}}
-    // {{{ getBacktrace()
     /**
      * Get the call backtrace from where the error was generated.
      * Supported with PHP 4.3.0 or newer.
+     *
             return $this->backtrace;
+        }
         return $this->backtrace[$frame];
+    }
-    // }}}
-    // {{{ addUserInfo()
     function addUserInfo($info)
+    {
         if (empty($this->userinfo)) {
             $this->userinfo = $info;
         } else {
             $this->userinfo .= " ** $info";
+        }
+    }
-    }
+    function __toString()
+    {
-    // }}}
+        return $this->getMessage();
     // {{{ toString()
     /**
      * Make a string representation of this object.
+     *
      * @return string a string with an object summary
+     * @access public
-     * @access public
+     */
-     */
+    function toString()
     function toString() {
         $modes = array();
         $levels = array(E_USER_NOTICE  => 'notice',
                        strtolower(get_class($this)), $this->message, $this->code,
                        implode("|", $modes), $levels[$this->level],
                        $this->error_message_prefix,
                        $this->userinfo);
+    }
-    // }}}
+}
 /*
  * Local Variables:
  * mode: php
  * tab-width: 4
  * c-basic-offset: 4
  * End:
- */

Subversion Repositories Applications.gtt

(root)/trunk/bibliotheque/pear/PEAR.php – Rev 94 → 187