Merge pull request zendframework/zendframework#5512

zendframework · Dec 15, 2013 · c768b16 · c768b16
commit c768b16
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/src/AbstractValidator.php b/src/AbstractValidator.php
@@ -36,7 +36,7 @@ abstract class AbstractValidator implements
     protected static $defaultTranslatorTextDomain = 'default';
 
     /**
-     * Limits the maximum returned length of a error message
+     * Limits the maximum returned length of an error message
      *
      * @var int
      */

diff --git a/src/Barcode/Code128.php b/src/Barcode/Code128.php
@@ -214,7 +214,7 @@ protected function code128($value)
         } elseif ($char == '‰') {
             $sum = 105;
         } elseif ($usecheck == true) {
-            // no start value, unable to detect an proper checksum
+            // no start value, unable to detect a proper checksum
             return false;
         }
 
@@ -389,7 +389,7 @@ protected function ord128($value, $set)
     }
 
     /**
-     * Internal Method to return the ascii value from an code128 integer
+     * Internal Method to return the ascii value from a code128 integer
      *
      * Table A
      *    ASCII       CODE128

diff --git a/src/File/Count.php b/src/File/Count.php
@@ -71,7 +71,7 @@ class Count extends AbstractValidator
      * Min limits the file count, when used with max=null it is the maximum file count
      * It also accepts an array with the keys 'min' and 'max'
      *
-     * If $options is a integer, it will be used as maximum file count
+     * If $options is an integer, it will be used as maximum file count
      * As Array is accepts the following keys:
      * 'min': Minimum filecount
      * 'max': Maximum filecount
@@ -192,7 +192,7 @@ public function addFile($file)
     /**
      * Returns true if and only if the file count of all checked files is at least min and
      * not bigger than max (when max is not null). Attention: When checking with set min you
-     * must give all files with the first call, otherwise you will get an false.
+     * must give all files with the first call, otherwise you will get a false.
      *
      * @param  string|array $value Filenames to check for count
      * @param  array        $file  File data from \Zend\File\Transfer\Transfer

diff --git a/src/File/ImageSize.php b/src/File/ImageSize.php
@@ -14,7 +14,7 @@
 use Zend\Validator\Exception;
 
 /**
- * Validator for the image size of a image file
+ * Validator for the image size of an image file
  */
 class ImageSize extends AbstractValidator
 {

diff --git a/src/File/Size.php b/src/File/Size.php
@@ -64,7 +64,7 @@ class Size extends AbstractValidator
     /**
      * Sets validator options
      *
-     * If $options is a integer, it will be used as maximum file size
+     * If $options is an integer, it will be used as maximum file size
      * As Array is accepts the following keys:
      * 'min': Minimum file size
      * 'max': Maximum file size
@@ -131,7 +131,7 @@ public function getMin($raw = false)
     /**
      * Sets the minimum file size
      *
-     * File size can be an integer or an byte string
+     * File size can be an integer or a byte string
      * This includes 'B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'
      * For example: 2000, 2MB, 0.2GB
      *
@@ -176,7 +176,7 @@ public function getMax($raw = false)
     /**
      * Sets the maximum file size
      *
-     * File size can be an integer or an byte string
+     * File size can be an integer or a byte string
      * This includes 'B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'
      * For example: 2000, 2MB, 0.2GB
      *

diff --git a/src/File/WordCount.php b/src/File/WordCount.php
@@ -65,7 +65,7 @@ class WordCount extends AbstractValidator
      * Min limits the word count, when used with max=null it is the maximum word count
      * It also accepts an array with the keys 'min' and 'max'
      *
-     * If $options is a integer, it will be used as maximum word count
+     * If $options is an integer, it will be used as maximum word count
      * As Array is accepts the following keys:
      * 'min': Minimum word count
      * 'max': Maximum word count

diff --git a/test/CreditCardTest.php b/test/CreditCardTest.php
@@ -176,7 +176,7 @@ public function testConstructionWithOptions($input, $expected)
     }
 
     /**
-     * Test a invalid service class
+     * Test an invalid service class
      *
      * @return void
      */

diff --git a/test/File/_files/magic.mime b/test/File/_files/magic.mime
@@ -3098,7 +3098,7 @@
 >0	byte		^0x80		executable
 >16	belong		>0		not stripped
 >36	belong		0xb4100001	(uses shared libs)
-# Chiasmus is a encryption standard developed by the German Federal
+# Chiasmus is an encryption standard developed by the German Federal
 # Office for Information Security (Bundesamt fuer Sicherheit in der
 # Informationstechnik).
 
@@ -13676,7 +13676,7 @@
 >4	string	>\0		label:%.10s
 
 # Sinclair QL OS dump (ThMO)
-# (NOTE: if `file' would be able to use indirect references in a endian format
+# (NOTE: if `file' would be able to use indirect references in an endian format
 #	 differing from the natural host format, this could be written more
 #	 reliably and faster...)
 #