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
97 parents 1d9f9a2 + aea30ce + faec0a2 + 098e166 + 51d6372 + 8757ace + 42477b6 + 32cf329 + 0ebadc5 + 188fa4d + a41bbf0 + a29bbbc + 941280d + d691226 + e547023 + d91c234 + 006ef75 + 69d1518 + 7dc0d1a + a995715 + e780008 + e810876 + 9e4090a + 269bf01 + 3a1f2fd + 0cab32d + 704cc7f + e20c9e6 + a0dfc1a + 76b3e1c + fd429e8 + 187ea79 + 2b43ea6 + e3b1be1 + 19f0ef6 + 33bf9c0 + 3729984 + a5ce396 + 698dbe0 + 0efca0b + 08b2a78 + ddaa846 + 7fe4493 + 0da7331 + 7226b1d + 851904c + a2eb795 + f658a03 + de83270 + 806df8a + 4e7ff23 + 409b768 + 1b97191 + d2649e3 + f0162d1 + 6f01416 + a2b3753 + 1786961 + d157fcb + 4444c37 + 192d20c + 811122b + 3a2cf9b + eb2029b + 7a6edab + 8d8a05d + c1ddf21 + 0090b4d + ef80e35 + 59b30de + 4656098 + 377b920 + ccba82c + 5d2770e + 41714a1 + 8adef43 + a78628f + b35fa7a + 3953c79 + aa28e42 + 38f9a49 + 47ed633 + 0a6bf6e + b61d89d + a1fbb6f + 238512b + f40a328 + 62dc143 + 328df3b + e12fe2d + e34a942 + 04e956d + a19a8c2 + ac4b6c0 + d28282e + bd5af3d + 2bbef72 commit c6a0e2c
Show file tree
Hide file tree
Showing 95 changed files with 1,241 additions and 396 deletions.
4 changes: 0 additions & 4 deletions src/Exception/BadMethodCallException.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_View
*/

namespace Zend\View\Exception;

/**
* Bad method call exception
*
* @category Zend
* @package Zend_View
*/
class BadMethodCallException
extends \BadMethodCallException
Expand Down
4 changes: 0 additions & 4 deletions src/Exception/DomainException.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_View
*/

namespace Zend\View\Exception;

/**
* Domain exception
*
* @category Zend
* @package Zend_View
*/
class DomainException
extends \DomainException
Expand Down
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_View
*/

namespace Zend\View\Exception;

/**
* @category Zend
* @package Zend_View
*/
interface ExceptionInterface
{}
4 changes: 0 additions & 4 deletions src/Exception/InvalidArgumentException.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_View
*/

namespace Zend\View\Exception;

/**
* Invalid argument exception
*
* @category Zend
* @package Zend_View
*/
class InvalidArgumentException
extends \InvalidArgumentException
Expand Down
4 changes: 0 additions & 4 deletions src/Exception/InvalidHelperException.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_View
*/

namespace Zend\View\Exception;

/**
* Invalid helper exception
*
* @category Zend
* @package Zend_View
*/
class InvalidHelperException
extends \Exception
Expand Down
4 changes: 0 additions & 4 deletions src/Exception/RuntimeException.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_View
*/

namespace Zend\View\Exception;

/**
* Runtime exception
*
* @category Zend
* @package Zend_View
*/
class RuntimeException
extends \RuntimeException
Expand Down
6 changes: 0 additions & 6 deletions src/Helper/AbstractHelper.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_View
*/

namespace Zend\View\Helper;

use Zend\View\Helper\HelperInterface;
use Zend\View\Renderer\RendererInterface as Renderer;

/**
* @category Zend
* @package Zend_View
* @subpackage Helper
*/
abstract class AbstractHelper implements HelperInterface
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Helper/AbstractHtmlElement.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_View
*/

namespace Zend\View\Helper;

/**
* @category Zend
* @package Zend_View
* @subpackage Helper
*/
abstract class AbstractHtmlElement extends AbstractHelper
{
/**
Expand Down
4 changes: 0 additions & 4 deletions src/Helper/BasePath.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_View
*/

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

/**
* Helper for retrieving the base path.
*
* @package Zend_View
* @subpackage Helper
*/
class BasePath extends AbstractHelper
{
Expand Down
4 changes: 0 additions & 4 deletions src/Helper/Cycle.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_View
*/

namespace Zend\View\Helper;

/**
* Helper for alternating between set of values
*
* @package Zend_View
* @subpackage Helper
*/
class Cycle extends AbstractHelper implements \Iterator
{
Expand Down
4 changes: 0 additions & 4 deletions src/Helper/DeclareVars.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_View
*/

namespace Zend\View\Helper;

/**
* Helper for declaring default values of template variables
*
* @package Zend_View
* @subpackage Helper
*/
class DeclareVars extends AbstractHelper
{
Expand Down
4 changes: 0 additions & 4 deletions src/Helper/Doctype.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_View
*/

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

/**
* Helper for setting and retrieving the doctype
*
* @package Zend_View
* @subpackage Helper
*/
class Doctype extends AbstractHelper
{
Expand Down
5 changes: 0 additions & 5 deletions src/Helper/EscapeCss.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_View
*/

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

/**
* Helper for escaping values
*
* @package Zend_View
* @subpackage Helper
*/
class EscapeCss extends Escaper\AbstractHelper
{
Expand All @@ -31,5 +27,4 @@ protected function escape($value)
{
return $this->getEscaper()->escapeCss($value);
}

}
5 changes: 0 additions & 5 deletions src/Helper/EscapeHtml.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_View
*/

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

/**
* Helper for escaping values
*
* @package Zend_View
* @subpackage Helper
*/
class EscapeHtml extends Escaper\AbstractHelper
{
Expand All @@ -31,5 +27,4 @@ protected function escape($value)
{
return $this->getEscaper()->escapeHtml($value);
}

}
5 changes: 0 additions & 5 deletions src/Helper/EscapeHtmlAttr.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_View
*/

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

/**
* Helper for escaping values
*
* @package Zend_View
* @subpackage Helper
*/
class EscapeHtmlAttr extends Escaper\AbstractHelper
{
Expand All @@ -31,5 +27,4 @@ protected function escape($value)
{
return $this->getEscaper()->escapeHtmlAttr($value);
}

}
5 changes: 0 additions & 5 deletions src/Helper/EscapeJs.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_View
*/

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

/**
* Helper for escaping values
*
* @package Zend_View
* @subpackage Helper
*/
class EscapeJs extends Escaper\AbstractHelper
{
Expand All @@ -31,5 +27,4 @@ protected function escape($value)
{
return $this->getEscaper()->escapeJs($value);
}

}
5 changes: 0 additions & 5 deletions src/Helper/EscapeUrl.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_View
*/

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

/**
* Helper for escaping values
*
* @package Zend_View
* @subpackage Helper
*/
class EscapeUrl extends Escaper\AbstractHelper
{
Expand All @@ -31,5 +27,4 @@ protected function escape($value)
{
return $this->getEscaper()->escapeUrl($value);
}

}
6 changes: 1 addition & 5 deletions src/Helper/Escaper/AbstractHelper.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_View
*/

namespace Zend\View\Helper\Escaper;
Expand All @@ -16,9 +15,6 @@

/**
* Helper for escaping values
*
* @package Zend_View
* @subpackage Helper
*/
abstract class AbstractHelper extends Helper\AbstractHelper
{
Expand Down Expand Up @@ -65,7 +61,7 @@ public function getEscaper()
*/
public function setEncoding($encoding)
{
if (!is_null($this->escaper)) {
if (null !== $this->escaper) {
throw new Exception\InvalidArgumentException(
'Character encoding settings cannot be changed once the Helper has been used or '
. ' if a Zend\Escaper\Escaper object (with preset encoding option) is set.'
Expand Down
Loading

0 comments on commit c6a0e2c

Please sign in to comment.