LabelOptionsAwareInterface => LabelAwareInterface

this should not be a BC break because the interface is not included in any release yet, change only affect develop branch
stefanotorresi · Mar 5, 2014 · fdbbf24 · fdbbf24
1 parent 69f059f
commit fdbbf24
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 16 deletions.
diff --git a/library/Zend/Form/Element.php b/library/Zend/Form/Element.php
@@ -17,7 +17,7 @@ class Element implements
     ElementAttributeRemovalInterface,
     ElementInterface,
     InitializableInterface,
-    LabelOptionsAwareInterface
+    LabelAwareInterface
 {
     /**
      * @var array

diff --git a/.../Zend/Form/LabelOptionsAwareInterface.php → library/Zend/Form/LabelAwareInterface.php b/.../Zend/Form/LabelOptionsAwareInterface.php → library/Zend/Form/LabelAwareInterface.php
@@ -9,8 +9,23 @@
 
 namespace Zend\Form;
 
-interface LabelOptionsAwareInterface
+interface LabelAwareInterface
 {
+    /**
+     * Set the label (if any) used for this element
+     *
+     * @param  $label
+     * @return ElementInterface
+     */
+    public function setLabel($label);
+
+    /**
+     * Retrieve the label (if any) used for this element
+     *
+     * @return string
+     */
+    public function getLabel();
+
     /**
      * Set the attributes to use with the label
      *

diff --git a/library/Zend/Form/LabelOptionsAwareTrait.php → library/Zend/Form/LabelAwareTrait.php b/library/Zend/Form/LabelOptionsAwareTrait.php → library/Zend/Form/LabelAwareTrait.php
@@ -9,7 +9,7 @@
 
 namespace Zend\Form;
 
-class LabelOptionsAwareTrait
+class LabelAwareTrait
 {
     /**
      * Label specific html attributes
@@ -29,7 +29,7 @@ class LabelOptionsAwareTrait
      * Set the attributes to use with the label
      *
      * @param array $labelAttributes
-     * @return LabelOptionsAwareInterface
+     * @return LabelAwareInterface
      */
     public function setLabelAttributes(array $labelAttributes)
     {

diff --git a/library/Zend/Form/View/Helper/FormButton.php b/library/Zend/Form/View/Helper/FormButton.php
@@ -11,7 +11,7 @@
 
 use Zend\Form\ElementInterface;
 use Zend\Form\Exception;
-use Zend\Form\LabelOptionsAwareInterface;
+use Zend\Form\LabelAwareInterface;
 
 class FormButton extends FormInput
 {
@@ -93,7 +93,7 @@ public function render(ElementInterface $element, $buttonContent = null)
             }
         }
 
-        if ($element instanceof LabelOptionsAwareInterface) {
+        if ($element instanceof LabelAwareInterface) {
             if (! $element->getLabelOption('disable_html_escape')) {
                 $escapeHtmlHelper = $this->getEscapeHtmlHelper();
                 $buttonContent = $escapeHtmlHelper($buttonContent);

diff --git a/library/Zend/Form/View/Helper/FormLabel.php b/library/Zend/Form/View/Helper/FormLabel.php
@@ -11,7 +11,7 @@
 
 use Zend\Form\ElementInterface;
 use Zend\Form\Exception;
-use Zend\Form\LabelOptionsAwareInterface;
+use Zend\Form\LabelAwareInterface;
 
 class FormLabel extends AbstractHelper
 {
@@ -64,7 +64,7 @@ public function __invoke(ElementInterface $element = null, $labelContent = null,
                 );
             }
 
-            if ($element instanceof LabelOptionsAwareInterface) {
+            if ($element instanceof LabelAwareInterface) {
                 if (! $element->getLabelOption('disable_html_escape')) {
                     $escapeHtmlHelper = $this->getEscapeHtmlHelper();
                     $label = $escapeHtmlHelper($label);
@@ -127,7 +127,7 @@ public function openTag($attributesOrElement = null)
         }
 
         $labelAttributes = array();
-        if ($attributesOrElement instanceof LabelOptionsAwareInterface) {
+        if ($attributesOrElement instanceof LabelAwareInterface) {
             $labelAttributes = $attributesOrElement->getLabelAttributes();
         }
 

diff --git a/library/Zend/Form/View/Helper/FormMultiCheckbox.php b/library/Zend/Form/View/Helper/FormMultiCheckbox.php
@@ -12,7 +12,7 @@
 use Zend\Form\ElementInterface;
 use Zend\Form\Element\MultiCheckbox as MultiCheckboxElement;
 use Zend\Form\Exception;
-use Zend\Form\LabelOptionsAwareInterface;
+use Zend\Form\LabelAwareInterface;
 
 class FormMultiCheckbox extends FormInput
 {
@@ -156,7 +156,7 @@ protected function renderOptions(MultiCheckboxElement $element, array $options,
         $globalLabelAttributes = array();
         $closingBracket   = $this->getInlineClosingBracket();
 
-        if ($element instanceof LabelOptionsAwareInterface) {
+        if ($element instanceof LabelAwareInterface) {
             $labelOptions = $element->getLabelOptions();
             $globalLabelAttributes = $element->getLabelAttributes();
         }
@@ -229,7 +229,7 @@ protected function renderOptions(MultiCheckboxElement $element, array $options,
                 );
             }
 
-            if ($element instanceof LabelOptionsAwareInterface && !$element->getLabelOption('disable_html_escape')) {
+            if ($element instanceof LabelAwareInterface && !$element->getLabelOption('disable_html_escape')) {
                 $label = $escapeHtmlHelper($label);
             }
 

diff --git a/library/Zend/Form/View/Helper/FormRow.php b/library/Zend/Form/View/Helper/FormRow.php
@@ -12,7 +12,7 @@
 use Zend\Form\Element\Button;
 use Zend\Form\ElementInterface;
 use Zend\Form\Exception;
-use Zend\Form\LabelOptionsAwareInterface;
+use Zend\Form\LabelAwareInterface;
 
 class FormRow extends AbstractHelper
 {
@@ -164,7 +164,7 @@ public function render(ElementInterface $element)
             $labelOptions = array();
             $labelAttributes = array();
 
-            if ($element instanceof LabelOptionsAwareInterface) {
+            if ($element instanceof LabelAwareInterface) {
                 $labelOptions    = $element->getLabelOptions();
                 $labelAttributes = $element->getLabelAttributes();
 
@@ -189,7 +189,7 @@ public function render(ElementInterface $element)
                 // Ensure element and label will be separated if element has an `id`-attribute.
                 // If element has label option `always_wrap` it will be nested in any case.
                 if ($element->hasAttribute('id')
-                    && ($element instanceof LabelOptionsAwareInterface && !$element->getLabelOption('always_wrap'))
+                    && ($element instanceof LabelAwareInterface && !$element->getLabelOption('always_wrap'))
                 ) {
                     $labelOpen = '';
                     $labelClose = '';
@@ -200,7 +200,7 @@ public function render(ElementInterface $element)
                 }
 
                 if ($label !== '' && (!$element->hasAttribute('id'))
-                    || ($element instanceof LabelOptionsAwareInterface && $element->getLabelOption('always_wrap'))
+                    || ($element instanceof LabelAwareInterface && $element->getLabelOption('always_wrap'))
                 ) {
                     $label = '<span>' . $label . '</span>';
                 }