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

Commit

Permalink
Merge branch 'master' of https://github.com/zendframework/zf2 into zf…
Browse files Browse the repository at this point in the history 
…-3371
  • Loading branch information
JustinV committed Jan 30, 2013
82 parents a54ba04 + 9751a84 + 18fae9c + c95fb4f + 2c0dcf7 + 9d05e2d + 3a42eba + 9a7bab9 + ae7f9de + dd3e5a6 + d79881f + 659c71f + 04f9d84 + 84d5f52 + 766a99a + df83039 + 0076879 + 8b6df1a + d3a3694 + 6151f0d + 3d5c552 + f67da54 + 2d32c8e + 89444c6 + 5584c1c + 2ed63c7 + faf164a + f2b2413 + 0ee08f5 + 3477faf + 586904a + 6cfcb06 + 1bd47d3 + 83975c8 + cf20e25 + 926bdec + dd03435 + bec78cd + 239f3d3 + f92f0a5 + 4ce4782 + 74d3bad + 1d42a44 + 8649c56 + 1978771 + 70b8b9d + 81859bc + e3e2ad2 + 27a990d + cec094c + 5f5cbef + 0437ab6 + 0a7bcac + 1298ce5 + f58c2a4 + 6fb935d + 6b124f7 + d87c9c7 + 05f1255 + 2964d6a + 5ca6434 + f9c8321 + 8dbd1b0 + 808e7b5 + c9ce925 + 0513026 + c62207c + 840dc7a + 9e046a8 + 9f6a268 + c19b02e + 8343c68 + e4a49de + 1ae409d + 5721122 + 7203fa0 + 07fb9c4 + e4baf03 + b6acfc5 + 98119e4 + cf08f4d + f71d135 commit e9ab567
Show file tree
Hide file tree
Showing 28 changed files with 92 additions and 246 deletions.
4 changes: 0 additions & 4 deletions src/AbstractServer.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_Server
*/

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

/**
* Abstract Server implementation
*
* @category Zend
* @package Zend_Server
*/
abstract class AbstractServer implements Server
{
Expand Down
4 changes: 0 additions & 4 deletions src/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_Server
*/

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

/**
* \Zend\Server\Cache: cache server definitions
*
* @category Zend
* @package Zend_Server
*/
class Cache
{
Expand Down
4 changes: 0 additions & 4 deletions src/Client.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +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_Server
*/

namespace Zend\Server;

/**
* Client Interface
*
* @category Zend
* @package Zend_Server
*/
interface Client
{
Expand Down
8 changes: 2 additions & 6 deletions src/Definition.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +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_Server
*/

namespace Zend\Server;

/**
* Server methods metadata
*
* @category Zend
* @package Zend_Server
*/
class Definition implements \Countable, \Iterator
{
Expand Down Expand Up @@ -58,7 +54,7 @@ public function setOverwriteExistingMethods($flag)
* @param array|\Zend\Server\Method\Definition $method
* @param null|string $name
* @return \Zend\Server\Definition
* @throws \Zend\Server\Exception\ExceptionInterface if duplicate or invalid method provided
* @throws \Zend\Server\Exception\InvalidArgumentException if duplicate or invalid method provided
*/
public function addMethod($method, $name = null)
{
Expand Down Expand Up @@ -235,7 +231,7 @@ public function next()
*/
public function rewind()
{
return reset($this->methods);
reset($this->methods);
}

/**
Expand Down
1 change: 0 additions & 1 deletion src/Exception/BadMethodCallException.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_Server
*/

namespace Zend\Server\Exception;
Expand Down
4 changes: 0 additions & 4 deletions src/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +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_Server
*/

namespace Zend\Server\Exception;

/**
* Zend_Server exceptions
*
* @category Zend
* @package Zend_Server
*/
interface ExceptionInterface
{
Expand Down
1 change: 0 additions & 1 deletion src/Exception/InvalidArgumentException.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_Server
*/

namespace Zend\Server\Exception;
Expand Down
1 change: 0 additions & 1 deletion src/Exception/RuntimeException.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_Server
*/

namespace Zend\Server\Exception;
Expand Down
5 changes: 0 additions & 5 deletions src/Method/Callback.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_Server
*/

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

/**
* Method callback metadata
*
* @category Zend
* @package Zend_Server
* @subpackage Zend_Server_Method
*/
class Callback
{
Expand Down
5 changes: 0 additions & 5 deletions src/Method/Definition.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_Server
*/

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

/**
* Method definition metadata
*
* @category Zend
* @package Zend_Server
* @subpackage Zend_Server_Method
*/
class Definition
{
Expand Down
5 changes: 0 additions & 5 deletions src/Method/Parameter.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_Server
*/

namespace Zend\Server\Method;

/**
* Method parameter metadata
*
* @category Zend
* @package Zend_Server
* @subpackage Zend_Server_Method
*/
class Parameter
{
Expand Down
5 changes: 0 additions & 5 deletions src/Method/Prototype.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_Server
*/

namespace Zend\Server\Method;

/**
* Method prototype metadata
*
* @category Zend
* @package Zend_Server
* @subpackage Zend_Server_Method
*/
class Prototype
{
Expand Down
8 changes: 2 additions & 6 deletions src/Reflection.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_Server
*/

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

/**
* Reflection for determining method signatures to use with server classes
*
* @category Zend
* @package Zend_Server
*/
class Reflection
{
Expand All @@ -36,7 +32,7 @@ class Reflection
* method name (used for the signature key). Primarily to avoid collisions,
* also for XmlRpc namespacing
* @return \Zend\Server\Reflection\ReflectionClass
* @throws \Zend\Server\Reflection\Exception\ExceptionInterface
* @throws \Zend\Server\Reflection\Exception\InvalidArgumentException
*/
public static function reflectClass($class, $argv = false, $namespace = '')
{
Expand Down Expand Up @@ -70,7 +66,7 @@ public static function reflectClass($class, $argv = false, $namespace = '')
* function name (used for the signature key). Primarily to avoid
* collisions, also for XmlRpc namespacing
* @return \Zend\Server\Reflection\ReflectionFunction
* @throws \Zend\Server\Reflection\Exception\ExceptionInterface
* @throws \Zend\Server\Reflection\Exception\InvalidArgumentException
*/
public static function reflectFunction($function, $argv = false, $namespace = '')
{
Expand Down
Loading

0 comments on commit e9ab567

Please # to comment.