[ZF-7524]Line endings in Zend/Captcha

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@17481 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Captcha/Adapter.php

@@ -19,12 +19,12 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/** Zend_Validate_Interface */
+/** @see Zend_Validate_Interface */
 require_once 'Zend/Validate/Interface.php';
 
 /**
  * Generic Captcha adapter interface
- * 
+ *
  * Each specific captcha implementation should implement this interface
  *
  * @category   Zend
@@ -34,7 +34,7 @@ require_once 'Zend/Validate/Interface.php';
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
-interface Zend_Captcha_Adapter extends Zend_Validate_Interface 
+interface Zend_Captcha_Adapter extends Zend_Validate_Interface
 {
     /**
      * Generate a new captcha
@@ -62,7 +62,7 @@ interface Zend_Captcha_Adapter extends Zend_Validate_Interface
 
     /**
      * Get captcha name
-     * 
+     *
      * @return string
      */
     public function getName();

library/Zend/Captcha/Base.php

@@ -19,15 +19,15 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/** Zend_Captcha_Adapter */
+/** @seeZend_Captcha_Adapter */
 require_once 'Zend/Captcha/Adapter.php';
 
-/** Zend_Validate_Abstract */
+/** @see Zend_Validate_Abstract */
 require_once 'Zend/Validate/Abstract.php';
 
 /**
  * Base class for Captcha adapters
- * 
+ *
  * Provides some utility functionality to build on
  *
  * @category   Zend
@@ -37,11 +37,11 @@ require_once 'Zend/Validate/Abstract.php';
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
-abstract class Zend_Captcha_Base extends Zend_Validate_Abstract implements Zend_Captcha_Adapter 
+abstract class Zend_Captcha_Base extends Zend_Validate_Abstract implements Zend_Captcha_Adapter
 {
     /**
      * Element name
-     * 
+     *
      * Useful to generate/check form fields
      *
      * @var string
@@ -49,8 +49,8 @@ abstract class Zend_Captcha_Base extends Zend_Validate_Abstract implements Zend_
     protected $_name;
 
     /**
-     * Captcha options 
-     * 
+     * Captcha options
+     *
      * @var array
      */
     protected $_options = array();
@@ -63,23 +63,23 @@ abstract class Zend_Captcha_Base extends Zend_Validate_Abstract implements Zend_
         'options',
         'config',
     );
-    
+
     /**
      * Get name
-     * 
+     *
      * @return string
      */
-    public function getName() 
+    public function getName()
     {
         return $this->_name;
     }
-    
+
     /**
-     * Set name 
-     * 
+     * Set name
+     *
      * @param string $name
      */
-    public function setName($name) 
+    public function setName($name)
     {
         $this->_name = $name;
         return $this;
@@ -88,7 +88,7 @@ abstract class Zend_Captcha_Base extends Zend_Validate_Abstract implements Zend_
     /**
      * Constructor
      *
-     * @param  array|Zend_Config $options 
+     * @param  array|Zend_Config $options
      * @return void
      */
     public function __construct($options = null)
@@ -98,9 +98,9 @@ abstract class Zend_Captcha_Base extends Zend_Validate_Abstract implements Zend_
             $this->setOptions($options);
         } else if ($options instanceof Zend_Config) {
             $this->setConfig($options);
-        } 
-    } 
-    
+        }
+    }
+
     /**
      * Set single option for the object
      *
@@ -126,11 +126,11 @@ abstract class Zend_Captcha_Base extends Zend_Validate_Abstract implements Zend_
         }
         return $this;
     }
-    
+
     /**
      * Set object state from options array
-     * 
-     * @param  array $options 
+     *
+     * @param  array $options
      * @return Zend_Form_Element
      */
     public function setOptions($options = null)
@@ -140,10 +140,10 @@ abstract class Zend_Captcha_Base extends Zend_Validate_Abstract implements Zend_
         }
         return $this;
     }
-    
+
     /**
      * Retrieve options representing object state
-     * 
+     *
      * @return array
      */
     public function getOptions()
@@ -153,8 +153,8 @@ abstract class Zend_Captcha_Base extends Zend_Validate_Abstract implements Zend_
 
     /**
      * Set object state from config object
-     * 
-     * @param  Zend_Config $config 
+     *
+     * @param  Zend_Config $config
      * @return Zend_Captcha_Base
      */
     public function setConfig(Zend_Config $config)
@@ -164,12 +164,12 @@ abstract class Zend_Captcha_Base extends Zend_Validate_Abstract implements Zend_
 
     /**
      * Get optional decorator
-     * 
+     *
      * By default, return null, indicating no extra decorator needed.
      *
      * @return null
      */
-    public function getDecorator() 
+    public function getDecorator()
     {
         return null;
     }

library/Zend/Captcha/Dumb.php

@@ -19,14 +19,14 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/** Zend_Captcha_Word */
+/** @see Zend_Captcha_Word */
 require_once 'Zend/Captcha/Word.php';
 
 /**
  * Example dumb word-based captcha
- * 
+ *
  * Note that only rendering is necessary for word-based captcha
- *  
+ *
  * @category   Zend
  * @package    Zend_Captcha
  * @subpackage Adapter

library/Zend/Captcha/Figlet.php

@@ -19,15 +19,15 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/** Zend_Captcha_Word */
+/** @see Zend_Captcha_Word */
 require_once 'Zend/Captcha/Word.php';
 
-/** Zend_Text_Figlet */
+/** @see Zend_Text_Figlet */
 require_once 'Zend/Text/Figlet.php';
 
 /**
  * Captcha based on figlet text rendering service
- * 
+ *
  * Note that this engine seems not to like numbers
  *
  * @category   Zend
@@ -45,11 +45,11 @@ class Zend_Captcha_Figlet extends Zend_Captcha_Word
      * @var Zend_Text_Figlet
      */
     protected $_figlet;
-    
+
     /**
      * Constructor
-     * 
-     * @param  null|string|array|Zend_Config $options 
+     *
+     * @param  null|string|array|Zend_Config $options
      * @return void
      */
     public function __construct($options = null)
@@ -57,7 +57,7 @@ class Zend_Captcha_Figlet extends Zend_Captcha_Word
         parent::__construct($options);
         $this->_figlet = new Zend_Text_Figlet($options);
     }
-    
+
     /**
      * Generate new captcha
      *
@@ -66,7 +66,7 @@ class Zend_Captcha_Figlet extends Zend_Captcha_Word
     public function generate()
     {
         $this->_useNumbers = false;
-        return parent::generate();    
+        return parent::generate();
     }
 
     /**

library/Zend/Captcha/Image.php

@@ -20,7 +20,7 @@
  * @version    $Id$
  */
 
-/** Zend_Captcha_Word */
+/** @see Zend_Captcha_Word */
 require_once 'Zend/Captcha/Word.php';
 
 /**
@@ -423,8 +423,8 @@ class Zend_Captcha_Image extends Zend_Captcha_Word
         $tries = 5;
         // If there's already such file, try creating a new ID
         while($tries-- && file_exists($this->getImgDir() . $id . $this->getSuffix())) {
-        	$id = $this->_generateRandomId();
-        	$this->_setId($id);
+            $id = $this->_generateRandomId();
+            $this->_setId($id);
         }
         $this->_generateImage($id, $this->getWord());
 

library/Zend/Captcha/ReCaptcha.php

@@ -19,10 +19,10 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/** Zend_Captcha_Base */
+/** @see Zend_Captcha_Base */
 require_once 'Zend/Captcha/Base.php';
 
-/** Zend_Service_ReCaptcha */
+/** @see Zend_Service_ReCaptcha */
 require_once 'Zend/Service/ReCaptcha.php';
 
 /**

library/Zend/Captcha/Word.php

@@ -19,7 +19,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/** Zend_Captcha_Base */
+/** @see Zend_Captcha_Base */
 require_once 'Zend/Captcha/Base.php';
 
 /**