Merge branch 'cs/various-things' of https://github.com/Maks3w/zf2

zendframework · Jul 12, 2012 · 8ab0513 · 8ab0513
commit 8ab0513
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
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/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
@@ -119,6 +119,6 @@ public function testAllowsSettingThemeOptionOnServiceObject()
     public function testUsesReCaptchaHelper()
     {
         $captcha = new ReCaptcha;
-        $this->assertEquals('captcha/recaptcha', $captcha->getHelperName());   
+        $this->assertEquals('captcha/recaptcha', $captcha->getHelperName());
     }
 }