Permalink
Browse files

Merge branch 'zf2phpunit35' of http://github.com/billkarwin/zf2 into …

…merges/karwin-phpunit35

Conflicts:
	library/Zend/Filter/Encrypt/Openssl.php
	library/Zend/Service/Akismet/Akismet.php
	library/Zend/Service/Amazon/Amazon.php
	library/Zend/Service/Amazon/Exception.php
	library/Zend/Service/Amazon/Query.php
	library/Zend/Service/Audioscrobbler/Audioscrobbler.php
	library/Zend/Service/SlideShare/Exception.php
	tests/Zend/Layout/FunctionalTest.php
	tests/Zend/Markup/ParserIntegrityTest.php
	tests/Zend/Server/ReflectionTest.php
	tests/Zend/Service/Akismet/AkismetTest.php
	tests/Zend/Service/Audioscrobbler/AlbumDataTest.php
	tests/Zend/Service/Audioscrobbler/AudioscrobblerTestCase.php
	tests/Zend/Tag/Cloud/Decorator/HtmlTagTest.php
	tests/Zend/Tag/ItemListTest.php
	tests/Zend/Tag/ItemTest.php
	tests/Zend/Text/MultiByteTest.php
	tests/Zend/Text/TableTest.php
	tests/Zend/Translate/Adapter/XmlTmTest.php
	tests/Zend/Validator/BarcodeTest.php
	tests/Zend/Validator/CallbackTest.php
	tests/Zend/Validator/File/FilesSizeTest.php
	tests/Zend/Validator/File/ImageSizeTest.php
	tests/Zend/Validator/File/SizeTest.php
	tests/Zend/Validator/File/UploadTest.php
	tests/Zend/Validator/File/WordCountTest.php
	tests/Zend/Validator/IbanTest.php
	tests/Zend/Validator/MessageTest.php
	tests/Zend/Validator/PostCodeTest.php
	tests/Zend/Validator/RegexTest.php
	tests/Zend/Validator/ValidateTest.php
  • Loading branch information...
weierophinney committed Nov 2, 2010
2 parents 5417a4a + 7815b03 commit d4ec1fd05e858b23447062fc5f2d8ee5c3af0158
Showing 316 changed files with 1,430 additions and 2,934 deletions.
@@ -216,7 +216,7 @@ public function generate()
/**
* Validate captcha
*
- * @see Zend_Validate_Interface::isValid()
+ * @see Zend\Validator::isValid()
* @param mixed $value
* @return boolean
*/
@@ -474,7 +474,7 @@ public function decrypt($value)
// decompress after decryption
if (!empty($this->_compression)) {
require_once 'Zend/Filter/Decompress.php';
- $decompress = new \Zend\Filter\Decompress($this->_compression);
+ $decompress = new Decompress($this->_compression);
$decrypted = $decompress->filter($decrypted);
}
@@ -79,7 +79,7 @@
/**
- * Instance of Zend_Validate to check hostnames
+ * Instance of Zend\Validator\ValidatorChain to check hostnames
* @var \Zend\Validator\ValidatorChain
*/
protected $_validHost;
@@ -36,7 +36,7 @@
* @param HTTPUtility $utility
* @return void
*/
- public function __construct($response = null, HTTPUtility $utility = null);
+ public function __construct(HTTPResponse $response = null, HTTPUtility $utility = null);
/**
* Retrieve an arbitrary named parameter from the token
@@ -46,7 +46,7 @@ class Request extends AbstractToken
* @param null|Zend\OAuth\Http\Utility $utility
*/
public function __construct(
- $response = null,
+ HTTPResponse $response = null,
HTTPUtility $utility = null
) {
parent::__construct($response, $utility);
@@ -31,7 +31,7 @@
*
* @uses Zend_Http_Client
* @uses Zend\Service\AbstractService
- * @uses Zend_Service_Exception
+ * @uses Zend\Service\Exception
* @uses Zend_Uri
* @uses Zend_Version
* @category Zend
@@ -101,7 +101,7 @@ public function getBlogUrl()
*
* @param string $blogUrl
* @return Zend_Service_Akismet
- * @throws Zend_Service_Exception if invalid URL provided
+ * @throws Zend\Service\Exception if invalid URL provided
*/
public function setBlogUrl($blogUrl)
{
@@ -172,7 +172,7 @@ public function getPort()
*
* @param int $port
* @return Zend_Service_Akismet
- * @throws Zend_Service_Exception if non-integer value provided
+ * @throws Zend\Service\Exception if non-integer value provided
*/
public function setPort($port)
{
@@ -201,7 +201,7 @@ public function getUserAgent()
*
* @param string $userAgent
* @return Zend_Service_Akismet
- * @throws Zend_Service_Exception with invalid user agent string
+ * @throws Zend\Service\Exception with invalid user agent string
*/
public function setUserAgent($userAgent)
{
@@ -273,7 +273,7 @@ public function verifyKey($key = null, $blog = null)
* @param string $path
* @param array $params
* @return Zend_Http_Response
- * @throws Zend_Service_Exception if missing user_ip or user_agent fields
+ * @throws Zend\Service\Exception if missing user_ip or user_agent fields
*/
protected function _makeApiCall($path, $params)
{
@@ -312,7 +312,7 @@ protected function _makeApiCall($path, $params)
*
* @param array $params
* @return boolean
- * @throws Zend_Service_Exception with invalid API key
+ * @throws Zend\Service\Exception with invalid API key
*/
public function isSpam($params)
{
@@ -342,7 +342,7 @@ public function isSpam($params)
*
* @param array $params
* @return void
- * @throws Zend_Service_Exception with invalid API key
+ * @throws Zend\Service\Exception with invalid API key
*/
public function submitSpam($params)
{
@@ -29,7 +29,7 @@
/**
* @uses Zend_Http_Client
* @uses Zend_Http_Client_Exception
- * @uses Zend_Service_Exception
+ * @uses Zend\Service\Exception
* @category Zend
* @package Zend_Service
* @subpackage Audioscrobbler
@@ -25,7 +25,7 @@
namespace Zend\Service\Delicious;
/**
- * @uses Zend_Service_Exception
+ * @uses Zend\Service\Exception
* @category Zend
* @package Zend_Service
* @subpackage Delicious
@@ -31,7 +31,7 @@
* @author Marco Kaiser
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
-class Zend_Service_DeveloperGarden_Client_Soap extends Zend_Soap_Client
+class Zend_Service_DeveloperGarden_Client_Soap extends Zend\Soap\Client
{
/**
* class with credential interface
@@ -20,7 +20,6 @@
*/
/**
- * @uses Zend_Validate_Ip
* @category Zend
* @package Zend_Service
* @subpackage DeveloperGarden
@@ -20,7 +20,7 @@
*/
/**
- * @uses Zend_Validate_EmailAddress
+ * @uses Zend\Validator\EmailAddress
* @uses Zend_Service_DeveloperGarden_Exception
* @category Zend
* @package Zend_Service
@@ -158,7 +158,7 @@ public function getEmail()
*/
public function setEmail($email)
{
- $validator = new Zend_Validate_EmailAddress();
+ $validator = new Zend\Validator\EmailAddress();
if (!$validator->isValid($email)) {
throw new Zend_Service_DeveloperGarden_Exception('Not a valid e-mail address.');
@@ -20,7 +20,6 @@
*/
/**
- * @uses Zend_Validate_Ip
* @category Zend
* @package Zend_Service
* @subpackage DeveloperGarden
@@ -20,14 +20,14 @@
*/
/**
- * @uses Zend_Service_Exception
+ * @uses Zend\Service\Exception
* @category Zend
* @package Zend_Service
* @subpackage DeveloperGarden
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @author Marco Kaiser
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
-class Zend_Service_DeveloperGarden_Exception extends Zend_Service_Exception
+class Zend_Service_DeveloperGarden_Exception extends Zend\Service\Exception
{
}
@@ -20,7 +20,7 @@
*/
/**
- * @uses Zend_Validate_Ip
+ * @uses Zend\Validator\Ip
* @uses Zend_Service_DeveloperGarden_Exception
* @category Zend
* @package Zend_Service
@@ -75,7 +75,7 @@ public function __construct($ip, $version = 4)
*/
public function setIp($ip)
{
- $validator = new Zend_Validate_Ip();
+ $validator = new Zend\Validator\Ip();
if (!$validator->isValid($ip)) {
$message = $validator->getMessages();
@@ -21,9 +21,9 @@
/**
* @uses Zend_Service_DeveloperGarden_LocalSearch_Exception
- * @uses Zend_Validate_Between
- * @uses Zend_Validate_Int
- * @uses Zend_Validate_NotEmpty
+ * @uses Zend\Validator\Between
+ * @uses Zend\Validator\Int
+ * @uses Zend\Validator\NotEmpty
* @category Zend
* @package Zend_Service
* @subpackage DeveloperGarden
@@ -178,7 +178,7 @@ public function disableDidYouMeanRelated()
*/
public function setHits($hits = 10)
{
- $validator = new Zend_Validate_Between(0, 1000);
+ $validator = new Zend\Validator\Between(0, 1000);
if (!$validator->isValid($hits)) {
$message = $validator->getMessages();
throw new Zend_Service_DeveloperGarden_LocalSearch_Exception(current($message));
@@ -221,7 +221,7 @@ public function setCollapse($value)
*/
public function setWhere($where)
{
- $validator = new Zend_Validate_NotEmpty();
+ $validator = new Zend\Validator\NotEmpty();
if (!$validator->isValid($where)) {
$message = $validator->getMessages();
throw new Zend_Service_DeveloperGarden_LocalSearch_Exception(current($message));
@@ -270,7 +270,7 @@ public function disableSpatial()
*/
public function setRadius($radius)
{
- $validator = new Zend_Validate_Int();
+ $validator = new Zend\Validator\Int();
if (!$validator->isValid($radius)) {
$message = $validator->getMessages();
throw new Zend_Service_DeveloperGarden_LocalSearch_Exception(current($message));
Oops, something went wrong.

0 comments on commit d4ec1fd

Please sign in to comment.