Merge r25182 to 1.12 release branch

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

library/Zend/Form/Element/Select.php

@@ -35,6 +35,12 @@ require_once 'Zend/Form/Element/Multi.php';
 class Zend_Form_Element_Select extends Zend_Form_Element_Multi
 {
     /**
+     * 'multiple' attribute
+     * @var string
+     */
+    public $multiple = false;
+
+    /**
      * Use formSelect view helper by default
      * @var string
      */

tests/Zend/Form/Element/CaptchaTest.php

@@ -112,17 +112,17 @@ class Zend_Form_Element_CaptchaTest extends PHPUnit_Framework_TestCase
         $element = new Zend_Form_Element_Captcha(
             'foo',
             array(
-                'prefixPath' => array(
-                    'prefix' => 'Zend_Form_Element_CaptchaTest',
-                    'path'   => dirname(__FILE__) . '/_files',
-                ),
-                'captcha' => 'Foo',
+                 'prefixPath' => array(
+                     'prefix' => 'Zend_Form_Element_CaptchaTest',
+                     'path'   => dirname(__FILE__) . '/_files',
+                 ),
+                 'captcha'    => 'Foo',
             )
         );
 
-        $this->assertType(
-            'Zend_Form_Element_CaptchaTest_Captcha_Foo',
-            $element->getCaptcha()
+        $this->assertTrue(
+            $element->getCaptcha() instanceof
+                Zend_Form_Element_CaptchaTest_Captcha_Foo
         );
     }
 

tests/Zend/Form/Element/FileTest.php

@@ -498,13 +498,21 @@ class Zend_Form_Element_FileTest extends PHPUnit_Framework_TestCase
     public function testElementShouldAllowAdapterWithBackslahes()
     {
         if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-            $this->markTestSkipped(__CLASS__ . '::' . __METHOD__ . ' requires PHP 5.3.0 or greater');
+            $this->markTestSkipped(
+                __CLASS__ . '::' . __METHOD__ . ' requires PHP 5.3.0 or greater'
+            );
             return;
         }
-        $this->element->addPrefixPath('Zend\Form\Element\FileTest\Adapter', dirname(__FILE__) . '/_files/TransferAdapter', 'transfer_adapter');
+        $this->element->addPrefixPath(
+            'Zend\Form\Element\FileTest\Adapter',
+            dirname(__FILE__) . '/_files/TransferAdapter',
+            'transfer_adapter'
+        );
         $this->element->setTransferAdapter('Bar');
         $test = $this->element->getTransferAdapter();
-        $this->assertType('\Zend\Form\Element\FileTest\Adapter\Bar', $test);
+        $this->assertTrue(
+            $test instanceof \Zend\Form\Element\FileTest\Adapter\Bar
+        );
     }
 }
 

tests/Zend/Form/Element/SelectTest.php

@@ -251,6 +251,26 @@ class Zend_Form_Element_SelectTest extends PHPUnit_Framework_TestCase
     }
 
     /**
+     * @group ZF-8452
+     */
+    public function testRenderingAsArray()
+    {
+        $this->element->addMultiOption('bar', 'Bar')
+                      ->setIsArray(true)
+                      ->setDecorators(array('ViewHelper'));
+
+        $actual   = $this->element->render($this->getView());
+        $expected = PHP_EOL
+                  . '<select name="foo[]" id="foo">'
+                  . PHP_EOL
+                  . '    <option value="bar" label="Bar">Bar</option>'
+                  . PHP_EOL
+                  . '</select>';
+
+        $this->assertSame($expected, $actual);
+    }
+
+    /**
      * Used by test methods susceptible to ZF-2794, marks a test as incomplete
      *
      * @link   http://framework.zend.com/issues/browse/ZF-2794