Permalink
Browse files

Prepare the separation of PEAR_Exception into its own package. Unfort…

…unately we have to define a PHP 4 dependency to match PEAR to keep BC (e.g. so PEAR can put a required dependency so people will still get the Exception class automagically with PEAR installations.)

git-svn-id: http://svn.php.net/repository/pear/pear-core/pear/pear-core/trunk@309057 c90b9560-bf6c-de11-be94-00142212c4b1
  • Loading branch information...
dufuz
dufuz committed Mar 9, 2011
1 parent 37075af commit b73ac9428f6f5b887c4ff6c3daede4f5eb4e19e0
Showing with 99 additions and 24 deletions.
  1. +3 −3 PEAR/Exception.php
  2. +70 −0 package-Exception.xml
  3. +24 −19 package-PEAR.xml
  4. +2 −2 package2.xml
View
@@ -6,16 +6,16 @@
* PHP versions 4 and 5
*
* @category pear
- * @package PEAR
+ * @package PEAR_Exception
* @author Tomas V. V. Cox <cox@idecnet.com>
* @author Hans Lellelid <hans@velum.net>
* @author Bertrand Mansion <bmansion@mamasam.com>
* @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$
- * @link http://pear.php.net/package/PEAR
- * @since File available since Release 1.3.3
+ * @link http://pear.php.net/package/PEAR_Exception
+ * @since File available since Release 1.0.0
*/
View
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
+http://pear.php.net/dtd/tasks-1.0.xsd
+http://pear.php.net/dtd/package-2.0
+http://pear.php.net/dtd/package-2.0.xsd">
+ <name>PEAR_Exception</name>
+ <channel>pear.php.net</channel>
+ <summary>The PEAR Exception base class</summary>
+ <description>
+ PEAR_Exception PHP5 error handling mechanism
+
+ Use PEAR2_Exception from http://pear2.php.net if you are on PHP 5.3+
+ </description>
+ <lead>
+ <name>Helgi Thormar</name>
+ <user>dufuz</user>
+ <email>dufuz@php.net</email>
+ <active>yes</active>
+ </lead>
+ <developer>
+ <name>Greg Beaver</name>
+ <user>cellog</user>
+ <email>cellog@php.net</email>
+ <active>no</active>
+ </developer>
+ <date>2010-07-24</date>
+ <version>
+ <release>1.0.0</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://opensource.org/licenses/bsd-license.php">New BSD License</license>
+ <notes>
+ This packge was split out from the PEAR package. If you use PEAR_Exception in your package
+ and use nothing from the PEAR package then it's better to depend on just PEAR_Exception.
+ </notes>
+ <contents>
+ <dir name="/">
+ <dir name="PEAR">
+ <file name="Exception.php" role="php">
+ <tasks:replace from="@package_version@" to="version" type="package-info" />
+ </file>
+ </dir>
+ <file name="LICENSE" role="doc" />
+ </dir> <!-- / -->
+ </contents>
+ <dependencies>
+ <required>
+ <php>
+ <min>4.4.0</min>
+ <exclude>5.0</exclude>
+ <exclude>5.1.0</exclude>
+ <exclude>5.1.1</exclude>
+ <exclude>5.1.2</exclude>
+ <exclude>5.1.3</exclude>
+ <exclude>5.1.4</exclude>
+ <exclude>5.1.5</exclude>
+ </php>
+ <pearinstaller>
+ <min>1.9.1</min>
+ <exclude>1.9.1</exclude>
+ <conflicts/>
+ </pearinstaller>
+ </required>
+ </dependencies>
+ <phprelease/>
+</package>
View
@@ -87,32 +87,29 @@ http://pear.php.net/dtd/package-1.0.xsd">
</maintainer>
</maintainers>
<release>
- <version>1.9.1</version>
+ <version>1.10.0beta1</version>
<date>2010-05-26</date>
<license>New BSD License</license>
<state>stable</state>
<notes>
- * svntag improvements, tag package files passed into the command and better directory checks [dufuz]
- * rely on Structures_Graph minimum version instead of recommended version [saltybeagle]
- * Fix Bug #12613: running go-pear.phar from C:\ fails [dufuz]
- * Fix Bug #14841: Installing pear into directory with space fails [dufuz]
- * Fix Bug #16644: pear.bat returns syntax error when parenthesis are in install path. [dufuz] [patch by bwaters (Bryan Waters)]
- * Fix Bug #16767: Use of Depreciated HTML Attributes in the Exception class [dufuz] [patch by fuhrysteve (Stephen J. Fuhry)]
- * Fix Bug #16864: "pear list-upgrades -i" issues E_WARNINGS [dufuz] [patch by rquadling (Richard Quadling)]
- * Fix Bug #17220: command `pear help` outputs to stderr instead of stdout [dufuz]
- * Fix Bug #17234: channel-discover adds port to HTTP Host header [dufuz]
- * Fix Bug #17292: Code Coverage in PEAR_RunTest does not work with namespaces [sebastian]
- * Fix Bug #17359: loadExtension() fails over missing dl() when used in multithread env [dufuz]
- * Fix Bug #17378: pear info $package fails if directory with that name exists [dufuz]
+ Moved PEAR_Exception into it's own package so people can start putting dependency on PEAR_Exception
+ instead of depending on PEAR when the Exception class is the only thing being used.
+
+ Features:
+ * A configure parameter can now be passed to install / upgrade for pecl such as
+ pecl install --with-option=dir memcached
+ This allows for customized setups while still having the benefit of using the pear
+ installer. (pear will not remember the configure params for the next upgrade)
</notes>
<provides type="class" name="OS_Guess"/>
<provides type="class" name="System"/>
<deps>
<dep type="php" rel="ge" version="4.4.0"/>
<dep type="pkg" rel="ge" version="1.3.3">PEAR</dep>
<dep type="pkg" rel="ge" version="1.3.7">Archive_Tar</dep>
- <dep type="pkg" rel="ge" version="1.2">Console_Getopt</dep>
- <dep type="pkg" rel="ge" version="1.0.2">Structures_Graph</dep>
+ <dep type="pkg" rel="ge" version="1.3.0">Console_Getopt</dep>
+ <dep type="pkg" rel="ge" version="1.0.4">Structures_Graph</dep>
+ <dep type="pkg" rel="ge" version="1.0.0" optional="yes">PEAR_Exception</dep>
<dep type="pkg" rel="ge" version="0.5.0" optional="yes">PEAR_Frontend_Web</dep>
<dep type="pkg" rel="ge" version="0.4.0" optional="yes">PEAR_Frontend_Gtk</dep>
<dep type="ext" rel="has">xml</dep>
@@ -351,9 +348,6 @@ http://pear.php.net/dtd/package-1.0.xsd">
<file role="php" name="ErrorStack.php">
<replace from="@package_version@" to="version" type="package-info"/>
</file>
- <file role="php" name="Exception.php">
- <replace from="@package_version@" to="version" type="package-info"/>
- </file>
<file role="php" name="FixPHP5PEARWarnings.php"/>
<file role="php" name="Frontend.php">
<replace from="@package_version@" to="version" type="package-info"/>
@@ -698,11 +692,22 @@ Alpha1 Release Notes:
</release>
<release>
<version>1.9.1</version>
- <date>2009-09-XX</date>
+ <date>2010-05-26</date>
<license>New BSD License</license>
<state>stable</state>
<notes>
* svntag improvements, tag package files passed into the command and better directory checks [dufuz]
+ * rely on Structures_Graph minimum version instead of recommended version [saltybeagle]
+ * Fix Bug #12613: running go-pear.phar from C:\ fails [dufuz]
+ * Fix Bug #14841: Installing pear into directory with space fails [dufuz]
+ * Fix Bug #16644: pear.bat returns syntax error when parenthesis are in install path. [dufuz] [patch by bwaters (Bryan Waters)]
+ * Fix Bug #16767: Use of Depreciated HTML Attributes in the Exception class [dufuz] [patch by fuhrysteve (Stephen J. Fuhry)]
+ * Fix Bug #16864: "pear list-upgrades -i" issues E_WARNINGS [dufuz] [patch by rquadling (Richard Quadling)]
+ * Fix Bug #17220: command `pear help` outputs to stderr instead of stdout [dufuz]
+ * Fix Bug #17234: channel-discover adds port to HTTP Host header [dufuz]
+ * Fix Bug #17292: Code Coverage in PEAR_RunTest does not work with namespaces [sebastian]
+ * Fix Bug #17359: loadExtension() fails over missing dl() when used in multithread env [dufuz]
+ * Fix Bug #17378: pear info $package fails if directory with that name exists [dufuz]
</notes>
</release>
</changelog>
View
@@ -87,8 +87,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
</helper>
<date>2010-05-26</date>
<version>
- <release>1.9.2</release>
- <api>1.9.0</api>
+ <release>1.10.0beta1</release>
+ <api>1.10.0</api>
</version>
<stability>
<release>stable</release>

0 comments on commit b73ac94

Please sign in to comment.