Updated PEAR and PEAR packages.

[timetracker.git] / WEB-INF / lib / pear / PEAR / Dependency2.php

diff --git a/WEB-INF/lib/pear/PEAR/Dependency2.php b/WEB-INF/lib/pear/PEAR/Dependency2.php
index f3ddeb1..635c551 100644 (file)
--- a/WEB-INF/lib/pear/PEAR/Dependency2.php
+++ b/WEB-INF/lib/pear/PEAR/Dependency2.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Dependency2.php 313023 2011-07-06 19:17:11Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -31,7 +30,7 @@ require_once 'PEAR/Validate.php';
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.4
+ * @version    Release: 1.10.1
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
@@ -82,7 +81,7 @@ class PEAR_Dependency2
      * @param array format of PEAR_Registry::parsedPackageName()
      * @param int installation state (one of PEAR_VALIDATE_*)
      */
-    function PEAR_Dependency2(&$config, $installoptions, $package,
+    function __construct(&$config, $installoptions, $package,
                               $state = PEAR_VALIDATE_INSTALLING)
     {
         $this->_config = &$config;
@@ -541,7 +540,7 @@ class PEAR_Dependency2
      */
     function getPEARVersion()
     {
-        return '1.9.4';
+        return '1.10.1';
     }
 
     function validatePearinstallerDependency($dep)
@@ -607,7 +606,7 @@ class PEAR_Dependency2
      * @param boolean whether this is a required dependency
      * @param array a list of downloaded packages to be installed, if any
      * @param boolean if true, then deps on pear.php.net that fail will also check
-     *                against pecl.php.net packages to accomodate extensions that have
+     *                against pecl.php.net packages to accommodate extensions that have
      *                moved to pecl.php.net from pear.php.net
      */
     function validatePackageDependency($dep, $required, $params, $depv1 = false)
@@ -894,9 +893,9 @@ class PEAR_Dependency2
             if (!class_exists('PEAR_Downloader_Package')) {
                 require_once 'PEAR/Downloader/Package.php';
             }
-            $dp = &new PEAR_Downloader_Package($dl);
+            $dp = new PEAR_Downloader_Package($dl);
             $dp->setPackageFile($downloaded[$i]);
-            $params[$i] = &$dp;
+            $params[$i] = $dp;
         }
 
         // check cache
@@ -1175,7 +1174,7 @@ class PEAR_Dependency2
                 require_once 'PEAR/Downloader/Package.php';
             }
 
-            $dp = &new PEAR_Downloader_Package($dl);
+            $dp = new PEAR_Downloader_Package($dl);
             if (is_object($pkg)) {
                 $dp->setPackageFile($pkg);
             } else {
@@ -1199,7 +1198,7 @@ class PEAR_Dependency2
                     }
 
                     foreach ($ds as $d) {
-                        $checker = &new PEAR_Dependency2($this->_config, $this->_options,
+                        $checker = new PEAR_Dependency2($this->_config, $this->_options,
                             array('channel' => $channel, 'package' => $package), $this->_state);
                         $dep = $d['dep'];
                         $required = $d['type'] == 'required';
@@ -1355,4 +1354,4 @@ class PEAR_Dependency2
         return array(sprintf($msg, $this->_registry->parsedPackageNameToString(
             $this->_currentPackage, true)));
     }
-}
\ No newline at end of file
+}