Merge branch 'master' into markup

kokx · kokx · commit 91571ecde79e · 2010-09-26T12:15:13.000+02:00
Conflicts:
	library/Zend/Markup/Parser/BBCode.php
	library/Zend/Markup/Renderer/HTML.php
	library/Zend/Markup/Renderer/RendererAbstract.php
diff --git a/src/Client.php b/src/Client.php
@@ -24,15 +24,15 @@
  * @namespace
  */
 namespace Zend\XmlRpc;
-use Zend\HTTP,
+use Zend\Http,
     Zend\XmlRpc\Value;
 
 /**
  * An XML-RPC client implementation
  *
- * @uses       Zend\HTTP\Client
+ * @uses       Zend\Http\Client
  * @uses       Zend\XmlRpc\Client\FaultException
- * @uses       Zend\XmlRpc\Client\HTTPException
+ * @uses       Zend\XmlRpc\Client\HttpException
  * @uses       Zend\XmlRpc\Client\ServerIntrospection
  * @uses       Zend\XmlRpc\Client\ServerProxy
  * @uses       Zend\XmlRpc\Fault
@@ -56,7 +56,7 @@ class Client
 
     /**
      * HTTP Client to use for requests
-     * @var Zend\HTTP\Client
+     * @var Zend\Http\Client
      */
     protected $_httpClient = null;
 
@@ -95,13 +95,13 @@ class Client
      *
      * @param  string $server      Full address of the XML-RPC service
      *                             (e.g. http://time.xmlrpc.com/RPC2)
-     * @param  Zend\HTTP\Client $httpClient HTTP Client to use for requests
+     * @param  Zend\Http\Client $httpClient HTTP Client to use for requests
      * @return void
      */
-    public function __construct($server, HTTP\Client $httpClient = null)
+    public function __construct($server, Http\Client $httpClient = null)
     {
         if ($httpClient === null) {
-            $this->_httpClient = new HTTP\Client();
+            $this->_httpClient = new Http\Client();
         } else {
             $this->_httpClient = $httpClient;
         }
@@ -114,10 +114,10 @@ public function __construct($server, HTTP\Client $httpClient = null)
     /**
      * Sets the HTTP client object to use for connecting the XML-RPC server.
      *
-     * @param  Zend\HTTP\Client $httpClient
-     * @return Zend\HTTP\Client
+     * @param  Zend\Http\Client $httpClient
+     * @return Zend\Http\Client
      */
-    public function setHttpClient(HTTP\Client $httpClient)
+    public function setHttpClient(Http\Client $httpClient)
     {
         return $this->_httpClient = $httpClient;
     }
@@ -126,7 +126,7 @@ public function setHttpClient(HTTP\Client $httpClient)
     /**
      * Gets the HTTP client object.
      *
-     * @return Zend\HTTP\Client
+     * @return Zend\Http\Client
      */
     public function getHttpClient()
     {
@@ -222,7 +222,7 @@ public function skipSystemLookup()
      * @param Zend\XmlRpc\Request $request
      * @param null|Zend\XmlRpc\Response $response
      * @return void
-     * @throws Zend\XmlRpc\Client\HTTPException
+     * @throws Zend\XmlRpc\Client\HttpException
      */
     public function doRequest($request, $response = null)
     {
@@ -248,13 +248,13 @@ public function doRequest($request, $response = null)
 
         $xml = $this->_lastRequest->__toString();
         $http->setRawData($xml);
-        $httpResponse = $http->request(HTTP\Client::POST);
+        $httpResponse = $http->request(Http\Client::POST);
 
         if (! $httpResponse->isSuccessful()) {
             /**
              * Exception thrown when an HTTP error occurs
              */
-            throw new Client\HTTPException(
+            throw new Client\HttpException(
                 $httpResponse->getMessage(),
                 $httpResponse->getStatus()
             );
diff --git a/src/Client/HttpException.php b/src/Client/HttpException.php
@@ -36,5 +36,5 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class HTTPException extends Exception
+class HttpException extends Exception
 {}
diff --git a/src/Request/Http.php b/src/Request/Http.php
@@ -41,7 +41,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
-class HTTP extends XmlRpcRequest
+class Http extends XmlRpcRequest
 {
     /**
      * Array of headers
diff --git a/src/Response/Http.php b/src/Response/Http.php
@@ -35,7 +35,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
-class HTTP extends XmlRpcResponse
+class Http extends XmlRpcResponse
 {
     /**
      * Override __toString() to send HTTP Content-Type header
diff --git a/src/Server.php b/src/Server.php
@@ -62,13 +62,13 @@
  * @uses       ReflectionClass
  * @uses       Zend\Server\AbstractServer
  * @uses       Zend\Server\Definition
- * @uses       Zend\Server\Reflection\Reflection
+ * @uses       Zend\Server\Reflection
  * @uses       Zend\Server\Reflection\AbstractFunction
  * @uses       Zend\Server\Reflection\ReflectionMethod
  * @uses       Zend\XmlRpc\Request
- * @uses       Zend\XmlRpc\Request\HTTP
+ * @uses       Zend\XmlRpc\Request\Http
  * @uses       Zend\XmlRpc\Response
- * @uses       Zend\XmlRpc\Response\HTTP
+ * @uses       Zend\XmlRpc\Response\Http
  * @uses       Zend\XmlRpc\Server\Exception
  * @uses       Zend\XmlRpc\Server\Fault
  * @uses       Zend\XmlRpc\Server\System
@@ -94,10 +94,10 @@ class Server extends AbstractServer
     protected $_request = null;
 
     /**
-     * Class to use for responses; defaults to {@link Zend\XmlRpc\Response\HTTP}
+     * Class to use for responses; defaults to {@link Zend\XmlRpc\Response\Http}
      * @var string
      */
-    protected $_responseClass = 'Zend\\XmlRpc\\Response\\HTTP';
+    protected $_responseClass = 'Zend\\XmlRpc\\Response\\Http';
 
     /**
      * Dispatch table of name => method pairs
@@ -211,7 +211,7 @@ public function addFunction($function, $namespace = '')
             if (!is_string($func) || !function_exists($func)) {
                 throw new Server\Exception('Unable to attach function; invalid', 611);
             }
-            $reflection = Reflection\Reflection::reflectFunction($func, $argv, $namespace);
+            $reflection = Reflection::reflectFunction($func, $argv, $namespace);
             $this->_buildSignature($reflection);
         }
     }
@@ -245,7 +245,7 @@ public function setClass($class, $namespace = '', $argv = null)
             $argv = array_slice($argv, 2);
         }
 
-        $dispatchable = Reflection\Reflection::reflectClass($class, $argv, $namespace);
+        $dispatchable = Reflection::reflectClass($class, $argv, $namespace);
         foreach ($dispatchable->getMethods() as $reflection) {
             $this->_buildSignature($reflection, $class);
         }
@@ -283,7 +283,7 @@ public function handle($request = false)
         if ((!$request || !$request instanceof Request)
             && (null === ($request = $this->getRequest()))
         ) {
-            $request = new Request\HTTP();
+            $request = new Request\Http();
             $request->setEncoding($this->getEncoding());
         }
 
diff --git a/src/Server/Fault.php b/src/Server/Fault.php
@@ -90,7 +90,7 @@ public function __construct(\Exception $e)
         // Notify exception observers, if present
         if (!empty(self::$_observers)) {
             foreach (array_keys(self::$_observers) as $observer) {
-                call_user_func(array($observer, 'observe'), $this);
+                $observer::observe($this);
             }
         }
     }
diff --git a/src/Value.php b/src/Value.php
@@ -174,6 +174,7 @@ public function saveXml()
     {
         if (!$this->_xml) {
             $this->generateXml();
+            $this->_xml = (string) $this->getGenerator();
         }
         return $this->_xml;
     }
@@ -185,9 +186,7 @@ public function saveXml()
      */
     public function generateXml()
     {
-        if (!$this->_xml) {
-            $this->_generateXml();
-        }
+        $this->_generateXml();
     }
 
     /**
@@ -276,7 +275,7 @@ protected static function _phpVarToNativeXmlRpc($value)
                     return $value;
                 }
 
-                if ($value instanceof \Zend\Crypt\Math\BigInteger\BigInteger) {
+                if ($value instanceof \Zend\Crypt\Math\BigInteger) {
                     return new Value\BigInteger($value);
                 }
 
diff --git a/src/Value/ArrayValue.php b/src/Value/ArrayValue.php
@@ -67,8 +67,6 @@ protected function _generateXml()
         $generator->closeElement('data')
                   ->closeElement('array')
                   ->closeElement('value');
-
-        $this->_xml = (string)$generator;
     }
 }
 
diff --git a/src/Value/BigInteger.php b/src/Value/BigInteger.php
@@ -26,7 +26,7 @@
 namespace Zend\XmlRpc\Value;
 
 /**
- * @uses       \Zend\Crypt\Math\BigInteger\BigInteger
+ * @uses       \Zend\Crypt\Math\BigInteger
  * @uses       \Zend\XmlRpc\Value\Integer
  * @category   Zend
  * @package    Zend_XmlRpc
@@ -37,7 +37,7 @@
 class BigInteger extends Integer
 {
     /**
-     * @var \Zend\Crypt\Math\BigInteger\BigInteger
+     * @var \Zend\Crypt\Math\BigInteger
      */
     protected $_integer;
 
@@ -46,15 +46,15 @@ class BigInteger extends Integer
      */
     public function __construct($value)
     {
-        $this->_integer = new \Zend\Crypt\Math\BigInteger\BigInteger();
+        $this->_integer = new \Zend\Crypt\Math\BigInteger();
         $this->_value   = $this->_integer->init($this->_value);
         $this->_type    = self::XMLRPC_TYPE_I8;
     }
 
     /**
      * Return bigint value object
      *
-     * @return \Zend\Crypt\Math\BigInteger\BigInteger
+     * @return \Zend\Crypt\Math\BigInteger
      */
     public function getValue()
     {
diff --git a/src/Value/Scalar.php b/src/Value/Scalar.php
@@ -50,7 +50,5 @@ protected function _generateXml()
                   ->openElement($this->_type, $this->_value)
                   ->closeElement($this->_type)
                   ->closeElement('value');
-
-        $this->_xml = (string)$generator;
     }
 }
diff --git a/src/Value/Struct.php b/src/Value/Struct.php
@@ -69,6 +69,5 @@ protected function _generateXML()
         }
         $generator->closeElement('struct')
                   ->closeElement('value');
-        $this->_xml = (string)$generator;
     }
 }
diff --git a/test/ClientTest.php b/test/ClientTest.php
@@ -25,8 +25,8 @@
  */
 namespace ZendTest\XmlRpc;
 
-use Zend\HTTP\Client\Adapter,
-    Zend\HTTP,
+use Zend\Http\Client\Adapter,
+    Zend\Http,
     Zend\XmlRpc\Client,
     Zend\XmlRpc\Value,
     Zend\XmlRpc;
@@ -61,7 +61,7 @@ class ClientTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->httpAdapter = new Adapter\Test();
-        $this->httpClient = new HTTP\Client('http://foo',
+        $this->httpClient = new Http\Client('http://foo',
                                     array('adapter' => $this->httpAdapter));
 
         $this->xmlrpcClient = new Client('http://foo');
@@ -74,14 +74,14 @@ public function testGettingDefaultHttpClient()
     {
         $xmlrpcClient = new Client('http://foo');
         $httpClient = $xmlrpcClient->getHttpClient();
-        $this->assertType('Zend\\HTTP\\Client', $httpClient);
+        $this->assertType('Zend\\Http\\Client', $httpClient);
         $this->assertSame($httpClient, $xmlrpcClient->getHttpClient());
     }
 
     public function testSettingAndGettingHttpClient()
     {
         $xmlrpcClient = new Client('http://foo');
-        $httpClient = new HTTP\Client('http://foo');
+        $httpClient = new Http\Client('http://foo');
         $this->assertNotSame($httpClient, $xmlrpcClient->getHttpClient());
 
         $xmlrpcClient->setHttpClient($httpClient);
@@ -316,7 +316,7 @@ public function testRpcMethodCallThrowsOnHttpFailure()
         $response = $this->makeHttpResponseFrom($body, $status, $message);
         $this->httpAdapter->setResponse($response);
 
-        $this->setExpectedException('Zend\\XmlRpc\\Client\\HTTPException', $message, $status);
+        $this->setExpectedException('Zend\\XmlRpc\\Client\\HttpException', $message, $status);
         $this->xmlrpcClient->call('foo');
     }
 
@@ -617,7 +617,7 @@ public function testSettingNoHttpClientUriForcesClientToSetUri()
     {
         $baseUri = "http://foo:80";
         $this->httpAdapter = new Adapter\Test();
-        $this->httpClient = new HTTP\Client(null, array('adapter' => $this->httpAdapter));
+        $this->httpClient = new Http\Client(null, array('adapter' => $this->httpAdapter));
 
         $this->xmlrpcClient = new Client($baseUri);
         $this->xmlrpcClient->setHttpClient($this->httpClient);
@@ -706,7 +706,7 @@ public function makeHttpResponseFrom($data, $status=200, $message='OK')
     public function makeHttpResponseFor($nativeVars)
     {
         $response = $this->getServerResponseFor($nativeVars);
-        return \Zend\HTTP\Response\Response::fromString($response);
+        return \Zend\Http\Response::fromString($response);
     }
 
     public function mockIntrospector()
@@ -724,7 +724,7 @@ public function mockIntrospector()
 
     public function mockHttpClient()
     {
-        $this->mockedHttpClient = $this->getMock('Zend\\HTTP\\Client');
+        $this->mockedHttpClient = $this->getMock('Zend\\Http\\Client');
         $this->xmlrpcClient->setHttpClient($this->mockedHttpClient);
     }
 }
diff --git a/test/Request/HttpTest.php b/test/Request/HttpTest.php
@@ -29,7 +29,7 @@
     ZendTest\AllTests\StreamWrapper\PHPInput;
 
 /**
- * Test case for Zend\XmlRpc\Request\HTTP
+ * Test case for Zend\XmlRpc\Request\Http
  *
  * @category   Zend
  * @package    Zend_XmlRpc
@@ -76,7 +76,7 @@ public function setUp()
     </params>
 </methodCall>
 EOX;
-        $this->request = new Request\HTTP();
+        $this->request = new Request\Http();
         $this->request->loadXml($this->xml);
 
         $this->server = $_SERVER;
@@ -135,7 +135,7 @@ public function testGetFullRequest()
     public function testCanPassInMethodAndParams()
     {
         try {
-            $request = new Request\HTTP('foo', array('bar', 'baz'));
+            $request = new Request\Http('foo', array('bar', 'baz'));
         } catch (\Exception $e) {
             $this->fail('Should be able to pass in methods and params to request');
         }
@@ -155,7 +155,7 @@ public function testExtendingClassShouldBeAbleToReceiveMethodAndParams()
     public function testHttpRequestReadsFromPhpInput()
     {
         $this->assertNull(PHPInput::argumentsPassedTo('stream_open'));
-        $request = new Request\HTTP();
+        $request = new Request\Http();
         list($path, $mode,) = PHPInput::argumentsPassedTo('stream_open');
         $this->assertSame('php://input', $path);
         $this->assertSame('rb', $mode);
@@ -165,13 +165,13 @@ public function testHttpRequestReadsFromPhpInput()
     public function testHttpRequestGeneratesFaultIfReadFromPhpInputFails()
     {
         PHPInput::methodWillReturn('stream_open', false);
-        $request = new Request\HTTP();
+        $request = new Request\Http();
         $this->assertTrue($request->isFault());
         $this->assertSame(630, $request->getFault()->getCode());
     }
 }
 
-class HTTPTestExtension extends Request\HTTP
+class HTTPTestExtension extends Request\Http
 {
     public function __construct($method = null, $params = null)
     {
diff --git a/test/Server/CacheTest.php b/test/Server/CacheTest.php
diff --git a/test/ValueTest.php b/test/ValueTest.php

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@`
`41`	`41`	`* @license http://framework.zend.com/license/new-bsd New BSD License`
`42`	`42`	`* @version $Id$`
`43`	`43`	`*/`
`44`		`-class HTTP extends XmlRpcRequest`
	`44`	`+class Http extends XmlRpcRequest`
`45`	`45`	`{`
`46`	`46`	`/**`
`47`	`47`	`* Array of headers`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`* @license http://framework.zend.com/license/new-bsd New BSD License`
`36`	`36`	`* @version $Id$`
`37`	`37`	`*/`
`38`		`-class HTTP extends XmlRpcResponse`
	`38`	`+class Http extends XmlRpcResponse`
`39`	`39`	`{`
`40`	`40`	`/**`
`41`	`41`	`* Override __toString() to send HTTP Content-Type header`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public function __construct(\Exception $e)`
`90`	`90`	`// Notify exception observers, if present`
`91`	`91`	`if (!empty(self::$_observers)) {`
`92`	`92`	`foreach (array_keys(self::$_observers) as $observer) {`
`93`		`- call_user_func(array($observer, 'observe'), $this);`
	`93`	`+ $observer::observe($this);`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,7 @@ public function saveXml()`
`174`	`174`	`{`
`175`	`175`	`if (!$this->_xml) {`
`176`	`176`	`$this->generateXml();`
	`177`	`+ $this->_xml = (string) $this->getGenerator();`
`177`	`178`	`}`
`178`	`179`	`return $this->_xml;`
`179`	`180`	`}`
`@@ -185,9 +186,7 @@ public function saveXml()`
`185`	`186`	`*/`
`186`	`187`	`public function generateXml()`
`187`	`188`	`{`
`188`		`- if (!$this->_xml) {`
`189`		`- $this->_generateXml();`
`190`		`- }`
	`189`	`+ $this->_generateXml();`
`191`	`190`	`}`
`192`	`191`
`193`	`192`	`/**`
`@@ -276,7 +275,7 @@ protected static function _phpVarToNativeXmlRpc($value)`
`276`	`275`	`return $value;`
`277`	`276`	`}`
`278`	`277`
`279`		`- if ($value instanceof \Zend\Crypt\Math\BigInteger\BigInteger) {`
	`278`	`+ if ($value instanceof \Zend\Crypt\Math\BigInteger) {`
`280`	`279`	`return new Value\BigInteger($value);`
`281`	`280`	`}`
`282`	`281`
Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,6 @@ protected function _generateXml()`
`67`	`67`	`$generator->closeElement('data')`
`68`	`68`	`->closeElement('array')`
`69`	`69`	`->closeElement('value');`
`70`		`-`
`71`		`- $this->_xml = (string)$generator;`
`72`	`70`	`}`
`73`	`71`	`}`
`74`	`72`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,5 @@ protected function _generateXml()`
`50`	`50`	`->openElement($this->_type, $this->_value)`
`51`	`51`	`->closeElement($this->_type)`
`52`	`52`	`->closeElement('value');`
`53`		`-`
`54`		`- $this->_xml = (string)$generator;`
`55`	`53`	`}`
`56`	`54`	`}`