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

EvanDotPro · EvanDotPro · commit 22e960667d7d · 2012-06-28T04:17:29.000-07:00
Conflicts:
	library/Zend/Dojo/View/Helper/Dijit.php
diff --git a/src/Helper/AbstractHtmlElement.php b/src/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/src/Helper/FormElement.php b/src/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/src/Helper/Gravatar.php b/src/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/src/Helper/HeadLink.php b/src/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/src/Helper/HeadMeta.php b/src/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/src/Helper/HeadScript.php b/src/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/src/Helper/HeadStyle.php b/src/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/src/Helper/HeadTitle.php b/src/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/src/Helper/HtmlFlash.php b/src/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/src/Helper/HtmlObject.php b/src/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/src/Helper/HtmlPage.php b/src/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/src/Helper/HtmlQuicktime.php b/src/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/src/Helper/Navigation/AbstractHelper.php b/src/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/src/Helper/Placeholder/Container/AbstractStandalone.php b/src/Helper/Placeholder/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/test/Helper/Placeholder/StandaloneContainerTest.php b/test/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() {}

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)`
`29`	`29`	`* @license http://framework.zend.com/license/new-bsd New BSD License`
`30`	`30`	`*/`
`31`		`-abstract class HtmlElement extends AbstractHelper`
	`31`	`+abstract class AbstractHtmlElement extends AbstractHelper`
`32`	`32`	`{`
`33`	`33`	`/**`
`34`	`34`	`* EOL character`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)`
`33`	`33`	`* @license http://framework.zend.com/license/new-bsd New BSD License`
`34`	`34`	`*/`
`35`		`-abstract class FormElement extends HtmlElement`
	`35`	`+abstract class FormElement extends AbstractHtmlElement`
`36`	`36`	`{`
`37`	`37`	`/**`
`38`	`38`	`* @var \Zend\Translator\Translator`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)`
`32`	`32`	`* @license http://framework.zend.com/license/new-bsd New BSD License`
`33`	`33`	`*/`
`34`		`-class Gravatar extends HtmlElement`
	`34`	`+class Gravatar extends AbstractHtmlElement`
`35`	`35`	`{`
`36`	`36`	`/**`
`37`	`37`	`* URL to gravatar service`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)`
`34`	`34`	`* @license http://framework.zend.com/license/new-bsd New BSD License`
`35`	`35`	`*/`
`36`		`-class HeadLink extends Placeholder\Container\Standalone`
	`36`	`+class HeadLink extends Placeholder\Container\AbstractStandalone`
`37`	`37`	`{`
`38`	`38`	`/**`
`39`	`39`	`* $_validAttributes`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)`
`31`	`31`	`* @license http://framework.zend.com/license/new-bsd New BSD License`
`32`	`32`	`*/`
`33`		`-class HtmlObject extends HtmlElement`
	`33`	`+class HtmlObject extends AbstractHtmlElement`
`34`	`34`	`{`
`35`	`35`	`/**`
`36`	`36`	`* Output an object set`