Merge r25208 to 1.12 release branch

git-svn-id: http://framework.zend.com/svn/framework/standard/branches/release-1.12@25209 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Form/Element/Note.php

@@ -0,0 +1,64 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Form
+ * @subpackage Element
+ * @copyright  Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_Form_Element_Xhtml */
+require_once 'Zend/Form/Element/Xhtml.php';
+
+/**
+ * Element to show an HTML note
+ *
+ * @category   Zend
+ * @package    Zend_Form
+ * @subpackage Element
+ * @copyright  Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+class Zend_Form_Element_Note extends Zend_Form_Element_Xhtml
+{
+    /**
+     * Default form view helper to use for rendering
+     *
+     * @var string
+     */
+    public $helper = 'formNote';
+    
+    /**
+     * Ignore flag (used when retrieving values at form level)
+     *
+     * @var bool
+     */
+    protected $_ignore = true;
+    
+    /**
+     * Validate element value (pseudo)
+     *
+     * There is no need to reset the value
+     *
+     * @param  mixed $value Is always ignored
+     * @param  mixed $context Is always ignored
+     * @return boolean Returns always TRUE
+     */
+    public function isValid($value, $context = null)
+    {
+        return true;
+    }
+}

tests/Zend/Form/Element/AllTests.php

@@ -33,6 +33,7 @@ require_once 'Zend/Form/Element/HiddenTest.php';
 require_once 'Zend/Form/Element/ImageTest.php';
 require_once 'Zend/Form/Element/MultiCheckboxTest.php';
 require_once 'Zend/Form/Element/MultiselectTest.php';
+require_once 'Zend/Form/Element/NoteTest.php';
 require_once 'Zend/Form/Element/PasswordTest.php';
 require_once 'Zend/Form/Element/RadioTest.php';
 require_once 'Zend/Form/Element/ResetTest.php';
@@ -69,6 +70,7 @@ class Zend_Form_Element_AllTests
         $suite->addTestSuite('Zend_Form_Element_ImageTest');
         $suite->addTestSuite('Zend_Form_Element_MultiCheckboxTest');
         $suite->addTestSuite('Zend_Form_Element_MultiselectTest');
+        $suite->addTestSuite('Zend_Form_Element_NoteTest');
         $suite->addTestSuite('Zend_Form_Element_PasswordTest');
         $suite->addTestSuite('Zend_Form_Element_RadioTest');
         $suite->addTestSuite('Zend_Form_Element_ResetTest');

tests/Zend/Form/Element/NoteTest.php

@@ -0,0 +1,241 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Form
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+// Call Zend_Form_Element_NoteTest::main() if this source file is executed directly.
+if (!defined("PHPUnit_MAIN_METHOD")) {
+    define("PHPUnit_MAIN_METHOD", "Zend_Form_Element_NoteTest::main");
+}
+
+require_once dirname(__FILE__) . '/../../../TestHelper.php';
+require_once "PHPUnit/Framework/TestCase.php";
+require_once "PHPUnit/Framework/TestSuite.php";
+
+require_once 'Zend/Form/Element/Note.php';
+
+/**
+ * Test class for Zend_Form_Element_Text
+ *
+ * @category   Zend
+ * @package    Zend_Form
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @group      Zend_Form
+ */
+class Zend_Form_Element_NoteTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Runs the test methods of this class.
+     *
+     * @return void
+     */
+    public static function main()
+    {
+        require_once "PHPUnit/TextUI/TestRunner.php";
+
+        $suite  = new PHPUnit_Framework_TestSuite("Zend_Form_Element_NoteTest");
+        $result = PHPUnit_TextUI_TestRunner::run($suite);
+    }
+
+    /**
+     * Sets up the fixture, for example, open a network connection.
+     * This method is called before a test is executed.
+     *
+     * @return void
+     */
+    public function setUp()
+    {
+        $this->element = new Zend_Form_Element_Note('foo');
+    }
+
+    /**
+     * Tears down the fixture, for example, close a network connection.
+     * This method is called after a test is executed.
+     *
+     * @return void
+     */
+    public function tearDown()
+    {
+    }
+
+    public function testNoteElementSubclassesXhtmlElement()
+    {
+        $this->assertTrue($this->element instanceof Zend_Form_Element_Xhtml);
+    }
+
+    public function testNoteElementInstanceOfBaseElement()
+    {
+        $this->assertTrue($this->element instanceof Zend_Form_Element);
+    }
+
+    public function testNoteElementUsesNoteHelperInViewHelperDecoratorByDefault()
+    {
+        $this->_checkZf2794();
+
+        $decorator = $this->element->getDecorator('viewHelper');
+        $this->assertTrue($decorator instanceof Zend_Form_Decorator_ViewHelper);
+
+        $decorator->setElement($this->element);
+        $helper = $decorator->getHelper();
+        $this->assertEquals('formNote', $helper);
+    }
+
+    public function testNoteElementValidationIsAlwaysTrue()
+    {
+        // Solo
+        $this->assertTrue($this->element->isValid('foo'));
+
+        // Set required
+        $this->element->setRequired(true);
+        $this->assertTrue($this->element->isValid(''));
+        // Reset
+        $this->element->setRequired(false);
+
+        // Examining various validators
+        $validators = array(
+            array(
+                'options' => array('Alnum'),
+                'value'   => 'aa11?? ',
+            ),
+            array(
+                'options' => array('Alpha'),
+                'value'   => 'aabb11',
+            ),
+            array(
+                'options' => array(
+                    'Between',
+                    false,
+                    array(
+                        'min' => 0,
+                        'max' => 10,
+                    )
+                ),
+                'value'   => '11',
+            ),
+            array(
+                'options' => array('Date'),
+                'value'   => '10.10.2000',
+            ),
+            array(
+                'options' => array('Digits'),
+                'value'   => '1122aa',
+            ),
+            array(
+                'options' => array('EmailAddress'),
+                'value'   => 'foo',
+            ),
+            array(
+                'options' => array('Float'),
+                'value'   => '10a01',
+            ),
+            array(
+                'options' => array(
+                    'GreaterThan',
+                    false,
+                    array('min' => 10),
+                ),
+                'value'   => '9',
+            ),
+            array(
+                'options' => array('Hex'),
+                'value'   => '123ABCDEFGH',
+            ),
+            array(
+                'options' => array(
+                    'InArray',
+                    false,
+                    array(
+                        'key'      => 'value',
+                        'otherkey' => 'othervalue',
+                    )
+                ),
+                'value'   => 'foo',
+            ),
+            array(
+                'options' => array('Int'),
+                'value'   => '1234.5',
+            ),
+            array(
+                'options' => array(
+                    'LessThan',
+                    false,
+                    array('max' => 10),
+                ),
+                'value'   => '11',
+            ),
+            array(
+                'options' => array('NotEmpty'),
+                'value'   => '',
+            ),
+            array(
+                'options' => array(
+                    'Regex',
+                    false,
+                    array('pattern' => '/^Test/'),
+                ),
+                'value'   => 'Pest',
+            ),
+            array(
+                'options' => array(
+                    'StringLength',
+                    false,
+                    array(
+                        6,
+                        20,
+                    )
+                ),
+                'value'   => 'foo',
+            ),
+        );
+
+        foreach ($validators as $validator) {
+            // Add validator
+            $this->element->addValidators(array($validator['options']));
+
+            // Testing
+            $this->assertTrue($this->element->isValid($validator['value']));
+
+            // Remove validator
+            $this->element->removeValidator($validator['options'][0]);
+        }
+    }
+
+    /**
+     * Used by test methods susceptible to ZF-2794, marks a test as incomplete
+     *
+     * @link   http://framework.zend.com/issues/browse/ZF-2794
+     * @return void
+     */
+    protected function _checkZf2794()
+    {
+        if (strtolower(substr(PHP_OS, 0, 3)) == 'win'
+            && version_compare(PHP_VERSION, '5.1.4', '=')
+        ) {
+            $this->markTestIncomplete('Error occurs for PHP 5.1.4 on Windows');
+        }
+    }
+}
+
+// Call Zend_Form_Element_NoteTest::main() if this source file is executed directly.
+if (PHPUnit_MAIN_METHOD == "Zend_Form_Element_NoteTest::main") {
+    Zend_Form_Element_NoteTest::main();
+}