Merge branch 'upstream/master' into module-class-map-cache

zendframework · Sep 5, 2012 · 8f36ec1 · 8f36ec1
commit 8f36ec1
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/src/AbstractAdapter.php b/src/AbstractAdapter.php
@@ -63,6 +63,7 @@ public function getName()
      * Set name
      *
      * @param string $name
+     * @return AbstractAdapter
      */
     public function setName($name)
     {

diff --git a/src/AbstractWord.php b/src/AbstractWord.php
@@ -137,7 +137,7 @@ public function setSessionClass($sessionClass)
     }
 
     /**
-     * Retrieve word length to use when genrating captcha
+     * Retrieve word length to use when generating captcha
      *
      * @return integer
      */
@@ -175,7 +175,7 @@ public function getId()
      * Set captcha identifier
      *
      * @param string $id
-     * return Word
+     * @return AbstractWord
      */
     protected function setId ($id)
     {
@@ -347,7 +347,7 @@ public function generate()
     /**
      * Generate a random identifier
      *
-     * @return void
+     * @return string
      */
     protected function generateRandomId()
     {

diff --git a/src/Figlet.php b/src/Figlet.php
@@ -34,7 +34,6 @@ class Figlet extends AbstractWord
      * Constructor
      *
      * @param  null|string|array|\Traversable $options
-     * @return void
      */
     public function __construct($options = null)
     {

diff --git a/src/Image.php b/src/Image.php
@@ -123,7 +123,6 @@ class Image extends AbstractWord
      * Constructor
      *
      * @param  array|\Traversable $options
-     * @return void
      */
     public function __construct($options = null)
     {
@@ -266,6 +265,7 @@ public function getWidth()
 
     /**
      * @param string $startImage
+     * @return Image
      */
     public function setStartImage($startImage)
     {
@@ -275,6 +275,7 @@ public function setStartImage($startImage)
 
     /**
      * @param int $dotNoiseLevel
+     * @return Image
      */
     public function setDotNoiseLevel($dotNoiseLevel)
     {
@@ -284,6 +285,7 @@ public function setDotNoiseLevel($dotNoiseLevel)
 
     /**
      * @param int $lineNoiseLevel
+     * @return Image
      */
     public function setLineNoiseLevel($lineNoiseLevel)
     {
@@ -377,6 +379,7 @@ public function setImgUrl($imgUrl)
 
     /**
      * @param string $imgAlt
+     * @return Image
      */
     public function setImgAlt($imgAlt)
     {
@@ -385,7 +388,7 @@ public function setImgAlt($imgAlt)
     }
 
     /**
-     * Set captch image filename suffix
+     * Set captcha image filename suffix
      *
      * @param  string $suffix
      * @return Image

diff --git a/src/ReCaptcha.php b/src/ReCaptcha.php
@@ -122,7 +122,6 @@ public function setPubkey($pubkey)
      * Constructor
      *
      * @param  null|array|Traversable $options
-     * @return void
      */
     public function __construct($options = null)
     {

diff --git a/test/FactoryTest.php b/test/FactoryTest.php
@@ -62,10 +62,10 @@ public function setUpImageTest()
             $this->markTestSkipped('The GD extension is not available.');
             return;
         }
-        if(!function_exists("imagepng")) {
+        if (!function_exists("imagepng")) {
             $this->markTestSkipped("Image CAPTCHA requires PNG support");
         }
-        if(!function_exists("imageftbbox")) {
+        if (!function_exists("imageftbbox")) {
             $this->markTestSkipped("Image CAPTCHA requires FT fonts support");
         }
 

diff --git a/test/ImageTest.php b/test/ImageTest.php
@@ -36,10 +36,10 @@ public function setUp()
             $this->markTestSkipped('The GD extension is not available.');
             return;
         }
-        if(!function_exists("imagepng")) {
+        if (!function_exists("imagepng")) {
             $this->markTestSkipped("Image CAPTCHA requires PNG support");
         }
-        if(!function_exists("imageftbbox")) {
+        if (!function_exists("imageftbbox")) {
             $this->markTestSkipped("Image CAPTCHA requires FT fonts support");
         }