Merge branch 'master' into acceptHandling

Conflicts: library/Zend/Http/Header/AbstractAccept.php library/Zend/Http/Header/AcceptEncoding.php library/Zend/Http/Header/AcceptLanguage.php tests/Zend/Http/Header/AcceptCharsetTest.php tests/Zend/Http/Header/AcceptEncodingTest.php tests/Zend/Http/Header/AcceptLanguageTest.php tests/Zend/Http/Header/AcceptTest.php
zendframework · Jul 14, 2012 · fce24bf · fce24bf
2 parents 083dfe5 + 72c713c
commit fce24bf
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 15 deletions.
diff --git a/src/AbstractWord.php b/src/AbstractWord.php
@@ -26,10 +26,10 @@ abstract class AbstractWord extends AbstractAdapter
     /**#@+
      * @var array Character sets
      */
-    static $V  = array("a", "e", "i", "o", "u", "y");
-    static $VN = array("a", "e", "i", "o", "u", "y","2","3","4","5","6","7","8","9");
-    static $C  = array("b","c","d","f","g","h","j","k","m","n","p","q","r","s","t","u","v","w","x","z");
-    static $CN = array("b","c","d","f","g","h","j","k","m","n","p","q","r","s","t","u","v","w","x","z","2","3","4","5","6","7","8","9");
+    public static $V  = array("a", "e", "i", "o", "u", "y");
+    public static $VN = array("a", "e", "i", "o", "u", "y","2","3","4","5","6","7","8","9");
+    public static $C  = array("b","c","d","f","g","h","j","k","m","n","p","q","r","s","t","u","v","w","x","z");
+    public static $CN = array("b","c","d","f","g","h","j","k","m","n","p","q","r","s","t","u","v","w","x","z","2","3","4","5","6","7","8","9");
     /**#@-*/
 
     /**
@@ -100,7 +100,7 @@ abstract class AbstractWord extends AbstractAdapter
      * Error messages
      * @var array
      */
-    protected $_messageTemplates = array(
+    protected $messageTemplates = array(
         self::MISSING_VALUE => 'Empty captcha value',
         self::MISSING_ID    => 'Captcha ID field is missing',
         self::BAD_CAPTCHA   => 'Captcha value is wrong',

diff --git a/src/Dumb.php b/src/Dumb.php
@@ -48,7 +48,7 @@ public function getLabel()
 
     /**
      * Retrieve optional view helper name to use when rendering this captcha
-     * 
+     *
      * @return string
      */
     public function getHelperName()

diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -15,7 +15,7 @@
  * @package    Zend_Captcha
  * @subpackage Exception
  */
-class InvalidArgumentException extends \InvalidArgumentException implements 
+class InvalidArgumentException extends \InvalidArgumentException implements
     ExceptionInterface
 {
 }
diff --git a/src/Factory.php b/src/Factory.php
@@ -31,8 +31,8 @@ abstract class Factory
 
     /**
      * Create a captcha adapter instance
-     * 
-     * @param  array|Traversable $options 
+     *
+     * @param  array|Traversable $options
      * @return AdapterInterface
      * @throws Exception\InvalidArgumentException for a non-array, non-Traversable $options
      * @throws Exception\DomainException if class is missing or invalid
@@ -69,7 +69,7 @@ public static function factory($options)
                 $class
             ));
         }
-        
+
         unset($options['class']);
 
         if (isset($options['options'])) {

diff --git a/src/Figlet.php b/src/Figlet.php
@@ -44,7 +44,7 @@ public function __construct($options = null)
 
     /**
      * Retrieve the composed figlet manager
-     * 
+     *
      * @return FigletManager
      */
     public function getFiglet()
@@ -65,7 +65,7 @@ public function generate()
 
     /**
      * Get helper name used to render captcha
-     * 
+     *
      * @return string
      */
     public function getHelperName()

diff --git a/src/ReCaptcha.php b/src/ReCaptcha.php
@@ -68,7 +68,7 @@ class ReCaptcha extends AbstractAdapter
      * Error messages
      * @var array
      */
-    protected $_messageTemplates = array(
+    protected $messageTemplates = array(
         self::MISSING_VALUE => 'Missing captcha fields',
         self::ERR_CAPTCHA   => 'Failed to validate captcha',
         self::BAD_CAPTCHA   => 'Captcha value is wrong: %value%',

diff --git a/test/CommonWordTest.php b/test/CommonWordTest.php
@@ -35,4 +35,12 @@ public function testLoadInvalidSessionClass()
         $this->setExpectedException('Zend\Captcha\Exception\InvalidArgumentException', 'not found');
         $wordAdapter->getSession();
     }
+
+    public function testErrorMessages()
+    {
+        $wordAdapter = new $this->wordClass;
+        $this->assertFalse($wordAdapter->isValid('foo'));
+        $messages = $wordAdapter->getMessages();
+        $this->assertFalse(empty($messages));
+    }
 }
diff --git a/test/ImageTest.php b/test/ImageTest.php
@@ -46,7 +46,7 @@ public function setUp()
         if (isset($this->word)) {
             unset($this->word);
         }
-        
+
         $this->testDir = $this->getTmpDir() . '/ZF_test_images';
         if (!is_dir($this->testDir)) {
             @mkdir($this->testDir);

diff --git a/test/ReCaptchaTest.php b/test/ReCaptchaTest.php
@@ -12,6 +12,7 @@
 
 use Zend\Captcha\ReCaptcha;
 use Zend\Service\ReCaptcha\ReCaptcha as ReCaptchaService;
+
 /**
  * @category   Zend
  * @package    Zend_Captcha
@@ -118,6 +119,6 @@ public function testAllowsSettingThemeOptionOnServiceObject()
     public function testUsesReCaptchaHelper()
     {
         $captcha = new ReCaptcha;
-        $this->assertEquals('captcha/recaptcha', $captcha->getHelperName());   
+        $this->assertEquals('captcha/recaptcha', $captcha->getHelperName());
     }
 }