Merge remote-tracking branch 'weierophinney/hotfix/captcha-factory-op…

…tions'

src/Factory.php

@@ -81,7 +81,9 @@ public static function factory($options)
                 $class
             ));
         }
-        $options = array();
+
+        unset($options['class']);
+
         if (isset($options['options'])) {
             $options = $options['options'];
         }

test/FactoryTest.php

@@ -181,4 +181,15 @@ public function testCanCreateReCaptchaUsingShortName()
         ));
         $this->assertInstanceOf('Zend\Captcha\ReCaptcha', $captcha);
     }
+
+    public function testOptionsArePassedToCaptchaAdapter()
+    {
+        $captcha = Captcha\Factory::factory(array(
+            'class'   => 'ZendTest\Captcha\TestAsset\MockCaptcha',
+            'options' => array(
+                'foo' => 'bar',
+            ),
+        ));
+        $this->assertEquals(array('foo' => 'bar'), $captcha->options);
+    }
 }

test/TestAsset/MockCaptcha.php

@@ -0,0 +1,71 @@
+<?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_Captcha
+ * @subpackage UnitTest
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+namespace ZendTest\Captcha\TestAsset;
+
+use Zend\Captcha\AdapterInterface;
+
+/**
+ * @category   Zend
+ * @package    Zend_Captcha
+ * @subpackage UnitTest
+ * @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 MockCaptcha implements AdapterInterface
+{
+    public $name;
+    public $options = array();
+
+    public function __construct($options = null)
+    {
+        $this->options = $options;
+    }
+
+    public function generate()
+    {
+    }
+
+    public function setName($name)
+    {
+        $this->name = $name;
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function getHelperName()
+    {
+        return 'doctype';
+    }
+
+    public function isValid($value)
+    {
+        return true;
+    }
+
+    public function getMessages()
+    {
+        return array();
+    }
+}