Change namespace from pear2 to PEAR2, as approved by the PEAR Group.

README

@@ -3,10 +3,10 @@ Class to perform HTTP requests. Uses an adapter based system for performing thos
 Please see the examples dir for basic usage
 
 Adapters are available for based on the following code and are used in this order:
-pear2\HTTP\Request\Adapter\Http (uses the Pecl Http class)
-pear2\HTTP\Request\Adapter\Curl (based on the curl extension, not complete)
-pear2\HTTP\Request\Adapter\Phpstream (based on the http php stream code)
-pear2\HTTP\Request\Adapter\Phpsocket (based on php sockets, built from PEAR1 HTTP_Request)
+PEAR2\HTTP\Request\Adapter\Http (uses the Pecl Http class)
+PEAR2\HTTP\Request\Adapter\Curl (based on the curl extension, not complete)
+PEAR2\HTTP\Request\Adapter\Phpstream (based on the http php stream code)
+PEAR2\HTTP\Request\Adapter\Phpsocket (based on php sockets, built from PEAR1 HTTP_Request)
 
 Additional adapters:
-pear2\HTTP\Request\Adapter\Filesystem (useful for mock Internet interaction)
+PEAR2\HTTP\Request\Adapter\Filesystem (useful for mock Internet interaction)

examples/adapter.php

@@ -17,8 +17,8 @@
 		continue;
 	}
 
-	$class = 'pear2\HTTP\Request\Adapter\\'.$adapter;
-	$request = new pear2\HTTP\Request($url,new $class);
+	$class = 'PEAR2\HTTP\Request\Adapter\\'.$adapter;
+	$request = new PEAR2\HTTP\Request($url,new $class);
 	$response = $request->sendRequest();
 
 	echo "$adapter adapter\n";

examples/get.php

@@ -4,7 +4,7 @@
 // to run from svn checkout
 require_once '../../autoload.php';
 
-$request = new pear2\HTTP\Request('http://pear.php.net/');
+$request = new PEAR2\HTTP\Request('http://pear.php.net/');
 $response = $request->sendRequest();
 
 var_dump($response->code);

examples/head.php

@@ -4,7 +4,7 @@
 // to run from svn checkout
 require_once '../../autoload.php';
 
-$request = new pear2\HTTP\Request('http://pear.php.net/');
+$request = new PEAR2\HTTP\Request('http://pear.php.net/');
 $request->verb = 'HEAD';
 $response = $request->sendRequest();
 

examples/post.php

@@ -4,7 +4,7 @@
 // to run from svn checkout
 require_once '../../autoload.php';
 
-$request = new pear2\HTTP\Request('http://bluga.net/post.php');
+$request = new PEAR2\HTTP\Request('http://bluga.net/post.php');
 $request->body = array('test1'=>'value1','test2'=>'value2');
 
 $response = $request->sendRequest();

makepackage.php

@@ -3,13 +3,13 @@
 ini_set('display_errors',true);
 require_once dirname(__FILE__).'/../autoload.php';
 
-$a = new pear2\Pyrus\PEAR2SVN(dirname(__FILE__), 'PEAR2_HTTP_Request');
+$a = new PEAR2\Pyrus\PEAR2SVN(dirname(__FILE__), 'PEAR2_HTTP_Request');
 
-$package = new pear2\Pyrus\Package('package.xml');
+$package = new PEAR2\Pyrus\Package('package.xml');
 $outfile = $package->name.'-'.$package->version['release'];
-$a = new pear2\Pyrus\Creator(
-	new pear2\Pyrus\Tar($outfile.'.tar', 'none'),
-	//new pear2\Pyrus\Phar($outfile.'.tgz', false, Phar::TAR, Phar::GZ),
+$a = new PEAR2\Pyrus\Creator(
+	new PEAR2\Pyrus\Tar($outfile.'.tar', 'none'),
+	//new PEAR2\Pyrus\Phar($outfile.'.tgz', false, Phar::TAR, Phar::GZ),
 	dirname(__FILE__).'/../Exception/src',
 	dirname(__FILE__).'/../Autoload/src',
 	dirname(__FILE__).'/../MultiErrors/src'

package.xml

@@ -8,13 +8,13 @@
 Please see the examples dir for basic usage
 
 Adapters are available for based on the following code and are used in this order:
-pear2\HTTP\Request\Adapter\Http (uses the Pecl Http class)
-pear2\HTTP\Request\Adapter\Curl (based on the curl extension, not complete)
-pear2\HTTP\Request\Adapter\Phpstream (based on the http php stream code)
-pear2\HTTP\Request\Adapter\Phpsocket (based on php sockets, built from PEAR1 HTTP_Request)
+PEAR2\HTTP\Request\Adapter\Http (uses the Pecl Http class)
+PEAR2\HTTP\Request\Adapter\Curl (based on the curl extension, not complete)
+PEAR2\HTTP\Request\Adapter\Phpstream (based on the http php stream code)
+PEAR2\HTTP\Request\Adapter\Phpsocket (based on php sockets, built from PEAR1 HTTP_Request)
 
 Additional adapters:
-pear2\HTTP\Request\Adapter\Filesystem (useful for mock Internet interaction)
+PEAR2\HTTP\Request\Adapter\Filesystem (useful for mock Internet interaction)
 </description>
  <lead>
   <name>Joshua Eichorn</name>
@@ -73,7 +73,7 @@ pear2\HTTP\Request\Adapter\Filesystem (useful for mock Internet interaction)
     <file role="doc" name="head.php"/>
     <file role="doc" name="post.php"/>
    </dir>
-   <dir name="src" baseinstalldir="pear2">
+   <dir name="src" baseinstalldir="PEAR2">
     <dir name="HTTP">
      <dir name="Request">
       <dir name="Adapter">

package_compatible.xml

@@ -8,13 +8,13 @@
 Please see the examples dir for basic usage
 
 Adapters are available for based on the following code and are used in this order:
-pear2\HTTP\Request\Adapter\Http (uses the Pecl Http class)
-pear2\HTTP\Request\Adapter\Curl (based on the curl extension, not complete)
-pear2\HTTP\Request\Adapter\Phpstream (based on the http php stream code)
-pear2\HTTP\Request\Adapter\Phpsocket (based on php sockets, built from PEAR1 HTTP_Request)
+PEAR2\HTTP\Request\Adapter\Http (uses the Pecl Http class)
+PEAR2\HTTP\Request\Adapter\Curl (based on the curl extension, not complete)
+PEAR2\HTTP\Request\Adapter\Phpstream (based on the http php stream code)
+PEAR2\HTTP\Request\Adapter\Phpsocket (based on php sockets, built from PEAR1 HTTP_Request)
 
 Additional adapters:
-pear2\HTTP\Request\Adapter\Filesystem (useful for mock Internet interaction)
+PEAR2\HTTP\Request\Adapter\Filesystem (useful for mock Internet interaction)
 </description>
  <lead>
   <name>Joshua Eichorn</name>
@@ -89,19 +89,19 @@ pear2\HTTP\Request\Adapter\Filesystem (useful for mock Internet interaction)
    <file role="test" name="test/PEAR2_HTTP_Request/pear2.php.net/headers.002.phpt"/>
    <file role="test" name="test/PEAR2_HTTP_Request/pear2.php.net/headers.001.phpt"/>
    <file role="test" name="test/PEAR2_HTTP_Request/pear2.php.net/get_large_file.phpt"/>
-   <file role="php" name="php/pear2/HTTP/Request/Uri.php"/>
-   <file role="php" name="php/pear2/HTTP/Request/Response.php"/>
-   <file role="php" name="php/pear2/HTTP/Request/Listener.php"/>
-   <file role="php" name="php/pear2/HTTP/Request/Headers.php"/>
-   <file role="php" name="php/pear2/HTTP/Request/Exception.php"/>
-   <file role="php" name="php/pear2/HTTP/Request/allfiles.php"/>
-   <file role="php" name="php/pear2/HTTP/Request/Adapter/Phpstream.php"/>
-   <file role="php" name="php/pear2/HTTP/Request/Adapter/Phpsocket.php"/>
-   <file role="php" name="php/pear2/HTTP/Request/Adapter/Http.php"/>
-   <file role="php" name="php/pear2/HTTP/Request/Adapter/Filesystem.php"/>
-   <file role="php" name="php/pear2/HTTP/Request/Adapter/Curl.php"/>
-   <file role="php" name="php/pear2/HTTP/Request/Adapter.php"/>
-   <file role="php" name="php/pear2/HTTP/Request.php"/>
+   <file role="php" name="php/PEAR2/HTTP/Request/Uri.php"/>
+   <file role="php" name="php/PEAR2/HTTP/Request/Response.php"/>
+   <file role="php" name="php/PEAR2/HTTP/Request/Listener.php"/>
+   <file role="php" name="php/PEAR2/HTTP/Request/Headers.php"/>
+   <file role="php" name="php/PEAR2/HTTP/Request/Exception.php"/>
+   <file role="php" name="php/PEAR2/HTTP/Request/allfiles.php"/>
+   <file role="php" name="php/PEAR2/HTTP/Request/Adapter/Phpstream.php"/>
+   <file role="php" name="php/PEAR2/HTTP/Request/Adapter/Phpsocket.php"/>
+   <file role="php" name="php/PEAR2/HTTP/Request/Adapter/Http.php"/>
+   <file role="php" name="php/PEAR2/HTTP/Request/Adapter/Filesystem.php"/>
+   <file role="php" name="php/PEAR2/HTTP/Request/Adapter/Curl.php"/>
+   <file role="php" name="php/PEAR2/HTTP/Request/Adapter.php"/>
+   <file role="php" name="php/PEAR2/HTTP/Request.php"/>
    <file role="doc" name="doc/PEAR2_HTTP_Request/pear2.php.net/examples/examples/post.php"/>
    <file role="doc" name="doc/PEAR2_HTTP_Request/pear2.php.net/examples/examples/head.php"/>
    <file role="doc" name="doc/PEAR2_HTTP_Request/pear2.php.net/examples/examples/get.php"/>
@@ -124,19 +124,19 @@ pear2\HTTP\Request\Adapter\Filesystem (useful for mock Internet interaction)
    <install name="doc/PEAR2_HTTP_Request/pear2.php.net/examples/examples/get.php" as="pear2.php.net/examples/examples/get.php"/>
    <install name="doc/PEAR2_HTTP_Request/pear2.php.net/examples/examples/head.php" as="pear2.php.net/examples/examples/head.php"/>
    <install name="doc/PEAR2_HTTP_Request/pear2.php.net/examples/examples/post.php" as="pear2.php.net/examples/examples/post.php"/>
-   <install name="php/pear2/HTTP/Request.php" as="pear2/HTTP/Request.php"/>
-   <install name="php/pear2/HTTP/Request/Adapter.php" as="pear2/HTTP/Request/Adapter.php"/>
-   <install name="php/pear2/HTTP/Request/Adapter/Curl.php" as="pear2/HTTP/Request/Adapter/Curl.php"/>
-   <install name="php/pear2/HTTP/Request/Adapter/Filesystem.php" as="pear2/HTTP/Request/Adapter/Filesystem.php"/>
-   <install name="php/pear2/HTTP/Request/Adapter/Http.php" as="pear2/HTTP/Request/Adapter/Http.php"/>
-   <install name="php/pear2/HTTP/Request/Adapter/Phpsocket.php" as="pear2/HTTP/Request/Adapter/Phpsocket.php"/>
-   <install name="php/pear2/HTTP/Request/Adapter/Phpstream.php" as="pear2/HTTP/Request/Adapter/Phpstream.php"/>
-   <install name="php/pear2/HTTP/Request/allfiles.php" as="pear2/HTTP/Request/allfiles.php"/>
-   <install name="php/pear2/HTTP/Request/Exception.php" as="pear2/HTTP/Request/Exception.php"/>
-   <install name="php/pear2/HTTP/Request/Headers.php" as="pear2/HTTP/Request/Headers.php"/>
-   <install name="php/pear2/HTTP/Request/Listener.php" as="pear2/HTTP/Request/Listener.php"/>
-   <install name="php/pear2/HTTP/Request/Response.php" as="pear2/HTTP/Request/Response.php"/>
-   <install name="php/pear2/HTTP/Request/Uri.php" as="pear2/HTTP/Request/Uri.php"/>
+   <install name="php/PEAR2/HTTP/Request.php" as="PEAR2/HTTP/Request.php"/>
+   <install name="php/PEAR2/HTTP/Request/Adapter.php" as="PEAR2/HTTP/Request/Adapter.php"/>
+   <install name="php/PEAR2/HTTP/Request/Adapter/Curl.php" as="PEAR2/HTTP/Request/Adapter/Curl.php"/>
+   <install name="php/PEAR2/HTTP/Request/Adapter/Filesystem.php" as="PEAR2/HTTP/Request/Adapter/Filesystem.php"/>
+   <install name="php/PEAR2/HTTP/Request/Adapter/Http.php" as="PEAR2/HTTP/Request/Adapter/Http.php"/>
+   <install name="php/PEAR2/HTTP/Request/Adapter/Phpsocket.php" as="PEAR2/HTTP/Request/Adapter/Phpsocket.php"/>
+   <install name="php/PEAR2/HTTP/Request/Adapter/Phpstream.php" as="PEAR2/HTTP/Request/Adapter/Phpstream.php"/>
+   <install name="php/PEAR2/HTTP/Request/allfiles.php" as="PEAR2/HTTP/Request/allfiles.php"/>
+   <install name="php/PEAR2/HTTP/Request/Exception.php" as="PEAR2/HTTP/Request/Exception.php"/>
+   <install name="php/PEAR2/HTTP/Request/Headers.php" as="PEAR2/HTTP/Request/Headers.php"/>
+   <install name="php/PEAR2/HTTP/Request/Listener.php" as="PEAR2/HTTP/Request/Listener.php"/>
+   <install name="php/PEAR2/HTTP/Request/Response.php" as="PEAR2/HTTP/Request/Response.php"/>
+   <install name="php/PEAR2/HTTP/Request/Uri.php" as="PEAR2/HTTP/Request/Uri.php"/>
    <install name="test/PEAR2_HTTP_Request/pear2.php.net/get_large_file.phpt" as="pear2.php.net/get_large_file.phpt"/>
    <install name="test/PEAR2_HTTP_Request/pear2.php.net/headers.001.phpt" as="pear2.php.net/headers.001.phpt"/>
    <install name="test/PEAR2_HTTP_Request/pear2.php.net/headers.002.phpt" as="pear2.php.net/headers.002.phpt"/>

src/HTTP/Request.php

@@ -6,7 +6,7 @@
  *
  * @version $Id$
  */
-namespace pear2\HTTP;
+namespace PEAR2\HTTP;
 class Request 
 {
 
@@ -83,7 +83,7 @@ public function __set($name, $value)
      * sets up the adapter
      *
      * @param string                     $url      URL for this request
-     * @param pear2\HTTP\Request\Adapter $instance The adapter to use
+     * @param PEAR2\HTTP\Request\Adapter $instance The adapter to use
      */
     public function __construct($url = null, $instance = null) 
     {
@@ -109,7 +109,7 @@ public function __construct($url = null, $instance = null)
     /**
      * asks for a response class from the adapter
      *
-     * @return pear2\HTTP\Request\Response
+     * @return PEAR2\HTTP\Request\Response
      */
     public function sendRequest() 
     {
@@ -121,7 +121,7 @@ public function sendRequest()
      * Sends a request storing the output to a file
      *
      * @param  string $file File to store too
-     * @return pear2\HTTP\Request\Response with no body
+     * @return PEAR2\HTTP\Request\Response with no body
      */
     public function requestToFile($file)
     {
@@ -157,7 +157,7 @@ public function setHeader($header, $value)
      *  - 'gotBody'    : Upon receiving body of the message
      *
      *
-     * @param  pear2\HTTP\Request\Listener $listener  The listener object
+     * @param  PEAR2\HTTP\Request\Listener $listener  The listener object
      * @return boolean Whether object is a listener or not
      */
     public function attach(Request\Listener $listener)
@@ -173,7 +173,7 @@ public function attach(Request\Listener $listener)
      * This method will detach the listener that was set
      * to a request.
      *
-     * @param  pear2\HTTP\Request\Listener $listener   The listener
+     * @param  PEAR2\HTTP\Request\Listener $listener   The listener
      * @return bool true
      */
     public function detach(Request\Listener $listener)
@@ -194,7 +194,7 @@ public function detach(Request\Listener $listener)
      *
      * @param     string  $event  The event name
      * @param     mixed  $data   Additional data
-     * @see       pear2\HTTP\Request->attach()
+     * @see       PEAR2\HTTP\Request->attach()
      * @return    void
      */
     protected function _notify($event, $data = null)

src/HTTP/Request/Adapter.php

@@ -1,5 +1,5 @@
 <?php
-namespace pear2\HTTP\Request;
+namespace PEAR2\HTTP\Request;
 abstract class Adapter 
 {
 
@@ -48,7 +48,7 @@ abstract class Adapter
 
     /**
      * Full uri of the proxy server
-     * @var pear2\HTTP\Request\Uri
+     * @var PEAR2\HTTP\Request\Uri
      */
     public $proxy = null;
 

src/HTTP/Request/Adapter/Curl.php

@@ -1,6 +1,6 @@
 <?php
-namespace pear2\HTTP\Request\Adapter;
-use pear2\HTTP\Request;
+namespace PEAR2\HTTP\Request\Adapter;
+use PEAR2\HTTP\Request;
 class Curl extends Request\Adapter
 {
     static public $whichOne;

src/HTTP/Request/Adapter/Filesystem.php

@@ -1,6 +1,6 @@
 <?php
-namespace pear2\HTTP\Request\Adapter;
-use pear2\HTTP\Request;
+namespace PEAR2\HTTP\Request\Adapter;
+use PEAR2\HTTP\Request;
 class Filesystem extends Request\Adapter
 {
     public static $requestMap;
@@ -9,7 +9,7 @@ class Filesystem extends Request\Adapter
      * Add a local filesystem directory, and map it to a url base.
      * 
      * <code>
-     * pear2\HTTP\Request\Adapter\Filesystem::addDirectory(
+     * PEAR2\HTTP\Request\Adapter\Filesystem::addDirectory(
      *                  '/var/www/html/pear2.php.net',
      *                  'http://pear2.php.net/');
      * </code>
@@ -55,7 +55,7 @@ public function sendRequest()
             $details['code'] = '200';
         }
         // $this->verb is GET/POST/etc.
-        // $this->uri is pear2\HTTP\Request\Uri
+        // $this->uri is PEAR2\HTTP\Request\Uri
         // $this->headers is array of headers
         // $this->body is request body
 

src/HTTP/Request/Adapter/Http.php

@@ -1,6 +1,6 @@
 <?php
-namespace pear2\HTTP\Request\Adapter;
-use pear2\HTTP\Request;
+namespace PEAR2\HTTP\Request\Adapter;
+use PEAR2\HTTP\Request;
 class Http extends Request\Adapter
 {
     protected $request;

src/HTTP/Request/Adapter/Phpsocket.php

@@ -1,6 +1,6 @@
 <?php
-namespace pear2\HTTP\Request\Adapter;
-use pear2\HTTP\Request;
+namespace PEAR2\HTTP\Request\Adapter;
+use PEAR2\HTTP\Request;
 class Phpsocket_Socket
 {
     public $lineLength = 2048;

src/HTTP/Request/Adapter/Phpstream.php

@@ -6,8 +6,8 @@
  *
  * @version $Revision: 1.52 $
  */
-namespace pear2\HTTP\Request\Adapter;
-use pear2\HTTP\Request;
+namespace PEAR2\HTTP\Request\Adapter;
+use PEAR2\HTTP\Request;
 class PhpStream extends Request\Adapter
 {
     private $_phpErrorStr;

src/HTTP/Request/Exception.php

@@ -1,4 +1,4 @@
 <?php
-namespace pear2\HTTP\Request;
+namespace PEAR2\HTTP\Request;
 class Exception extends \Exception {
 }

src/HTTP/Request/Headers.php

@@ -10,7 +10,7 @@
  *
  * @todo decide if this should be pulled out of the package and provided as a generic class
  */
-namespace pear2\HTTP\Request;
+namespace PEAR2\HTTP\Request;
 class Headers implements \Iterator, \ArrayAccess, \Countable
 {
 

src/HTTP/Request/Listener.php

@@ -52,7 +52,7 @@
 * @author      Alexey Borzov <avb@php.net>
 * @version     Release: @package_version@
 */
-namespace pear2\HTTP\Request;
+namespace PEAR2\HTTP\Request;
 class Listener 
 {
     /**

src/HTTP/Request/Response.php

@@ -3,7 +3,7 @@
  * A class which represents an HTTP Reponse
  *
  */
-namespace pear2\HTTP\Request;
+namespace PEAR2\HTTP\Request;
 class Response
 {
     /**

src/HTTP/Request/Uri.php

@@ -5,7 +5,7 @@
  *
  * Basically compatiable with Net_URL2 propery names but not methods
  */
-namespace pear2\HTTP\Request;
+namespace PEAR2\HTTP\Request;
 class Uri
 {
 

tests/get_large_file.phpt

@@ -7,8 +7,8 @@ memory_limit=1m
 require_once dirname(__FILE__)."/_setup.php";
 
 
-$adapter = new pear2\HTTP\Request\Adapter\Curl(); // curl extension
-$request = new pear2\HTTP\Request($testServer."2meg.bin",$adapter);
+$adapter = new PEAR2\HTTP\Request\Adapter\Curl(); // curl extension
+$request = new PEAR2\HTTP\Request($testServer."2meg.bin",$adapter);
 
 $temp = tempnam('/tmp','phpt');
 

tests/headers.001.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Test of object access for pear2\HTTP\Request\Headers
+Test of object access for PEAR2\HTTP\Request\Headers
 --FILE--
 <?php
 require_once dirname(__FILE__).'/_setup.php';
@@ -8,7 +8,7 @@ $in = array(
 	'ETag'		=> 'EADAF124D',
 	'content-length'=> '10'
 	);
-$headers = new pear2\HTTP\Request\Headers($in);
+$headers = new PEAR2\HTTP\Request\Headers($in);
 
 var_dump($headers->ContentType);
 var_dump($headers->ETag);