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

Commit

Permalink
Merge branch 'hotfix/2677'
Browse files Browse the repository at this point in the history
  • Loading branch information
weierophinney committed Oct 4, 2012
148 parents 60ea64c + a08bcca + b40ec3e + 63172ed + 448f428 + 92a516a + 5ecbc99 + a2df21b + 4de87f2 + 7c259ec + a22bdcb + 084ad9f + 9414e5a + 489be93 + cb39e7e + 54a28dc + c9c769e + dda791d + 70d382a + 8bbad0e + 9321185 + 7ab35a6 + b93694e + 3ea7087 + 0fe3d3a + bd5e189 + d1cba17 + 8d75392 + 3fb5b55 + 6cb0ccb + 30aa565 + 8409977 + 8074ba0 + 8f92486 + 94860d1 + 05d33c4 + 425826b + f0e91f0 + e31468f + 7d2af87 + 2e4dc80 + 19d128f + 1b9e4b2 + 1c46483 + fdda3f2 + 595fcd1 + 213395c + 8e514a8 + 2f30186 + bb4ed65 + 132d5b6 + 030ff33 + f2f20f3 + a50e133 + 4c554ee + dbfb1b8 + ccab83f + 00b350f + 78945d0 + f0e5f4b + ceb7d8c + 9e124d1 + 3de5912 + b6a974a + 10a6438 + cb6c1e7 + 18afd6c + 3baf1bd + c800904 + f52dcb8 + 126ccb2 + e7d6206 + e2d24ab + ec1abfc + 290ea90 + 9f4ca1b + edaa760 + c4c0c95 + d21f055 + 5b18029 + e6b97af + 010fb36 + 64c7b8d + 636523e + 4cc2cd6 + e34098a + 16367cd + 943c77f + 8226e5b + 0b47726 + 3cd8a03 + cc4782c + 9c653a6 + 656dbe5 + 9bce1ba + 7dc18ca + 861130d + 2d2ffbd + 4f413a5 + 2e1067a + 1d082e4 + e8aeb79 + b562091 + ff2fdc3 + 4aa72c0 + 1bb67ac + cd015c8 + 5e89910 + 0c21258 + dd54faf + 57f9063 + b88ce2e + af68643 + 06cd3b4 + 2c71b71 + ee02c35 + 9456314 + 5a77a7b + e98a077 + 738f2e6 + cb1e63c + 736df07 + d0a0154 + 990523c + 78687de + a5b6e79 + 6e9dfe9 + e201a1c + d9b45ef + 76222ad + 16d67da + 1ab2258 + b81d711 + ed2e9bc + 61efe82 + f353ea5 + 1f02519 + 58c1fe8 + ed502d9 + 2defba6 + 4885013 + 06a8384 + 17d9eed + 3b21b5d + c62101c + 909ef34 + 13d376a + 0a140e0 commit 7edee62
Show file tree
Hide file tree
Showing 15 changed files with 136 additions and 6 deletions.
1 change: 1 addition & 0 deletions src/Exception/BadMethodCallException.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*
* @category Zend
* @package Zend_Stdlib
* @subpackage Exception
*/
class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
{
Expand Down
7 changes: 7 additions & 0 deletions src/Exception/DomainException.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@

namespace Zend\Stdlib\Exception;

/**
* Domain exception
*
* @category Zend
* @package Zend_Stdlib
* @subpackage Exception
*/
class DomainException extends \DomainException implements ExceptionInterface
{
}
7 changes: 7 additions & 0 deletions src/Exception/ExceptionInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@

namespace Zend\Stdlib\Exception;

/**
* Exception marker interface
*
* @category Zend
* @package Zend_Stdlib
* @subpackage Exception
*/
interface ExceptionInterface
{
}
7 changes: 7 additions & 0 deletions src/Exception/InvalidArgumentException.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@

namespace Zend\Stdlib\Exception;

/**
* Invalid Argument Exception
*
* @category Zend
* @package Zend_Stdlib
* @subpackage Exception
*/
class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
{
}
1 change: 1 addition & 0 deletions src/Exception/InvalidCallbackException.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*
* @category Zend
* @package Zend_Stdlib
* @subpackage Exception
*/
class InvalidCallbackException extends DomainException implements ExceptionInterface
{
Expand Down
3 changes: 2 additions & 1 deletion src/Exception/LogicException.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@
namespace Zend\Stdlib\Exception;

/**
* logic exception
* Logic exception
*
* @category Zend
* @package Zend_Stdlib
* @subpackage Exception
*/
class LogicException extends \LogicException implements ExceptionInterface
{
Expand Down
5 changes: 5 additions & 0 deletions src/Hydrator/Reflection.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@
use ReflectionClass;
use Zend\Stdlib\Exception;

/**
* @category Zend
* @package Zend_Stdlib
* @subpackage Hydrator
*/
class Reflection extends AbstractHydrator
{
/**
Expand Down
4 changes: 4 additions & 0 deletions src/Message.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@

use Traversable;

/**
* @category Zend
* @package Zend_Stdlib
*/
class Message implements MessageInterface
{
/**
Expand Down
29 changes: 29 additions & 0 deletions src/MessageInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,41 @@

namespace Zend\Stdlib;

/**
* @category Zend
* @package Zend_Stdlib
*/
interface MessageInterface
{
/**
* Set metadata
*
* @param string|int|array|\Traversable $spec
* @param mixed $value
*/
public function setMetadata($spec, $value = null);

/**
* Get metadata
*
* @param null|string|int $key
* @return mixed
*/
public function getMetadata($key = null);

/**
* Set content
*
* @param mixed $content
* @return mixed
*/
public function setContent($content);

/**
* Get content
*
* @return mixed
*/
public function getContent();

}
6 changes: 5 additions & 1 deletion src/Parameters.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@

use ArrayObject;

/**
* @category Zend
* @package Zend_Stdlib
*/
class Parameters extends ArrayObject implements ParametersInterface
{
/**
Expand Down Expand Up @@ -106,7 +110,7 @@ public function get($name, $default = null)
/**
* @param string $name
* @param mixed $value
* @return $this
* @return Parameters
*/
public function set($name, $value)
{
Expand Down
56 changes: 52 additions & 4 deletions src/ParametersInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,72 @@
* Basically, an ArrayObject. You could simply define something like:
* class QueryParams extends ArrayObject implements Parameters {}
* and have 90% of the functionality
*
* @category Zend
* @package Zend_Stdlib
*/
interface ParametersInterface extends ArrayAccess, Countable, Serializable, Traversable
{
/**
* Constructor
*
* @param array $values
*/
public function __construct(array $values = null);

/* Allow deserialization from standard array */
/**
* From array
*
* Allow deserialization from standard array
*
* @param array $values
* @return mixed
*/
public function fromArray(array $values);

/* Allow deserialization from raw body; e.g., for PUT requests */
/**
* From string
*
* Allow deserialization from raw body; e.g., for PUT requests
*
* @param $string
* @return mixed
*/
public function fromString($string);

/* Allow serialization back to standard array */
/**
* To array
*
* Allow serialization back to standard array
*
* @return mixed
*/
public function toArray();

/* Allow serialization to query format; e.g., for PUT or POST requests */
/**
* To string
*
* Allow serialization to query format; e.g., for PUT or POST requests
*
* @return mixed
*/
public function toString();

/**
* Get
*
* @param string $name
* @param mixed|null $default
* @return mixed
*/
public function get($name, $default = null);

/**
* Set
*
* @param string $name
* @param mixed $value
* @return ParametersInterface
*/
public function set($name, $value);
}
4 changes: 4 additions & 0 deletions src/Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@

namespace Zend\Stdlib;

/**
* @category Zend
* @package Zend_Stdlib
*/
class Request extends Message implements RequestInterface
{
// generic request implementation
Expand Down
4 changes: 4 additions & 0 deletions src/RequestInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@

namespace Zend\Stdlib;

/**
* @category Zend
* @package Zend_Stdlib
*/
interface RequestInterface extends MessageInterface
{
}
4 changes: 4 additions & 0 deletions src/Response.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@

namespace Zend\Stdlib;

/**
* @category Zend
* @package Zend_Stdlib
*/
class Response extends Message implements ResponseInterface
{
// generic response implementation
Expand Down
4 changes: 4 additions & 0 deletions src/ResponseInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@

namespace Zend\Stdlib;

/**
* @category Zend
* @package Zend_Stdlib
*/
interface ResponseInterface extends MessageInterface
{

Expand Down

0 comments on commit 7edee62

Please sign in to comment.