CS fixes, put package release version in class docblocks

pear · Jul 17, 2013 · 972c543 · 972c543
1 parent f3ccb92
commit 972c543
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 15 deletions.
diff --git a/HTML/QuickForm2/Element/Captcha.php b/HTML/QuickForm2/Element/Captcha.php
@@ -35,6 +35,7 @@
  * @package  HTML_QuickForm2_Captcha
  * @author   Christian Weiske <cweiske@php.net>
  * @license  http://www.gnu.org/copyleft/lesser.html LGPL License
+ * @version  Release: @version@
  * @link     http://pear.php.net/package/HTML_QuickForm2_Captcha
  *
  * @FIXME/@TODO

diff --git a/HTML/QuickForm2/Element/Captcha/Exception.php b/HTML/QuickForm2/Element/Captcha/Exception.php
@@ -20,10 +20,10 @@
  * @package  HTML_QuickForm2_Captcha
  * @author   Christian Weiske <cweiske@php.net>
  * @license  http://www.gnu.org/copyleft/lesser.html LGPL License
+ * @version  Release: @version@
  * @link     http://pear.php.net/package/HTML_QuickForm2_Captcha
  */
 class HTML_QuickForm2_Element_Captcha_Exception extends HTML_QuickForm2_Exception
 {
 }
 ?>
-
diff --git a/HTML/QuickForm2/Element/Captcha/Image.php b/HTML/QuickForm2/Element/Captcha/Image.php
@@ -18,11 +18,11 @@
  * Displays an captcha rendered as image.
  * Some obfuscation is applied to the image.
  *
- *
  * @category HTML
  * @package  HTML_QuickForm2_Captcha
  * @author   Rico Sonntag <rico.sonntag@netresearch.de>
  * @license  http://www.gnu.org/copyleft/lesser.html LGPL License
+ * @version  Release: @version@
  * @link     http://pear.php.net/package/HTML_QuickForm2_Captcha
  * @see      http://pear.php.net/package/Text_CAPTCHA
  */
@@ -201,9 +201,7 @@ protected function garbageCollection()
         foreach (new DirectoryIterator($this->imageDir) as $file) {
             if (!$file->isDot() && !$file->isDir()) {
                 if ($file->getMTime() < $expireTime) {
-                    if (substr($file->getFilename(), -$suffixLength)
-                        == $this->imageSuffix
-                    ) {
+                    if (substr($file->getFilename(), -$suffixLength) == $this->imageSuffix) {
                         unlink($file->getPathname());
                     }
                 }

diff --git a/HTML/QuickForm2/Element/Captcha/Numeral.php b/HTML/QuickForm2/Element/Captcha/Numeral.php
@@ -8,7 +8,6 @@
  * @package  HTML_QuickForm2_Captcha
  * @author   Christian Weiske <cweiske@php.net>
  * @license  http://www.gnu.org/copyleft/lesser.html LGPL License
- * @version  SVN: $Id: InputText.php 294057 2010-01-26 21:10:28Z avb $
  * @link     http://pear.php.net/package/HTML_QuickForm2_Captcha
  */
 
@@ -31,6 +30,7 @@
  * @package  HTML_QuickForm2_Captcha
  * @author   Christian Weiske <cweiske@php.net>
  * @license  http://www.gnu.org/copyleft/lesser.html LGPL License
+ * @version  Release: @version@
  * @link     http://pear.php.net/package/HTML_QuickForm2_Captcha
  * @see      http://pear.php.net/package/Text_CAPTCHA_Numeral
  */

diff --git a/HTML/QuickForm2/Element/Captcha/ReCaptcha.php b/HTML/QuickForm2/Element/Captcha/ReCaptcha.php
@@ -25,6 +25,7 @@
  * @package  HTML_QuickForm2_Captcha
  * @author   Christian Weiske <cweiske@php.net>
  * @license  http://www.gnu.org/copyleft/lesser.html LGPL License
+ * @version  Release: @version@
  * @link     http://pear.php.net/package/HTML_QuickForm2_Captcha
  * @link     http://www.recaptcha.net/
  *

diff --git a/HTML/QuickForm2/Element/Captcha/Session.php b/HTML/QuickForm2/Element/Captcha/Session.php
@@ -20,6 +20,7 @@
  * @package  HTML_QuickForm2_Captcha
  * @author   Christian Weiske <cweiske@php.net>
  * @license  http://www.gnu.org/copyleft/lesser.html LGPL License
+ * @version  Release: @version@
  * @link     http://pear.php.net/package/HTML_QuickForm2_Captcha
  */
 class HTML_QuickForm2_Element_Captcha_Session

diff --git a/HTML/QuickForm2/Element/Captcha/TextCAPTCHA.php b/HTML/QuickForm2/Element/Captcha/TextCAPTCHA.php
@@ -21,11 +21,12 @@
  *
  * In case you need to customize the options, use getAdapter() and
  * modify the object.
-
+ *
  * @category HTML
  * @package  HTML_QuickForm2_Captcha
  * @author   Rico Sonntag <rico.sonntag@netresearch.de>
  * @license  http://www.gnu.org/copyleft/lesser.html LGPL License
+ * @version  Release: @version@
  * @link     http://pear.php.net/package/HTML_QuickForm2_Captcha
  * @see      http://pear.php.net/package/Text_CAPTCHA
  */

diff --git a/package.xml b/package.xml
@@ -55,14 +55,28 @@
    <dir name="HTML">
     <dir name="QuickForm2">
      <dir name="Element">
-      <file role="php" name="Captcha.php" />
+      <file role="php" name="Captcha.php">
+       <tasks:replace type="package-info" from="@version@" to="version" />
+      </file>
       <dir name="Captcha">
-       <file role="php" name="Figlet.php" />
-       <file role="php" name="Image.php" />
-       <file role="php" name="Numeral.php" />
-       <file role="php" name="ReCaptcha.php" />
-       <file role="php" name="Session.php" />
-       <file role="php" name="TextCAPTCHA.php" />
+       <file role="php" name="Figlet.php">
+        <tasks:replace type="package-info" from="@version@" to="version" />
+       </file>
+       <file role="php" name="Image.php">
+        <tasks:replace type="package-info" from="@version@" to="version" />
+       </file>
+       <file role="php" name="Numeral.php">
+        <tasks:replace type="package-info" from="@version@" to="version" />
+       </file>
+       <file role="php" name="ReCaptcha.php">
+        <tasks:replace type="package-info" from="@version@" to="version" />
+       </file>
+       <file role="php" name="Session.php">
+        <tasks:replace type="package-info" from="@version@" to="version" />
+       </file>
+       <file role="php" name="TextCAPTCHA.php">
+        <tasks:replace type="package-info" from="@version@" to="version" />
+       </file>
       </dir>
      </dir>
     </dir>
@@ -129,4 +143,4 @@
   </release>
 
  </changelog>
-</package>
+</package>