Skip to content
This repository was archived by the owner on Apr 28, 2020. It is now read-only.

Commit 0270a77

Browse files
kokxkokx
committed
Merge branch 'master' into markup
Conflicts: library/Zend/Markup/Parser/Textile.php library/Zend/Markup/Renderer/AbstractRenderer.php library/Zend/Markup/Renderer/Html.php
2 parents 91571ec + 91c2337 commit 0270a77

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+257
-331
lines changed

‎src/Client.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
* @subpackage Client
1818
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
20-
* @version $Id$
2120
*/
2221

2322
/**
@@ -254,7 +253,7 @@ public function doRequest($request, $response = null)
254253
/**
255254
* Exception thrown when an HTTP error occurs
256255
*/
257-
throw new Client\HttpException(
256+
throw new Client\Exception\HttpException(
258257
$httpResponse->getMessage(),
259258
$httpResponse->getStatus()
260259
);
@@ -335,8 +334,10 @@ public function call($method, $params=array())
335334
/**
336335
* Exception thrown when an XML-RPC fault is returned
337336
*/
338-
throw new Client\FaultException($fault->getMessage(),
339-
$fault->getCode());
337+
throw new Client\Exception\FaultException(
338+
$fault->getMessage(),
339+
$fault->getCode()
340+
);
340341
}
341342

342343
return $this->_lastResponse->getReturnValue();

‎src/Client/Exception.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
* @subpackage Client
1818
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
20-
* @version $Id$
2120
*/
2221

2322
/**
@@ -35,5 +34,5 @@
3534
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
3635
* @license http://framework.zend.com/license/new-bsd New BSD License
3736
*/
38-
class Exception extends \Zend\XmlRpc\Exception
37+
interface Exception extends \Zend\XmlRpc\Exception
3938
{}

‎src/Client/FaultException.php‎ renamed to ‎src/Client/Exception/FaultException.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@
1717
* @subpackage Client
1818
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
20-
* @version $Id$
2120
*/
2221

2322
/**
2423
* @namespace
2524
*/
26-
namespace Zend\XmlRpc\Client;
25+
namespace Zend\XmlRpc\Client\Exception;
2726

2827
/**
2928
* Thrown by Zend_XmlRpc_Client when an XML-RPC fault response is returned.
@@ -35,5 +34,7 @@
3534
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
3635
* @license http://framework.zend.com/license/new-bsd New BSD License
3736
*/
38-
class FaultException extends Exception
37+
class FaultException
38+
extends \BadMethodCallException
39+
implements \Zend\XmlRpc\Client\Exception
3940
{}

‎src/Client/HttpException.php‎ renamed to ‎src/Client/Exception/HttpException.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@
1717
* @subpackage Client
1818
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
20-
* @version $Id$
2120
*/
2221

2322
/**
2423
* @namespace
2524
*/
26-
namespace Zend\XmlRpc\Client;
25+
namespace Zend\XmlRpc\Client\Exception;
2726

2827
/**
2928
* Thrown by Zend_XmlRpc_Client when an HTTP error occurs during an
@@ -36,5 +35,7 @@
3635
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
3736
* @license http://framework.zend.com/license/new-bsd New BSD License
3837
*/
39-
class HttpException extends Exception
38+
class HttpException
39+
extends RuntimeException
40+
implements \Zend\XmlRpc\Client\Exception
4041
{}

‎src/Client/IntrospectException.php‎ renamed to ‎src/Client/Exception/IntrospectException.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@
1717
* @subpackage Client
1818
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
20-
* @version $Id$
2120
*/
2221

2322
/**
2423
* @namespace
2524
*/
26-
namespace Zend\XmlRpc\Client;
25+
namespace Zend\XmlRpc\Client\Exception;
2726

2827
/**
2928
* Thrown by Zend_XmlRpc_Client_Introspection when any error occurs.
@@ -35,5 +34,7 @@
3534
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
3635
* @license http://framework.zend.com/license/new-bsd New BSD License
3736
*/
38-
class IntrospectException extends Exception
37+
class IntrospectException
38+
extends \InvalidArgumentException
39+
implements \Zend\XmlRpc\Client\Exception
3940
{}

‎src/Client/Exception/InvalidArgumentException.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?php
2+
3+
namespace Zend\XmlRpc\Exception;
4+
5+
class InvalidArgumentException
6+
extends \InvalidArgumentException
7+
implements \Zend\XmlRpc\Exception
8+
{}
9+

‎src/Client/Exception/RuntimeException.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?php
2+
3+
namespace Zend\XmlRpc\Client\Exception;
4+
5+
class RuntimeException
6+
extends \RuntimeException
7+
implements \Zend\XmlRpc\Client\Exception
8+
{}
9+

‎src/Client/ServerIntrospection.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
* @subpackage Client
1818
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
20-
* @version $Id$
2120
*/
2221

2322
/**
@@ -103,12 +102,12 @@ public function getSignatureForEachMethodByMulticall($methods = null)
103102
if (! is_array($serverSignatures)) {
104103
$type = gettype($serverSignatures);
105104
$error = "Multicall return is malformed. Expected array, got $type";
106-
throw new IntrospectException($error);
105+
throw new Exception\IntrospectException($error);
107106
}
108107

109108
if (count($serverSignatures) != count($methods)) {
110109
$error = 'Bad number of signatures received from multicall';
111-
throw new IntrospectException($error);
110+
throw new Exception\IntrospectException($error);
112111
}
113112

114113
// Create a new signatures array with the methods name as keys and the signature as value
@@ -152,7 +151,7 @@ public function getMethodSignature($method)
152151
$signature = $this->_system->methodSignature($method);
153152
if (!is_array($signature)) {
154153
$error = 'Invalid signature for method "' . $method . '"';
155-
throw new IntrospectException($error);
154+
throw new Exception\IntrospectException($error);
156155
}
157156
return $signature;
158157
}

‎src/Client/ServerProxy.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
* @subpackage Client
1818
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
20-
* @version $Id$
2120
*/
2221

2322
/**

‎src/Exception.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
* @package Zend_XmlRpc
1717
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
1818
* @license http://framework.zend.com/license/new-bsd New BSD License
19-
* @version $Id$
2019
*/
2120

2221
/**
@@ -31,6 +30,5 @@
3130
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
3231
* @license http://framework.zend.com/license/new-bsd New BSD License
3332
*/
34-
class Exception extends \Zend\Exception
33+
interface Exception
3534
{}
36-

0 commit comments

Comments
 (0)