Sync PHP_5 with PHP_4's pear

Sascha Schumann · Sascha Schumann · commit 570cd8788c23 · 2003-06-24T01:59:18.000Z
diff --git a/pear/PEAR/Config.php b/pear/PEAR/Config.php
@@ -73,7 +73,7 @@
 if (getenv('PHP_PEAR_EXTENSION_DIR')) {
     define('PEAR_CONFIG_DEFAULT_EXT_DIR', getenv('PHP_PEAR_EXTENSION_DIR'));
 } else {
-    if (!ini_get('extension_dir')) {
+    if (ini_get('extension_dir')) {
         define('PEAR_CONFIG_DEFAULT_EXT_DIR', ini_get('extension_dir'));
     } elseif (defined('PEAR_EXTENSION_DIR') && @is_dir(PEAR_EXTENSION_DIR)) {
         define('PEAR_CONFIG_DEFAULT_EXT_DIR', PEAR_EXTENSION_DIR);
diff --git a/pear/PEAR/Registry.php b/pear/PEAR/Registry.php
@@ -155,7 +155,23 @@ function _assertStateDir()
      */
     function _packageFileName($package)
     {
-        return "{$this->statedir}/{$package}.reg";
+        if (is_file("{$this->statedir}/{$package}.reg")) {
+            return "{$this->statedir}/{$package}.reg";
+        }
+        /**
+         * Iterate through the directory to find the matching
+         * registry file, even if it has been provided in
+         * another case (foobar vs. FooBar)
+         */
+        $package = strtolower($package);
+        if ($handle = opendir($this->statedir)) {
+            while (false !== ($file = readdir($handle))) {
+               if (strtolower($file) == $package . ".reg") {
+                   return "{$this->statedir}/{$file}";
+               }
+            }
+            closedir($handle);
+        }
     }
 
     // }}}
diff --git a/pear/package-Archive_Tar.xml b/pear/package-Archive_Tar.xml
@@ -6,7 +6,7 @@
   <description>This class provides handling of tar files in PHP.
 It supports creating, listing, extracting and adding to tar files.
 Gzip support is available if PHP has the zlib extension built-in or
-loaded.
+loaded. Bz2 compression is also supported with the bz2 extension loaded.
 </description>
   <license>PHP License</license>
   <maintainers>
@@ -24,11 +24,12 @@ loaded.
     </maintainer>
   </maintainers>
   <release>
-    <version>0.9</version>
-    <date>2002-05-27</date>
-    <notes>
-      * Auto-detect gzip'ed files
-    </notes>
+    <version>1.1</version>
+    <date>2003-05-28</date>
+    <notes>* Add support for BZ2 compression
+* Add support for add and extract without using temporary files : methods addString() and extractInString()
+
+</notes>
     <state>stable</state>
     <filelist>
       <dir name="Archive">
@@ -38,6 +39,30 @@ loaded.
     </filelist>
   </release>
   <changelog>
+    <release>
+      <version>1.0</version>
+      <date>2003-01-24</date>
+      <notes>Change status to stable</notes>
+      <state>stable</state>
+      <filelist>
+        <dir name="Archive">
+          <file role="php" name="Tar.php"/>
+        </dir>
+        <file role="doc" name="docs/Archive_Tar.txt" baseinstalldir="/"/>
+      </filelist>
+    </release>
+    <release>
+      <version>0.10-b1</version>
+      <date>2003-01-08</date>
+      <notes>Add support for long filenames (greater than 99 characters)</notes>
+      <state>beta</state>
+    </release>
+    <release>
+      <version>0.9</version>
+      <date>2002-05-27</date>
+      <notes>Auto-detect gzip'ed files</notes>
+      <state>stable</state>
+    </release>
     <release>
       <version>0.4</version>
       <date>2002-05-20</date>
diff --git a/pear/package.dtd b/pear/package.dtd
@@ -1,5 +1,5 @@
 <!--
-     $Id: package.dtd,v 1.27.4.5 2003-06-17 17:13:17 pajoye Exp $
+     $Id: package.dtd,v 1.27.4.5.2.1 2003-06-24 01:59:17 sas Exp $
 
      This is the PEAR package description, version 1.0.
      It should be used with the informal public identifier:
diff --git a/pear/scripts/pear.bat b/pear/scripts/pear.bat
@@ -5,18 +5,18 @@ REM PHP version 4.0
 REM ----------------------------------------------------------------------
 REM Copyright (c) 1997-2002 The PHP Group
 REM ----------------------------------------------------------------------
-REM  This source file is subject to version 2.02 of the PHP license,
+REM  This source file is subject to version 3.0 of the PHP license, 
 REM  that is bundled with this package in the file LICENSE, and is
 REM  available at through the world-wide-web at
-REM  http://www.php.net/license/2_02.txt.
+REM  http://www.php.net/license/3_0.txt. 
 REM  If you did not receive a copy of the PHP license and are unable to
 REM  obtain it through the world-wide-web, please send a note to
 REM  license@php.net so we can mail you a copy immediately.
 REM ----------------------------------------------------------------------
 REM  Authors:     Alexander Merz (alexmerz@php.net)
 REM ----------------------------------------------------------------------
 REM
-REM  $Id: pear.bat,v 1.14 2003/04/03 23:21:30 ssb Exp $
+REM  $Id$
 
 REM change this lines to match the paths of your system
 REM -------------------
