Merge remote-tracking branch 'prolic/view2' into prolic-zen-52

Conflicts: library/Zend/Dojo/View/Helper/Dijit.php
mnapoli · Jun 28, 2012 · 9a06479 · 9a06479
2 parents 5f035c5 + 312154a
commit 9a06479
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 22 deletions.
diff --git a/library/Zend/Dojo/View/Helper/Dijit.php b/library/Zend/Dojo/View/Helper/Dijit.php
@@ -23,7 +23,7 @@
 
 use Zend\Json\Json;
 use Zend\View\Renderer\RendererInterface as View;
-use Zend\View\Helper\HtmlElement;
+use Zend\View\Helper\AbstractHtmlElement;
 
 /**
  * Dojo dijit base class
@@ -33,7 +33,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-abstract class Dijit extends HtmlElement
+abstract class Dijit extends AbstractHtmlElement
 {
     /**
      * @var \Zend\Dojo\View\Helper\Dojo\Container

diff --git a/library/Zend/View/Helper/HtmlElement.php → .../Zend/View/Helper/AbstractHtmlElement.php b/library/Zend/View/Helper/HtmlElement.php → .../Zend/View/Helper/AbstractHtmlElement.php
@@ -28,7 +28,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-abstract class HtmlElement extends AbstractHelper
+abstract class AbstractHtmlElement extends AbstractHelper
 {
     /**
      * EOL character

diff --git a/library/Zend/View/Helper/FormElement.php b/library/Zend/View/Helper/FormElement.php
@@ -32,7 +32,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-abstract class FormElement extends HtmlElement
+abstract class FormElement extends AbstractHtmlElement
 {
     /**
      * @var \Zend\Translator\Translator

diff --git a/library/Zend/View/Helper/Gravatar.php b/library/Zend/View/Helper/Gravatar.php
@@ -31,7 +31,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Gravatar extends HtmlElement
+class Gravatar extends AbstractHtmlElement
 {
     /**
      * URL to gravatar service

diff --git a/library/Zend/View/Helper/HeadLink.php b/library/Zend/View/Helper/HeadLink.php
@@ -33,7 +33,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class HeadLink extends Placeholder\Container\Standalone
+class HeadLink extends Placeholder\Container\AbstractStandalone
 {
     /**
      * $_validAttributes

diff --git a/library/Zend/View/Helper/HeadMeta.php b/library/Zend/View/Helper/HeadMeta.php
@@ -33,7 +33,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class HeadMeta extends Placeholder\Container\Standalone
+class HeadMeta extends Placeholder\Container\AbstractStandalone
 {
     /**
      * Types of attributes

diff --git a/library/Zend/View/Helper/HeadScript.php b/library/Zend/View/Helper/HeadScript.php
@@ -32,7 +32,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class HeadScript extends Placeholder\Container\Standalone
+class HeadScript extends Placeholder\Container\AbstractStandalone
 {
     /**#@+
      * Script type contants

diff --git a/library/Zend/View/Helper/HeadStyle.php b/library/Zend/View/Helper/HeadStyle.php
@@ -32,7 +32,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class HeadStyle extends Placeholder\Container\Standalone
+class HeadStyle extends Placeholder\Container\AbstractStandalone
 {
     /**
      * Registry key for placeholder

diff --git a/library/Zend/View/Helper/HeadTitle.php b/library/Zend/View/Helper/HeadTitle.php
@@ -31,7 +31,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class HeadTitle extends Placeholder\Container\Standalone
+class HeadTitle extends Placeholder\Container\AbstractStandalone
 {
     /**
      * Registry key for placeholder

diff --git a/library/Zend/View/Helper/HtmlFlash.php b/library/Zend/View/Helper/HtmlFlash.php
@@ -28,7 +28,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class HtmlFlash extends HtmlElement
+class HtmlFlash extends AbstractHtmlElement
 {
     /**
      * Default file type for a flash applet

diff --git a/library/Zend/View/Helper/HtmlObject.php b/library/Zend/View/Helper/HtmlObject.php
@@ -30,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class HtmlObject extends HtmlElement
+class HtmlObject extends AbstractHtmlElement
 {
     /**
      * Output an object set

diff --git a/library/Zend/View/Helper/HtmlPage.php b/library/Zend/View/Helper/HtmlPage.php
@@ -28,7 +28,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class HtmlPage extends HtmlElement
+class HtmlPage extends AbstractHtmlElement
 {
     /**
      * Default file type for html

diff --git a/library/Zend/View/Helper/HtmlQuicktime.php b/library/Zend/View/Helper/HtmlQuicktime.php
@@ -28,7 +28,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class HtmlQuicktime extends HtmlElement
+class HtmlQuicktime extends AbstractHtmlElement
 {
     /**
      * Default file type for a movie applet

diff --git a/library/Zend/View/Helper/Navigation/AbstractHelper.php b/library/Zend/View/Helper/Navigation/AbstractHelper.php
@@ -41,7 +41,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 abstract class AbstractHelper
-    extends View\Helper\HtmlElement
+    extends View\Helper\AbstractHtmlElement
     implements HelperInterface,
                ServiceLocatorAwareInterface
 {
@@ -782,7 +782,7 @@ protected function getWhitespace($indent)
     /**
      * Converts an associative array to a string of tag attributes.
      *
-     * Overloads {@link View\Helper\HtmlElement::_htmlAttribs()}.
+     * Overloads {@link View\Helper\AbstractHtmlElement::_htmlAttribs()}.
      *
      * @param  array $attribs  an array where each key-value pair is converted
      *                         to an attribute name and value
@@ -803,7 +803,7 @@ protected function _htmlAttribs($attribs)
     /**
      * Normalize an ID
      *
-     * Overrides {@link View\Helper\HtmlElement::_normalizeId()}.
+     * Overrides {@link View\Helper\AbstractHtmlElement::_normalizeId()}.
      *
      * @param  string $value
      * @return string

diff --git a/...lper/Placeholder/Container/Standalone.php → ...ceholder/Container/AbstractStandalone.php b/...lper/Placeholder/Container/Standalone.php → ...ceholder/Container/AbstractStandalone.php
@@ -32,7 +32,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-abstract class Standalone
+abstract class AbstractStandalone
     extends \Zend\View\Helper\AbstractHelper
     implements \IteratorAggregate, \Countable, \ArrayAccess
 {
@@ -84,7 +84,7 @@ public function getRegistry()
      * Set registry object
      *
      * @param  \Zend\View\Helper\Placeholder\Registry $registry
-     * @return \Zend\View\Helper\Placeholder\Container\Standalone
+     * @return \Zend\View\Helper\Placeholder\Container\AbstractStandalone
      */
     public function setRegistry(Registry $registry)
     {
@@ -96,7 +96,7 @@ public function setRegistry(Registry $registry)
      * Set whether or not auto escaping should be used
      *
      * @param  bool $autoEscape whether or not to auto escape output
-     * @return \Zend\View\Helper\Placeholder\Container\Standalone
+     * @return \Zend\View\Helper\Placeholder\Container\AbstractStandalone
      */
     public function setAutoEscape($autoEscape = true)
     {
@@ -136,7 +136,7 @@ protected function _escape($string)
      * Set container on which to operate
      *
      * @param  \Zend\View\Helper\Placeholder\Container\AbstractContainer $container
-     * @return \Zend\View\Helper\Placeholder\Container\Standalone
+     * @return \Zend\View\Helper\Placeholder\Container\AbstractStandalone
      */
     public function setContainer(AbstractContainer $container)
     {

diff --git a/tests/Zend/View/Helper/Placeholder/StandaloneContainerTest.php b/tests/Zend/View/Helper/Placeholder/StandaloneContainerTest.php
@@ -84,7 +84,7 @@ public function testContainersPersistBetweenInstances()
     }
 }
 
-class Foo extends \Zend\View\Helper\Placeholder\Container\Standalone
+class Foo extends \Zend\View\Helper\Placeholder\Container\AbstractStandalone
 {
     protected $_regKey = 'foo';
     public function direct() {}