Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' of git://github.com/zendframework/zf2
Browse files Browse the repository at this point in the history 
Fixed files permissions
  • Loading branch information
Grzegorz Drozd committed Feb 28, 2013
132 parents 20eda74 + e4fa7ad + efc7cf5 + 0f33a2d + a3589c7 + 3ddf1a3 + d86b089 + 491f302 + c0efd18 + f9e572c + 3077af2 + a811b75 + 585f923 + 9b385ff + ec1f853 + b1a5d58 + a1cf97e + c1b8314 + 1482b41 + 7d80b85 + 869bbf8 + 403ce8d + 008804b + 87522da + d31ec42 + 2f2a15a + 585cc82 + a9438e2 + d59be1f + 643e2df + a49e8f2 + 08fd26d + b52d5dc + de5abc1 + 48f2d19 + 34ca3a0 + 5169094 + 25abd15 + baa09a1 + 355680a + b2b0d91 + 6986810 + 7b1513c + 6f9a6cc + 39a1c1e + 92dbdb3 + ac3a5aa + ee15c3a + 67f414a + 49138fb + a4ebc7b + 6b11637 + f128e27 + 41746af + cc083fe + 3d54828 + ccb0392 + a8ab5b0 + 1128b0c + 8ba934c + 23ca50c + fd53025 + d95e884 + fb9734f + c781722 + a76fdf6 + 7f04465 + 3bc62a9 + f574eb9 + 52d314b + bada1dc + 842e034 + b44331a + 8d1b4e9 + 59d10c2 + e630f51 + 96f4abb + bfcf88b + e2e6ee0 + bd53446 + 62fffaa + 075b3a5 + dfc876b + 2056187 + ccaac9b + 5088038 + b5ca6d2 + 5ef536e + 6878fa7 + 66a7225 + 869024d + 82f5ac4 + a831196 + dde75d7 + 9aba77c + 8474496 + 7c3bb76 + ad8e418 + a262925 + ee212be + 7f01229 + 42758bb + e91fa40 + 21394b2 + c56da7c + 9327465 + 95794f5 + 86491b5 + b24dc4f + 295467a + dc56d1e + d4c89e8 + ddd7418 + 8d06baa + ba834b9 + 292f809 + d235382 + 2b8ddfb + a90e617 + 8897e13 + 88b1391 + dc0450d + 9fa0112 + 7b9adef + 8010d61 + 8aa284d + d94ef71 + a3e5e8a + 6601fe6 + 6290724 + 5e7c801 + d74f16a commit 9275250
Show file tree
Hide file tree
Showing 27 changed files with 31 additions and 127 deletions.
4 changes: 2 additions & 2 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.4-dev",
"dev-develop": "2.5-dev"
"dev-master": "2.1-dev",
"dev-develop": "2.2-dev"
}
},
"autoload-dev": {
Expand Down
4 changes: 0 additions & 4 deletions src/Decoder.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Json
*/

namespace Zend\Json;
Expand All @@ -16,9 +15,6 @@

/**
* Decode JSON encoded string to PHP variable constructs
*
* @category Zend
* @package Zend_Json
*/
class Decoder
{
Expand Down
4 changes: 0 additions & 4 deletions src/Encoder.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Json
*/

namespace Zend\Json;
Expand All @@ -18,9 +17,6 @@

/**
* Encode PHP constructs to JSON
*
* @category Zend
* @package Zend_Json
*/
class Encoder
{
Expand Down
6 changes: 0 additions & 6 deletions src/Exception/BadMethodCallException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Json
*/

namespace Zend\Json\Exception;

/**
* @category Zend
* @package Zend_Json
* @subpackage Exception
*/
class BadMethodCallException extends \BadMethodCallException implements
ExceptionInterface
{}
5 changes: 0 additions & 5 deletions src/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,9 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Json
*/

namespace Zend\Json\Exception;

/**
* @category Zend
* @package Zend_Json
*/
interface ExceptionInterface
{}
5 changes: 0 additions & 5 deletions src/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Json
*/

namespace Zend\Json\Exception;

/**
* @category Zend
* @package Zend_Json
*/
class InvalidArgumentException extends \InvalidArgumentException implements
ExceptionInterface
{}
5 changes: 0 additions & 5 deletions src/Exception/RecursionException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,9 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Json
*/

namespace Zend\Json\Exception;

/**
* @category Zend
* @package Zend_Json
*/
class RecursionException extends RuntimeException
{}
5 changes: 0 additions & 5 deletions src/Exception/RuntimeException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,9 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Json
*/

namespace Zend\Json\Exception;

/**
* @category Zend
* @package Zend_Json
*/
class RuntimeException extends \RuntimeException implements ExceptionInterface
{}
5 changes: 0 additions & 5 deletions src/Expr.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Json
*/

namespace Zend\Json;
Expand All @@ -31,10 +30,6 @@
* // it will returns json encoded string:
* // {"integer":9,"string":"test string","function":function() {window.alert("javascript function encoded by Zend_Json")}}
* </code>
*
* @category Zend
* @package Zend_Json
* @subpackage Expr
*/
class Expr
{
Expand Down
6 changes: 1 addition & 5 deletions src/Json.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Json
*/

namespace Zend\Json;
Expand All @@ -16,9 +15,6 @@

/**
* Class for encoding to and decoding from JSON.
*
* @category Zend
* @package Zend_Json
*/
class Json
{
Expand Down Expand Up @@ -310,7 +306,7 @@ protected static function _processXml($simpleXmlElementObject, $ignoreXmlAttribu
* @return mixed - JSON formatted string on success
* @throws \Zend\Json\Exception\RuntimeException if the input not a XML formatted string
*/
public static function fromXml ($xmlStringContents, $ignoreXmlAttributes=true)
public static function fromXml($xmlStringContents, $ignoreXmlAttributes = true)
{
// Load the XML formatted string into a Simple XML Element object.
$simpleXmlElementObject = simplexml_load_string($xmlStringContents);
Expand Down
5 changes: 0 additions & 5 deletions src/Server/Cache.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Json
*/

namespace Zend\Json\Server;
Expand All @@ -15,10 +14,6 @@

/**
* Zend_Json_Server_Cache: cache Zend_Json_Server server definition and SMD
*
* @category Zend
* @package Zend_Json
* @subpackage Server
*/
class Cache extends ServerCache
{
Expand Down
6 changes: 0 additions & 6 deletions src/Server/Client.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Json
*/

namespace Zend\Json\Server;

use Zend\Http\Client as HttpClient;
use Zend\Server\Client as ServerClient;

/**
* @category Zend
* @package Zend_Json
* @subpackage Server
*/
class Client implements ServerClient
{
/**
Expand Down
5 changes: 0 additions & 5 deletions src/Server/Error.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Json
*/

namespace Zend\Json\Server;

/**
* @category Zend
* @package Zend_Json
*/
class Error
{
const ERROR_PARSE = -32768;
Expand Down
5 changes: 0 additions & 5 deletions src/Server/Exception/ErrorException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Json
*/

namespace Zend\Json\Server\Exception;
Expand All @@ -14,10 +13,6 @@

/**
* Thrown by Zend\Json\Server\Client when an JSON-RPC fault response is returned.
*
* @category Zend
* @package Zend_Json
* @subpackage Server
*/
class ErrorException extends Exception\BadMethodCallException implements
ExceptionInterface
Expand Down
6 changes: 0 additions & 6 deletions src/Server/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,11 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Json
*/

namespace Zend\Json\Server\Exception;

use Zend\Json\Exception\ExceptionInterface as Exception;

/**
* @category Zend
* @package Zend_Json
* @subpackage Server
*/
interface ExceptionInterface extends Exception
{}
5 changes: 0 additions & 5 deletions src/Server/Exception/HttpException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Json
*/

namespace Zend\Json\Server\Exception;

/**
* Thrown by Zend_Json_Server_Client when an HTTP error occurs during an
* JSON-RPC method call.
*
* @category Zend
* @package Zend_Json
* @subpackage Server
*/
class HttpException extends RuntimeException
{}
6 changes: 0 additions & 6 deletions src/Server/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Json
*/

namespace Zend\Json\Server\Exception;

use Zend\Json\Exception;

/**
* @category Zend
* @package Zend_Json
* @subpackage Server
*/
class InvalidArgumentException extends Exception\InvalidArgumentException implements
ExceptionInterface
{}
6 changes: 0 additions & 6 deletions src/Server/Exception/RuntimeException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Json
*/

namespace Zend\Json\Server\Exception;

use Zend\Json\Exception;

/**
* @category Zend
* @package Zend_Json
* @subpackage Server
*/
class RuntimeException extends Exception\RuntimeException implements
ExceptionInterface
{}
4 changes: 0 additions & 4 deletions src/Server/Request.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Json
*/

namespace Zend\Json\Server;
Expand All @@ -14,9 +13,6 @@

/**
* @todo Revised method regex to allow NS; however, should SMD be revised to strip PHP NS instead when attaching functions?
* @category Zend
* @package Zend_Json
* @subpackage Server
*/
class Request
{
Expand Down
5 changes: 0 additions & 5 deletions src/Server/Request/Http.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Json
*/

namespace Zend\Json\Server\Request;

use Zend\Json\Server\Request as JsonRequest;

/**
* @category Zend
* @package Zend_Json
*/
class Http extends JsonRequest
{
/**
Expand Down
10 changes: 2 additions & 8 deletions src/Server/Response.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Json
*/

namespace Zend\Json\Server;

use Zend\Json\Json;

/**
* @category Zend
* @package Zend_Json
* @subpackage Server
*/
class Response
{
/**
Expand Down Expand Up @@ -118,10 +112,10 @@ public function getResult()
/**
* Set result error
*
* @param Error $error
* @param mixed $error
* @return Response
*/
public function setError(Error $error)
public function setError(Error $error = null)
{
$this->error = $error;
return $this;
Expand Down
Loading

0 comments on commit 9275250

Please sign in to comment.