svn: /pear/peardoc/trunk/en/pyrus/ commands/package.xml differences/customcommands.xml differences/customroles.xml extending/configuration.xml extending/installation.xml extending/packagefile.xml extending/registry.xml plugins/role.xml plugins/task.xml

[email protected] (Brett Bieber) Wed, 04 May 2011 13:51:49 +0000
Newsgroups php.pear.doc
Message-ID <[email protected]>
saltybeagle                              Wed, 04 May 2011 13:51:49 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=310758

Log:
change namespace from pear2 to PEAR2

Changed paths:
    U   pear/peardoc/trunk/en/pyrus/commands/package.xml
    U   pear/peardoc/trunk/en/pyrus/differences/customcommands.xml
    U   pear/peardoc/trunk/en/pyrus/differences/customroles.xml
    U   pear/peardoc/trunk/en/pyrus/extending/configuration.xml
    U   pear/peardoc/trunk/en/pyrus/extending/installation.xml
    U   pear/peardoc/trunk/en/pyrus/extending/packagefile.xml
    U   pear/peardoc/trunk/en/pyrus/extending/registry.xml
    U   pear/peardoc/trunk/en/pyrus/plugins/role.xml
    U   pear/peardoc/trunk/en/pyrus/plugins/task.xml
svn-diffs-310758.txt (text/x-diff, 28.4 KB)
Modified: pear/peardoc/trunk/en/pyrus/commands/package.xml
===================================================================
--- pear/peardoc/trunk/en/pyrus/commands/package.xml	2011-05-04 10:35:04 UTC (rev 310757)
+++ pear/peardoc/trunk/en/pyrus/commands/package.xml	2011-05-04 13:51:49 UTC (rev 310758)
@@ -157,7 +157,7 @@
     }
 }
 spl_autoload_register("pyrus_autoload");
-$frontend = new \pear2\Pyrus\ScriptFrontend\Commands;
+$frontend = new \PEAR2\Pyrus\ScriptFrontend\Commands;
 @array_shift($_SERVER['argv']);
 $frontend->run($_SERVER['argv']);
 __HALT_COMPILER();

Modified: pear/peardoc/trunk/en/pyrus/differences/customcommands.xml
===================================================================
--- pear/peardoc/trunk/en/pyrus/differences/customcommands.xml	2011-05-04 10:35:04 UTC (rev 310757)
+++ pear/peardoc/trunk/en/pyrus/differences/customcommands.xml	2011-05-04 13:51:49 UTC (rev 310758)
@@ -135,7 +135,7 @@
 <commands version="2.0" xmlns="http://pear2.php.net/dtd/customcommand-2.0">
  <command>
   <name>install</name>
-  <class>pear2\Pyrus\ScriptFrontend\Commands</class>
+  <class>PEAR2\Pyrus\ScriptFrontend\Commands</class>
   <function>install</function>
   <summary>Install a package.  Use install --plugin to install plugins</summary>
   <shortcut>i</shortcut>

Modified: pear/peardoc/trunk/en/pyrus/differences/customroles.xml
===================================================================
--- pear/peardoc/trunk/en/pyrus/differences/customroles.xml	2011-05-04 10:35:04 UTC (rev 310757)
+++ pear/peardoc/trunk/en/pyrus/differences/customroles.xml	2011-05-04 13:51:49 UTC (rev 310758)
@@ -50,7 +50,7 @@
     <![CDATA[
 <role version="2.0" xmlns="http://pear2.php.net/dtd/customrole-2.0">
  <name>php</name>
- <class>pear2\Pyrus\Installer\Role\Php</class>
+ <class>PEAR2\Pyrus\Installer\Role\Php</class>
  <releasetypes>php</releasetypes>
  <releasetypes>extsrc</releasetypes>
  <releasetypes>extbin</releasetypes>

Modified: pear/peardoc/trunk/en/pyrus/extending/configuration.xml
===================================================================
--- pear/peardoc/trunk/en/pyrus/extending/configuration.xml	2011-05-04 10:35:04 UTC (rev 310757)
+++ pear/peardoc/trunk/en/pyrus/extending/configuration.xml	2011-05-04 13:51:49 UTC (rev 310758)
@@ -11,7 +11,7 @@
    with the documentation on Pyrus's <link linkend="pyrus.configuration">configuration</link>.
   </para>
   <para>
-   Pyrus's configuration is controlled by the <literal>pear2\Pyrus\Config</literal>
+   Pyrus's configuration is controlled by the <literal>PEAR2\Pyrus\Config</literal>
    class, which is implemented as a multiton mapping Pyrus installation location
    to a configuration object.  In addition, the current configuration (most
    recently instantiated) is also accessible to create configuration-agnostic
@@ -27,8 +27,8 @@
    <programlisting role="php">
     <![CDATA[
 <?php
-$docdir = pear2\Pyrus\Config::current()->doc_dir;
-pear2\Pyrus\Config::current()->test_dir = '/path/to/tests';
+$docdir = PEAR2\Pyrus\Config::current()->doc_dir;
+PEAR2\Pyrus\Config::current()->test_dir = '/path/to/tests';
 ?>
     ]]>
    </programlisting>
@@ -43,8 +43,8 @@
    <programlisting role="php">
     <![CDATA[
 <?php
-$pref = pear2\Pyrus\Config::current()->preferred_state;
-pear2\Pyrus\Config::current()->verbose = 3;
+$pref = PEAR2\Pyrus\Config::current()->preferred_state;
+PEAR2\Pyrus\Config::current()->verbose = 3;
 ?>
     ]]>
    </programlisting>

Modified: pear/peardoc/trunk/en/pyrus/extending/installation.xml
===================================================================
--- pear/peardoc/trunk/en/pyrus/extending/installation.xml	2011-05-04 10:35:04 UTC (rev 310757)
+++ pear/peardoc/trunk/en/pyrus/extending/installation.xml	2011-05-04 13:51:49 UTC (rev 310758)
@@ -8,7 +8,7 @@
   <para>
    Pyrus provides a very simple API for performing installation tasks.  This
    API begins with the ability to pass any packagename that can be
-   specified on the command-line to a <literal>pear2\Pyrus\Package</literal>
+   specified on the command-line to a <literal>PEAR2\Pyrus\Package</literal>
    object:
   </para>
   <para>
@@ -16,15 +16,15 @@
     <![CDATA[
 <?php
 // examples of the range of valid package names
-$package = new \pear2\Pyrus\Package('package.xml');
-$package = new \pear2\Pyrus\Package('/full/path/to/package.xml');
-$package = new \pear2\Pyrus\Package('Package-1.2.3.tgz');
-$package = new \pear2\Pyrus\Package('/full/path/to/Package-1.2.3.zip');
-$package = new \pear2\Pyrus\Package('RemotePackage');
-$package = new \pear2\Pyrus\Package('RemotePackage-alpha');
-$package = new \pear2\Pyrus\Package('RemotePackage-1.2.3');
-$package = new \pear2\Pyrus\Package('channelname/RemotePackage');
-$package = new \pear2\Pyrus\Package('http://example.com/RemotePackage-1.2.3.phar');
+$package = new \PEAR2\Pyrus\Package('package.xml');
+$package = new \PEAR2\Pyrus\Package('/full/path/to/package.xml');
+$package = new \PEAR2\Pyrus\Package('Package-1.2.3.tgz');
+$package = new \PEAR2\Pyrus\Package('/full/path/to/Package-1.2.3.zip');
+$package = new \PEAR2\Pyrus\Package('RemotePackage');
+$package = new \PEAR2\Pyrus\Package('RemotePackage-alpha');
+$package = new \PEAR2\Pyrus\Package('RemotePackage-1.2.3');
+$package = new \PEAR2\Pyrus\Package('channelname/RemotePackage');
+$package = new \PEAR2\Pyrus\Package('http://example.com/RemotePackage-1.2.3.phar');
 ?>
     ]]>
    </programlisting>
@@ -32,14 +32,14 @@
   <para>
    If there is a problem with the package name as passed to the constructor,
    an exception is thrown.  This can be any of a wide variety of exceptions
-   ranging from a <literal>pear2\Pyrus\PackageFile\Exception</literal> for
-   invalid package.xml, a <literal>pear2\Pyrus\Package\Exception</literal> for
+   ranging from a <literal>PEAR2\Pyrus\PackageFile\Exception</literal> for
+   invalid package.xml, a <literal>PEAR2\Pyrus\Package\Exception</literal> for
    higher-level errors (file does not exist, invalid abstract package name),
-   a <literal>pear2\Pyrus\Package\InstalledException</literal> if an abstract
+   a <literal>PEAR2\Pyrus\Package\InstalledException</literal> if an abstract
    remote package was requested and a newer version is installed, and
-   a <literal>pear2\Pyrus\Channel\Exception</literal> if any problems with
+   a <literal>PEAR2\Pyrus\Channel\Exception</literal> if any problems with
    retrieving remote REST information occur.  Also possible are
-   <literal>pear2\Pyrus\Package\Phar\Exception</literal> for errors relating
+   <literal>PEAR2\Pyrus\Package\Phar\Exception</literal> for errors relating
    to local <literal>tar</literal>, <literal>tgz</literal>, <literal>zip</literal>
    or <literal>phar</literal> archives.
   </para>
@@ -58,9 +58,9 @@
 <?php
 // import the class names into the current scope
 // this step is optional, you can also use the full class names
-// like pear2\Pyrus\Installer::begin()
-use pear2\Pyrus\Installer as Installer,
-    pear2\Pyrus\Package as Package;
+// like PEAR2\Pyrus\Installer::begin()
+use PEAR2\Pyrus\Installer as Installer,
+    PEAR2\Pyrus\Package as Package;

 try {
     $p1 = new Package('package.xml');
@@ -91,8 +91,8 @@
 <?php
 // import the class names into the current scope
 // this step is optional, you can also use the full class names
-// like pear2\Pyrus\Uninstaller::begin()
-use pear2\Pyrus\Uninstaller as Uninstaller;
+// like PEAR2\Pyrus\Uninstaller::begin()
+use PEAR2\Pyrus\Uninstaller as Uninstaller;

 try {
     $p1 = new Package('package.xml');

Modified: pear/peardoc/trunk/en/pyrus/extending/packagefile.xml
===================================================================
--- pear/peardoc/trunk/en/pyrus/extending/packagefile.xml	2011-05-04 10:35:04 UTC (rev 310757)
+++ pear/peardoc/trunk/en/pyrus/extending/packagefile.xml	2011-05-04 13:51:49 UTC (rev 310758)
@@ -55,16 +55,16 @@
    </itemizedlist>
   </para>
   <para>
-   The package.xml file is represented using a <literal>pear2\Pyrus\PackageFile\v2</literal>
+   The package.xml file is represented using a <literal>PEAR2\Pyrus\PackageFile\v2</literal>
    object, but most of the time you will access it using the most packagefile
-   version-agnostic <literal>pear2\Pyrus\Package</literal> class, which supports
+   version-agnostic <literal>PEAR2\Pyrus\Package</literal> class, which supports
    the same API seamlessly for accessing any kind of package as well as a few
    higher level options such as directly accessing the source of a file in a package.
-   This documentation assumes you are working with a <literal>pear2\Pyrus\Package</literal>
+   This documentation assumes you are working with a <literal>PEAR2\Pyrus\Package</literal>
    object named <literal>$package</literal>.
   </para>
   <para>
-   To instantiate a <literal>pear2\Pyrus\Package</literal>, simply pass in the
+   To instantiate a <literal>PEAR2\Pyrus\Package</literal>, simply pass in the
    path to a local package, a URI of a remote package, or an abstract remote package
    name to the constructor.
   </para>
@@ -72,10 +72,10 @@
    <programlisting role="php">
     <![CDATA[
 <?php
-$package = new pear2\Pyrus\Package('package.xml');
-$package = new pear2\Pyrus\Package('Release-1.2.3.tgz');
-$package = new pear2\Pyrus\Package('http://example.com/Release-1.2.3.tgz');
-$package = new pear2\Pyrus\Package('pear2/Release-1.2.3');
+$package = new PEAR2\Pyrus\Package('package.xml');
+$package = new PEAR2\Pyrus\Package('Release-1.2.3.tgz');
+$package = new PEAR2\Pyrus\Package('http://example.com/Release-1.2.3.tgz');
+$package = new PEAR2\Pyrus\Package('pear2/Release-1.2.3');
 ?>
     ]]>
    </programlisting>
@@ -487,8 +487,8 @@
     $tasks = file->tasks;
     // iterate over the tasks
     $lastversion = '1.0.0'; // last version of $package that was installed, or null
-    foreach (new \pear2\Pyrus\Package\Creator\TaskIterator($tasks, $package,
-                                                          \pear2\Pyrus\Task\Common::INSTALL, $lastversion)
+    foreach (new \PEAR2\Pyrus\Package\Creator\TaskIterator($tasks, $package,
+                                                          \PEAR2\Pyrus\Task\Common::INSTALL, $lastversion)
               as $name => $task) {
         // $name is the task name, $task is the actual task object, which can be
         // processed with $task->startSession(resource $fp, '/full/final/install/path');
@@ -514,8 +514,8 @@
     fclose($contents);
     rewind($fp);
     $lastversion = '1.0.0'; // last version of $package that was installed, or null
-    foreach (new \pear2\Pyrus\Package\Creator\TaskIterator($info, $package,
-                                                          \pear2\Pyrus\Task\Common::PACKAGE,
+    foreach (new \PEAR2\Pyrus\Package\Creator\TaskIterator($info, $package,
+                                                          \PEAR2\Pyrus\Task\Common::PACKAGE,
                                                           $lastversion) as $task) {
         // do pre-processing of file contents
         try {

Modified: pear/peardoc/trunk/en/pyrus/extending/registry.xml
===================================================================
--- pear/peardoc/trunk/en/pyrus/extending/registry.xml	2011-05-04 10:35:04 UTC (rev 310757)
+++ pear/peardoc/trunk/en/pyrus/extending/registry.xml	2011-05-04 13:51:49 UTC (rev 310758)
@@ -47,24 +47,24 @@
  <section xml:id="pyrus.extending.registry.basic">
   <info><title>Basic Registry principles</title></info>
   <para>
-   All registry classes implement the <literal>pear2\Pyrus\IChannel</literal>
+   All registry classes implement the <literal>PEAR2\Pyrus\IChannel</literal>
    interface, and all channelregistry classes implement the
-   <literal>pear2\Pyrus\ChannelRegistry</literal> interface.  The
-   <literal>pear2\Pyrus\Registry</literal> class acts as an aggregator of
+   <literal>PEAR2\Pyrus\ChannelRegistry</literal> interface.  The
+   <literal>PEAR2\Pyrus\Registry</literal> class acts as an aggregator of
    underlying registries, and implements the ability to cascade to parent
-   registries, as does the <literal>pear2\Pyrus\ChannelRegistry</literal>
+   registries, as does the <literal>PEAR2\Pyrus\ChannelRegistry</literal>
    class.
   </para>
   <para>
    The simplest way to retrieve a registry object is to use the one strongly
-   tied to the <link linkend="pyrus.extending.configuration">pear2\Pyrus\Config</link>
+   tied to the <link linkend="pyrus.extending.configuration">PEAR2\Pyrus\Config</link>
    object:
   </para>
   <programlisting role="php">
    <![CDATA[
 <?php
-$reg = pear2\Pyrus\Config::current()->registry;
-$creg = pear2\Pyrus\Config::current()->channelregistry;
+$reg = PEAR2\Pyrus\Config::current()->registry;
+$creg = PEAR2\Pyrus\Config::current()->channelregistry;
 ?>
    ]]>
   </programlisting>
@@ -79,8 +79,8 @@
   <programlisting role="php">
    <![CDATA[
 <?php
-$package = pear2\Pyrus\Config::current()->registry->package['pear2.php.net/PEAR2_Pyrus_Developer'];
-$remotepackage = new pear2\Pyrus\Package('pear2.php.net/PEAR2_Pyrus_Developer');
+$package = PEAR2\Pyrus\Config::current()->registry->package['pear2.php.net/PEAR2_Pyrus_Developer'];
+$remotepackage = new PEAR2\Pyrus\Package('pear2.php.net/PEAR2_Pyrus_Developer');
 // both packages can be queried with the same API
 ?>
    ]]>
@@ -91,8 +91,8 @@
   <programlisting role="php">
    <![CDATA[
 <?php
-$channel = pear2\Pyrus\Config::current()->channelregistry['pear2.php.net'];
-$localchannel = new pear2\Pyrus\ChannelFile('channel.xml');
+$channel = PEAR2\Pyrus\Config::current()->channelregistry['pear2.php.net'];
+$localchannel = new PEAR2\Pyrus\ChannelFile('channel.xml');
 // both channels can be queried with the same API
 ?>
    ]]>
@@ -103,11 +103,11 @@
   <programlisting role="php">
    <![CDATA[
 <?php
-foreach (pear2\Pyrus\Config::current()->registry->package as $name => $package) {
+foreach (PEAR2\Pyrus\Config::current()->registry->package as $name => $package) {
     // $name is channel/package
     // $package is a packagefile object
 }
-foreach (pear2\Pyrus\Config::current()->channelregistry as $name => $channel) {
+foreach (PEAR2\Pyrus\Config::current()->channelregistry as $name => $channel) {
     // $name is the channel name
     // $channel is a channelfile object
 }
@@ -148,21 +148,21 @@
    can be tracked.  The <function>replace</function> method registers a package
    as installed, but does not modify its date/time.  This is useful for
    repairing a corrupted entry, or simply storing a package as it is.  Both
-   methods accept a <literal>pear2\Pyrus\IPackageFile</literal> object.  A
-   packagefile object can be retrieved from a <literal>pear2\Pyrus\Package</literal>
+   methods accept a <literal>PEAR2\Pyrus\IPackageFile</literal> object.  A
+   packagefile object can be retrieved from a <literal>PEAR2\Pyrus\Package</literal>
    object by calling its <function>getPackageFileObject</function> method.
-   A <literal>pear2\Pyrus\Registry\Exception</literal> is thrown on any errors.
+   A <literal>PEAR2\Pyrus\Registry\Exception</literal> is thrown on any errors.
   </para>
   <para>
    The <function>uninstall</function> method accepts two parameters, the
    name of the package, and the package's channel.  A
-   <literal>pear2\Pyrus\Registry\Exception</literal> is thrown on any errors.
+   <literal>PEAR2\Pyrus\Registry\Exception</literal> is thrown on any errors.
   </para>
   <para>
    The <function>exists</function> method also accepts two parameters, and
    returns &true; or &false; depending on whether the package exists.  If
    severe errors occur such as registry corruption, a
-   <literal>pear2\Pyrus\Registry\Exception</literal> object is thrown.
+   <literal>PEAR2\Pyrus\Registry\Exception</literal> object is thrown.
   </para>
   <para>
    Note that array access can also be used to handle installation-related tasks:
@@ -170,9 +170,9 @@
   <programlisting role="php">
    <![CDATA[
 <?php
-$reg = pear2\Pyrus\Config::current()->registry;
+$reg = PEAR2\Pyrus\Config::current()->registry;

-$package = new pear2\Pyrus\Package('/path/to/package.xml');
+$package = new PEAR2\Pyrus\Package('/path/to/package.xml');

 // equivalent to $reg->install($package)
 $reg->package[] = $package;
@@ -190,7 +190,7 @@
    to use the registry's built-in transaction support.  The
    <literal>Sqlite3</literal> registry uses the database's native transaction
    support.  Both the <literal>Xml</literal> and <literal>Pear1</literal>
-   registries use Pyrus's <literal>pear2\Pyrus\AtomicFileTransaction</literal>
+   registries use Pyrus's <literal>PEAR2\Pyrus\AtomicFileTransaction</literal>
    for its transaction support.  Thus, it is always best to do a transaction
    by first enabling the registry transaction, and then the atomic file transaction
    within this registry transaction:
@@ -198,17 +198,17 @@
   <programlisting role="php">
    <![CDATA[
 <?php
-$reg = pear2\Pyrus\Config::current()->registry;
-$package = new pear2\Pyrus\Package('Whatever');
+$reg = PEAR2\Pyrus\Config::current()->registry;
+$package = new PEAR2\Pyrus\Package('Whatever');
 try {
     $reg->begin();
-    pear2\Pyrus\AtomicFileTransaction::begin();
+    PEAR2\Pyrus\AtomicFileTransaction::begin();
     $reg->install($package);
-    pear2\Pyrus\AtomicFileTransaction::commit();
+    PEAR2\Pyrus\AtomicFileTransaction::commit();
     $reg->commit();
 } catch (Exception $e) {
     $reg->rollback();
-    pear2\Pyrus\AtomicFileTransaction::rollback();
+    PEAR2\Pyrus\AtomicFileTransaction::rollback();
     throw $e;
 }
 ?>
@@ -337,8 +337,8 @@
    <title><function>getDependentPackages</function></title>
    <para>
     <function>getDependentPackages</function> requires a single argument,
-    a <literal>pear2\Pyrus\IPackageFile</literal> object.
-    This method returns an array of <literal>pear2\Pyrus\Package</literal>
+    a <literal>PEAR2\Pyrus\IPackageFile</literal> object.
+    This method returns an array of <literal>PEAR2\Pyrus\Package</literal>
     objects representing installed packages that depend upon the package
     passed in.  If the optional second boolean parameter is set to true
     (which it is by default), performance is improved when querying an
@@ -351,7 +351,7 @@
    <para>
     This method is used to implement file conflict detection to prevent
     overwriting installed files with those from another package.  It accepts a
-    single argument, a <literal>pear2\Pyrus\IPackageFile</literal> object.
+    single argument, a <literal>PEAR2\Pyrus\IPackageFile</literal> object.
     The <literal>Pear1</literal> registry is the most efficient at this
     operation (at the expense of drastically decreased efficiency at installation or
     uninstallation), the <literal>Sqlite3</literal> is the next most
@@ -367,9 +367,9 @@
     and returns an array containing the names of registries
     found.  The possible return values include <literal>Sqlite3</literal>,
     <literal>Xml</literal> and <literal>Pear1</literal>.  Note that only a call
-    to <function>pear2\Pyrus\Registry::detectRegistries</function> will return
+    to <function>PEAR2\Pyrus\Registry::detectRegistries</function> will return
     a list of all registries found.  A call to
-    <function>pear2\Pyrus\Registry\Sqlite3::detectRegistries</function> will
+    <function>PEAR2\Pyrus\Registry\Sqlite3::detectRegistries</function> will
     only return either <literal>array()</literal> or
     <literal>array('Sqlite3')</literal> depending on whether the registry exists.
    </para>
@@ -378,10 +378,10 @@
    <title><function>removeRegistry</function></title>
    <para>
     This static method accepts a string containing the path to remove a registry
-    from.  A call to <function>pear2\Pyrus\Registry::removeRegistry</function>
+    from.  A call to <function>PEAR2\Pyrus\Registry::removeRegistry</function>
     will completely remove all traces of a PEAR installation.  A call to
     an individual registry's removeRegistry, such as a call to
-    <function>pear2\Pyrus\Registry\Pear1::removeRegistry</function> will only
+    <function>PEAR2\Pyrus\Registry\Pear1::removeRegistry</function> will only
     remove that registry from the installation path.
    </para>
   </section>

Modified: pear/peardoc/trunk/en/pyrus/plugins/role.xml
===================================================================
--- pear/peardoc/trunk/en/pyrus/plugins/role.xml	2011-05-04 10:35:04 UTC (rev 310757)
+++ pear/peardoc/trunk/en/pyrus/plugins/role.xml	2011-05-04 13:51:49 UTC (rev 310758)
@@ -83,18 +83,18 @@
   </para>
   <programlisting role="php">
    <![CDATA[
-    function validate(\pear2\Pyrus\IPackage $package, array $file)
+    function validate(\PEAR2\Pyrus\IPackage $package, array $file)
     {
-        $parser = new \pear2\Pyrus\XMLParser;
-        $schemapath = \pear2\Pyrus\Main::getDataPath();
-        if (!file_exists(\pear2\Pyrus\Main::getDataPath() . '/customrole-2.0.xsd')) {
+        $parser = new \PEAR2\Pyrus\XMLParser;
+        $schemapath = \PEAR2\Pyrus\Main::getDataPath();
+        if (!file_exists(\PEAR2\Pyrus\Main::getDataPath() . '/customrole-2.0.xsd')) {
             $schemapath = realpath(__DIR__ . '/../../../../data');
         }
         $taskschema = $schemapath . '/customrole-2.0.xsd';
         try {
             $taskinfo = $parser->parse($package->getFilePath($file['attribs']['name']), $taskschema);
         } catch (\Exception $e) {
-            throw new \pear2\Pyrus\Installer\Role\Exception('Invalid custom role definition file,' .
+            throw new \PEAR2\Pyrus\Installer\Role\Exception('Invalid custom role definition file,' .
                                                            ' file does not conform to the schema', $e);
         }
     }

Modified: pear/peardoc/trunk/en/pyrus/plugins/task.xml
===================================================================
--- pear/peardoc/trunk/en/pyrus/plugins/task.xml	2011-05-04 10:35:04 UTC (rev 310757)
+++ pear/peardoc/trunk/en/pyrus/plugins/task.xml	2011-05-04 13:51:49 UTC (rev 310758)
@@ -42,7 +42,7 @@
  <section xml:id="pyrus.plugins.task.taskclass">
   <title>Defining the task: the task class</title>
   <para>
-   A custom file task must extend the <literal>\pear2\Pyrus\Task\Common</literal>
+   A custom file task must extend the <literal>\PEAR2\Pyrus\Task\Common</literal>
    class, and must implement a few methods:
    <itemizedlist>
     <listitem><simpara><function>validateXml</function></simpara></listitem>
@@ -66,18 +66,18 @@
   <para>
    <constant>PHASE</constant> should be one of:
    <itemizedlist>
-    <listitem><simpara><constant>\pear2\Pyrus\Task\Common::PACKAGE</constant></simpara></listitem>
-    <listitem><simpara><constant>\pear2\Pyrus\Task\Common::INSTALL</constant></simpara></listitem>
-    <listitem><simpara><constant>\pear2\Pyrus\Task\Common::PACKAGEANDINSTALL</constant></simpara></listitem>
-    <listitem><simpara><constant>\pear2\Pyrus\Task\Common::POSTINSTALL</constant></simpara></listitem>
+    <listitem><simpara><constant>\PEAR2\Pyrus\Task\Common::PACKAGE</constant></simpara></listitem>
+    <listitem><simpara><constant>\PEAR2\Pyrus\Task\Common::INSTALL</constant></simpara></listitem>
+    <listitem><simpara><constant>\PEAR2\Pyrus\Task\Common::PACKAGEANDINSTALL</constant></simpara></listitem>
+    <listitem><simpara><constant>\PEAR2\Pyrus\Task\Common::POSTINSTALL</constant></simpara></listitem>
    </itemizedlist>
-   <constant>\pear2\Pyrus\Task\Common::POSTINSTALL</constant> is only used by
+   <constant>\PEAR2\Pyrus\Task\Common::POSTINSTALL</constant> is only used by
    post-install scripts, the other 3 are used to determine at what time the
    task should be called.  If your custom task only works at installation-time,
-   use <constant>\pear2\Pyrus\Task\Common::INSTALL</constant>.  If the task can
+   use <constant>\PEAR2\Pyrus\Task\Common::INSTALL</constant>.  If the task can
    perform only at package time (this is exceedingly rare), use
-   <constant>\pear2\Pyrus\Task\Common::PACKAGE</constant>.  Most tasks should use
-   <constant>\pear2\Pyrus\Task\Common::PACKAGEANDINSTALL</constant>.  If your task
+   <constant>\PEAR2\Pyrus\Task\Common::PACKAGE</constant>.  Most tasks should use
+   <constant>\PEAR2\Pyrus\Task\Common::PACKAGEANDINSTALL</constant>.  If your task
    can perform its task at packaging time, then you should override the
    <function>isPreProcessed</function> method and return true.  Some tasks, such
    as the <literal>replace</literal> task, perform some of their actions at
@@ -90,7 +90,7 @@
    task, and is passed a read/write file resource that is set to the beginning
    of the file being installed.  The full path of the file's final installation
    location is also passed in, and can be used for throwing exceptions.  All
-   errors should be handled by throwing a <literal>pear2\Pyrus\Task\Exception</literal>
+   errors should be handled by throwing a <literal>PEAR2\Pyrus\Task\Exception</literal>
    or one of its descendants.
   </para>
   <para>
@@ -109,10 +109,10 @@
   <programlisting role="php">
    <![CDATA[
 <?php
-class MyPlugin_Taskname extends \pear2\Pyrus\Task\Common
+class MyPlugin_Taskname extends \PEAR2\Pyrus\Task\Common
 {
     const TYPE = 'simple';
-    const PHASE = \pear2\Pyrus\Task\Common::PACKAGEANDINSTALL;
+    const PHASE = \PEAR2\Pyrus\Task\Common::PACKAGEANDINSTALL;

     /**
      * Initialize a task instance with the parameters
@@ -124,9 +124,9 @@
     {
         parent::__construct($pkg, $phase, $xml, $attribs, $lastversion);
         // do any special parsing of attributes/contents here
-        // phase is one of \pear2\Pyrus\Task\Common::PACKAGE,
-        // \pear2\Pyrus\Task\Common::INSTALL, or
-        // \pear2\Pyrus\Task\Common::POSTINSTALL
+        // phase is one of \PEAR2\Pyrus\Task\Common::PACKAGE,
+        // \PEAR2\Pyrus\Task\Common::INSTALL, or
+        // \PEAR2\Pyrus\Task\Common::POSTINSTALL
     }

     /**
@@ -135,23 +135,23 @@
      * @param array
      * @param array the entire parsed <file> tag
      * @param string the filename of the package.xml
-     * @throws \pear2\Pyrus\Task\Exception\InvalidTask
-     * @throws \pear2\Pyrus\Task\Exception\NoAttributes
-     * @throws \pear2\Pyrus\Task\Exception\MissingAttribute
-     * @throws \pear2\Pyrus\Task\Exception\WrongAttributeValue
+     * @throws \PEAR2\Pyrus\Task\Exception\InvalidTask
+     * @throws \PEAR2\Pyrus\Task\Exception\NoAttributes
+     * @throws \PEAR2\Pyrus\Task\Exception\MissingAttribute
+     * @throws \PEAR2\Pyrus\Task\Exception\WrongAttributeValue
      */
-    static function validateXml(pear2\Pyrus\IPackage $pkg, $xml, $fileXml, $file)
+    static function validateXml(PEAR2\Pyrus\IPackage $pkg, $xml, $fileXml, $file)
     {
         if (!isset($xml['attribs'])) {
-            throw new \pear2\Pyrus\Task\Exception\NoAttributes('taskname', $file);
+            throw new \PEAR2\Pyrus\Task\Exception\NoAttributes('taskname', $file);
         }
         if (!isset($xml['attribs']['attributename'])) {
-            throw new \pear2\Pyrus\Task\Exception\MissingAttribute('taskname',
+            throw new \PEAR2\Pyrus\Task\Exception\MissingAttribute('taskname',
                                                                   $attrib, $file);
         }
         if ($xml['attribs']['attributename'] != 'hi'
             && $xml['attribs']['attributename'] != 'bye') {
-            throw new \pear2\Pyrus\Task\Exception\WrongAttributeValue('taskname',
+            throw new \PEAR2\Pyrus\Task\Exception\WrongAttributeValue('taskname',
                                                                      'attributename',
                                                                      $xml['attribs']['attributename'],
                                                                      $file,
@@ -159,7 +159,7 @@
             }
         }
         if (MyPlugin_Other_Class::somecondition()) {
-            throw new \pear2\Pyrus\Task\Exception\InvalidTask(
+            throw new \PEAR2\Pyrus\Task\Exception\InvalidTask(
                 'general validation errors should use this exception');
         }
         return true;
@@ -167,16 +167,16 @@

     /**
      * Perform the taskname task
-     * @param \pear2\Pyrus\IPackage
+     * @param \PEAR2\Pyrus\IPackage
      * @param resource open file pointer, set to the beginning of the file
      * @param string the eventual final file location (informational only)
      * @return string|false
      */
     function startSession($fp, $dest)
     {
-        // use \pear2\Pyrus\Logger::log() to send messages to the user
-        \pear2\Pyrus\Logger::log(3, 'doing stuff');
-        \pear2\Pyrus\Logger::log(0, 'doing more important stuff');
+        // use \PEAR2\Pyrus\Logger::log() to send messages to the user
+        \PEAR2\Pyrus\Logger::log(3, 'doing stuff');
+        \PEAR2\Pyrus\Logger::log(0, 'doing more important stuff');
         // operate directly on the file pointer
         $contents = stream_get_contents($fp);
         $contents .= 'hi';