Move a few more things from PEAR2 to Pyrus

pyrus · Jul 12, 2011 · 94665a2 · 94665a2
1 parent 3514cb8
commit 94665a2
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/examples/update_channel.php b/examples/update_channel.php
@@ -5,17 +5,17 @@
 require __DIR__ . '/../../../autoload.php';
 
 /*
-$channel = new PEAR2_SimpleChannelServer('pear2.php.net','/Library/WebServer/Documents/pearserver', null, '/Users/bbieber/pyrus', array('saltybeagle','cellog'));
+$channel = new Pyrus_SimpleChannelServer('pear2.php.net','/Library/WebServer/Documents/pearserver', null, '/Users/bbieber/pyrus', array('saltybeagle','cellog'));
 if (!@unserialize(file_get_contents('/tmp/categories.inf'))) {
-      $cat = PEAR2_SimpleChannelServer_Categories::create('Name1',
+      $cat = Pyrus_SimpleChannelServer_Categories::create('Name1',
           'Description 1', 'Alias1')->
           create('Name2', 'Description 2')->
           create('Name3', 'Description 3', 'Alias3')->
           create('Name4', 'Description 4');
       file_put_contents('/tmp/categories.inf', serialize($cat));
 }
 
-$categories = PEAR2_SimpleChannelServer_Categories::getCategories();
+$categories = Pyrus_SimpleChannelServer_Categories::getCategories();
 $categories = $channel->listCategories();
 foreach($categories as $category) {
     var_dump($category);

diff --git a/examples/upgradeFromChiara.php b/examples/upgradeFromChiara.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * This example shows how to upgrade a pear channel running Chiara_PEAR_Server
- * to PEAR2_SimpleChannelServer.
+ * to Pyrus_SimpleChannelServer.
  * 
  * All release dates are taken from the package.xml, so we can easily re-create
  * the channel.
@@ -15,8 +15,8 @@
 require_once '/Users/bbieber/pyrus/src/PEAR2/Autoload.php';
 
 // Here we re-create the channel.xml
-$channel = new PEAR2_SimpleChannelServer_Channel('pear.saltybeagle.com','Brett Bieber\'s PEAR Channel','salty','Chiara_PEAR_Server_REST/');
-$scs = new PEAR2_SimpleChannelServer($channel, dirname(__FILE__).'/pearchannel');
+$channel = new Pyrus_SimpleChannelServer_Channel('pear.saltybeagle.com','Brett Bieber\'s PEAR Channel','salty','Chiara_PEAR_Server_REST/');
+$scs = new Pyrus_SimpleChannelServer($channel, dirname(__FILE__).'/pearchannel');
 $scs->saveChannel();
 
 // Path to the get directory.

diff --git a/package.xml b/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <package version="2.1" xmlns="http://pear.php.net/dtd/package-2.1" 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.1     http://pear.php.net/dtd/package-2.1.xsd">
- <name>PEAR2_SimpleChannelServer</name>
+ <name>Pyrus_SimpleChannelServer</name>
  <channel>pear2.php.net</channel>
  <summary>A simple channel server for PEAR compatible channels
 </summary>

diff --git a/package_compatible.xml b/package_compatible.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <package version="2.1" xmlns="http://pear.php.net/dtd/package-2.1" 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.1     http://pear.php.net/dtd/package-2.1.xsd">
- <name>PEAR2_SimpleChannelServer</name>
+ <name>Pyrus_SimpleChannelServer</name>
  <channel>pear2.php.net</channel>
  <summary>A simple channel server for PEAR compatible channels
 </summary>
@@ -54,9 +54,9 @@ More information here: http://pear.php.net/manual/en/channels.scs.php
    <file role="php" name="php/PEAR2/SimpleChannelServer/Channel.php"/>
    <file role="php" name="php/PEAR2/SimpleChannelServer/Categories/Exception.php"/>
    <file role="php" name="php/PEAR2/SimpleChannelServer/Categories.php"/>
-   <file role="doc" name="doc/pear2.php.net/PEAR2_SimpleChannelServer/examples/examples/upgradeFromChiara.php"/>
-   <file role="doc" name="doc/pear2.php.net/PEAR2_SimpleChannelServer/examples/examples/update_channel.php"/>
-   <file role="data" name="customcommand/pear2.php.net/PEAR2_SimpleChannelServer/commands.xml"/>
+   <file role="doc" name="doc/pear2.php.net/Pyrus_SimpleChannelServer/examples/examples/upgradeFromChiara.php"/>
+   <file role="doc" name="doc/pear2.php.net/Pyrus_SimpleChannelServer/examples/examples/update_channel.php"/>
+   <file role="data" name="customcommand/pear2.php.net/Pyrus_SimpleChannelServer/commands.xml"/>
   </dir>
  </contents>
  <dependencies>
@@ -80,9 +80,9 @@ More information here: http://pear.php.net/manual/en/channels.scs.php
  </dependencies>
  <phprelease>
   <filelist>
-   <install name="customcommand/pear2.php.net/PEAR2_SimpleChannelServer/commands.xml" as="PEAR2_SimpleChannelServer/commands.xml"/>
-   <install name="doc/pear2.php.net/PEAR2_SimpleChannelServer/examples/examples/update_channel.php" as="PEAR2_SimpleChannelServer/examples/examples/update_channel.php"/>
-   <install name="doc/pear2.php.net/PEAR2_SimpleChannelServer/examples/examples/upgradeFromChiara.php" as="PEAR2_SimpleChannelServer/examples/examples/upgradeFromChiara.php"/>
+   <install name="customcommand/pear2.php.net/Pyrus_SimpleChannelServer/commands.xml" as="Pyrus_SimpleChannelServer/commands.xml"/>
+   <install name="doc/pear2.php.net/Pyrus_SimpleChannelServer/examples/examples/update_channel.php" as="Pyrus_SimpleChannelServer/examples/examples/update_channel.php"/>
+   <install name="doc/pear2.php.net/Pyrus_SimpleChannelServer/examples/examples/upgradeFromChiara.php" as="Pyrus_SimpleChannelServer/examples/examples/upgradeFromChiara.php"/>
    <install name="php/PEAR2/SimpleChannelServer/Categories.php" as="PEAR2/SimpleChannelServer/Categories.php"/>
    <install name="php/PEAR2/SimpleChannelServer/Categories/Exception.php" as="PEAR2/SimpleChannelServer/Categories/Exception.php"/>
    <install name="php/PEAR2/SimpleChannelServer/Channel.php" as="PEAR2/SimpleChannelServer/Channel.php"/>

diff --git a/pearscs.phar b/pearscs.phar
diff --git a/src/Pyrus/SimpleChannelServer/Main.php b/src/Pyrus/SimpleChannelServer/Main.php
@@ -235,7 +235,7 @@ function listMaintainers($package = null)
      * List release info with dependencies formatted for easy processing
      * by a web frontend.
      *
-     * @param string $package Package name eg: PEAR2_SimpleChannelServer
+     * @param string $package Package name eg: Pyrus_SimpleChannelServer
      *
      * @return array
      */