Merge pull request zendframework#5512

library/Zend/Barcode/Barcode.php

@@ -182,7 +182,7 @@ public static function makeBarcode($barcode, $barcodeConfig = array())
         }
 
         /*
-         * Verify that an barcode name has been specified.
+         * Verify that a barcode name has been specified.
          */
         if (!is_string($barcode) || empty($barcode)) {
             throw new Exception\InvalidArgumentException(
@@ -234,7 +234,7 @@ public static function makeRenderer($renderer = 'image', $rendererConfig = array
         }
 
         /*
-         * Verify that an barcode name has been specified.
+         * Verify that a barcode name has been specified.
          */
         if (!is_string($renderer) || empty($renderer)) {
             throw new Exception\RendererCreationException(

library/Zend/Cache/Storage/Adapter/AbstractAdapter.php

@@ -194,7 +194,7 @@ public function getEventManager()
     }
 
     /**
-     * Trigger an pre event and return the event response collection
+     * Trigger a pre event and return the event response collection
      *
      * @param  string $eventName
      * @param  ArrayObject $args

library/Zend/Cache/StorageFactory.php

@@ -194,7 +194,7 @@ public static function resetAdapterPluginManager()
     public static function pluginFactory($pluginName, $options = array())
     {
         if ($pluginName instanceof Storage\Plugin\PluginInterface) {
-            // $pluginName is already an plugin object
+            // $pluginName is already a plugin object
             $plugin = $pluginName;
         } else {
             $plugin = static::getPluginManager()->get($pluginName);

library/Zend/Console/Console.php

@@ -10,7 +10,7 @@
 namespace Zend\Console;
 
 /**
- * An static, utility class for interacting with Console environment.
+ * A static, utility class for interacting with Console environment.
  * Declared abstract to prevent from instantiating.
  */
 abstract class Console

library/Zend/Crypt/Password/Apache.php

@@ -116,7 +116,7 @@ public function create($password)
     }
 
     /**
-     * Verify if a password is correct against an hash value
+     * Verify if a password is correct against a hash value
      *
      * @param  string  $password
      * @param  string  $hash

library/Zend/Crypt/Password/Bcrypt.php

@@ -108,7 +108,7 @@ public function create($password)
     }
 
     /**
-     * Verify if a password is correct against an hash value
+     * Verify if a password is correct against a hash value
      *
      * @param  string $password
      * @param  string $hash

library/Zend/Db/Adapter/Driver/IbmDb2/IbmDb2.php

@@ -156,7 +156,7 @@ public function createStatement($sqlOrResource = null)
                 $statement->setSql($sqlOrResource);
             } elseif ($sqlOrResource !== null) {
                 throw new Exception\InvalidArgumentException(
-                    __FUNCTION__ . ' only accepts an SQL string or a ibm_db2 resource'
+                    __FUNCTION__ . ' only accepts an SQL string or an ibm_db2 resource'
                 );
             }
             if (!$this->connection->isConnected()) {

library/Zend/Db/Adapter/Driver/Oci8/Connection.php

@@ -57,7 +57,7 @@ public function __construct($connectionInfo = null)
         } elseif ($connectionInfo instanceof \oci8) {
             $this->setResource($connectionInfo);
         } elseif (null !== $connectionInfo) {
-            throw new Exception\InvalidArgumentException('$connection must be an array of parameters, a oci8 resource or null');
+            throw new Exception\InvalidArgumentException('$connection must be an array of parameters, an oci8 resource or null');
         }
     }
 

library/Zend/Db/Adapter/Driver/Oci8/Oci8.php

@@ -183,7 +183,7 @@ public function createStatement($sqlOrResource = null)
                 $statement->setSql($sqlOrResource);
             } elseif ($sqlOrResource !== null) {
                 throw new Exception\InvalidArgumentException(
-                    'Oci8 only accepts an SQL string or a oci8 resource in ' . __FUNCTION__
+                    'Oci8 only accepts an SQL string or an oci8 resource in ' . __FUNCTION__
                 );
             }
             if (!$this->connection->isConnected()) {

library/Zend/EventManager/SharedEventManager.php

@@ -109,7 +109,7 @@ public function detach($id, CallbackHandler $listener)
     /**
      * Detach a listener aggregate
      *
-     * Listener aggregates accept an SharedEventManagerInterface instance, and call detachShared()
+     * Listener aggregates accept a SharedEventManagerInterface instance, and call detachShared()
      * of all previously attached listeners.
      *
      * @param  SharedListenerAggregateInterface $aggregate

library/Zend/EventManager/SharedListenerAggregateInterface.php

@@ -13,7 +13,7 @@
  * Interface for self-registering event listeners.
  *
  * Classes implementing this interface may be registered by name or instance
- * with an SharedEventManager, without an event name. The {@link attach()} method will
+ * with a SharedEventManager, without an event name. The {@link attach()} method will
  * then be called with the current SharedEventManager instance, allowing the class to
  * wire up one or more listeners.
  */

library/Zend/Feed/PubSubHubbub/PubSubHubbub.php

@@ -95,7 +95,7 @@ public static function getHttpClient()
 
     /**
      * Simple mechanism to delete the entire singleton HTTP Client instance
-     * which forces an new instantiation for subsequent requests.
+     * which forces a new instantiation for subsequent requests.
      *
      * @return void
      */

library/Zend/Feed/Writer/Entry.php

@@ -531,7 +531,7 @@ public function getCommentFeedLinks()
     }
 
     /**
-     * Add a entry category
+     * Add an entry category
      *
      * @param array $category
      * @throws Exception\InvalidArgumentException

library/Zend/File/Transfer/Adapter/AbstractAdapter.php

@@ -275,7 +275,7 @@ public function getValidatorManager()
      * Adds a new validator for this class
      *
      * @param  string|Validator\ValidatorInterface $validator           Type of validator to add
-     * @param  bool                    $breakChainOnFailure If the validation chain should stop an failure
+     * @param  bool                    $breakChainOnFailure If the validation chain should stop a failure
      * @param  string|array               $options             Options to set for the validator
      * @param  string|array               $files               Files to limit this validator to
      * @return AbstractAdapter

library/Zend/Filter/Encrypt/BlockCipher.php

@@ -215,7 +215,7 @@ public function getCompression()
     }
 
     /**
-     * Sets a internal compression for values to encrypt
+     * Sets an internal compression for values to encrypt
      *
      * @param  string|array $compression
      * @return self

library/Zend/Filter/Encrypt/Openssl.php

@@ -290,7 +290,7 @@ public function getCompression()
     }
 
     /**
-     * Sets a internal compression for values to encrypt
+     * Sets an internal compression for values to encrypt
      *
      * @param string|array $compression
      * @return self

library/Zend/Http/Client/Cookies.php

@@ -323,7 +323,7 @@ protected function _matchPath($domains, $path)
 
     /**
      * Create a new Cookies object and automatically load into it all the
-     * cookies set in an Http_Response object. If $uri is set, it will be
+     * cookies set in an \Zend\Http\Response object. If $uri is set, it will be
      * considered as the requested URI for setting default domain and path
      * of the cookie.
      *
@@ -382,7 +382,7 @@ public function reset()
 
     /**
      * (PHP 5 &gt;= 5.1.0)<br/>
-     * Whether a offset exists
+     * Whether an offset exists
      * @link http://php.net/manual/en/arrayaccess.offsetexists.php
      * @param mixed $offset <p>
      * An offset to check for.

library/Zend/Http/Cookies.php

@@ -329,7 +329,7 @@ protected function _matchPath($domains, $path)
 
     /**
      * Create a new Cookies object and automatically load into it all the
-     * cookies set in an Http_Response object. If $uri is set, it will be
+     * cookies set in a Response object. If $uri is set, it will be
      * considered as the requested URI for setting default domain and path
      * of the cookie.
      *

library/Zend/Json/Server/Cache.php

@@ -48,7 +48,7 @@ public static function saveSmd($filename, Server $server)
     /**
      * Retrieve a cached SMD
      *
-     * On success, returns the cached SMD (a JSON string); an failure, returns
+     * On success, returns the cached SMD (a JSON string); a failure, returns
      * boolean false.
      *
      * @param  string $filename

library/Zend/Json/Server/Client.php

@@ -104,7 +104,7 @@ public function getLastResponse()
     }
 
     /**
-     * Perform an JSOC-RPC request and return a response.
+     * Perform a JSON-RPC request and return a response.
      *
      * @param  Request $request Request.
      * @return Response Response.
@@ -151,7 +151,7 @@ public function doRequest($request)
     }
 
     /**
-     * Send an JSON-RPC request to the service (for a specific method).
+     * Send a JSON-RPC request to the service (for a specific method).
      *
      * @param  string $method Name of the method we want to call.
      * @param  array $params Array of parameters for the method.

library/Zend/Json/Server/Exception/ErrorException.php

@@ -12,7 +12,7 @@
 use Zend\Json\Exception;
 
 /**
- * Thrown by Zend\Json\Server\Client when an JSON-RPC fault response is returned.
+ * Thrown by Zend\Json\Server\Client when a JSON-RPC fault response is returned.
  */
 class ErrorException extends Exception\BadMethodCallException implements
     ExceptionInterface

library/Zend/Ldap/Node/Schema/OpenLdap.php

@@ -321,7 +321,7 @@ protected function loadMatchingRules()
     }
 
     /**
-     * Parses an matchingRules value
+     * Parses a matchingRules value
      *
      * @param  string $value
      * @return array
@@ -361,7 +361,7 @@ protected function loadMatchingRuleUse()
     }
 
     /**
-     * Parses an matchingRuleUse value
+     * Parses a matchingRuleUse value
      *
      * @param  string $value
      * @return array
@@ -451,7 +451,7 @@ protected function parseLdapSchemaSyntax(array &$data, array $tokens)
                 } else {
                     $data[$token] = Converter\Converter::fromLdap($data[$token]);
                 }
-                // create a array if the value should be multivalued but was not
+                // create an array if the value should be multivalued but was not
                 if (in_array($token, $multiValue) && !is_array($data[$token])) {
                     $data[$token] = array($data[$token]);
                 }

library/Zend/Loader/AutoloaderFactory.php

@@ -108,7 +108,7 @@ public static function factory($options = null)
     }
 
     /**
-     * Get an list of all autoloaders registered with the factory
+     * Get a list of all autoloaders registered with the factory
      *
      * Returns an array of autoloader instances.
      *

library/Zend/Log/Filter/SuppressFilter.php

@@ -35,7 +35,7 @@ public function __construct($suppress = false)
         }
         if (!is_bool($suppress)) {
             throw new Exception\InvalidArgumentException(sprintf(
-                    'Suppress must be an boolean; received "%s"', gettype($suppress)
+                    'Suppress must be a boolean; received "%s"', gettype($suppress)
             ));
         }
 

library/Zend/Log/Logger.php

@@ -114,7 +114,7 @@ class Logger implements LoggerInterface
     /**
      * Constructor
      *
-     * Set options for an logger. Accepted options are:
+     * Set options for a logger. Accepted options are:
      * - writers: array of writers to add to this logger
      * - exceptionhandler: if true register this logger as exceptionhandler
      * - errorhandler: if true register this logger as errorhandler

library/Zend/Log/Processor/RequestId.php

@@ -21,7 +21,7 @@ class RequestId implements ProcessorInterface
     protected $identifier;
 
     /**
-     * Adds a identifier for the request to the log.
+     * Adds an identifier for the request to the log.
      *
      * This enables to filter the log for messages belonging to a specific request
      *

library/Zend/Log/Writer/AbstractWriter.php

@@ -62,7 +62,7 @@ abstract class AbstractWriter implements WriterInterface
     /**
      * Constructor
      *
-     * Set options for an writer. Accepted options are:
+     * Set options for a writer. Accepted options are:
      * - filters: array of filters to add to this filter
      * - formatter: formatter for this writer
      *

library/Zend/Paginator/Adapter/AdapterInterface.php

@@ -17,7 +17,7 @@
 interface AdapterInterface extends Countable
 {
     /**
-     * Returns an collection of items for a page.
+     * Returns a collection of items for a page.
      *
      * @param  int $offset Page offset
      * @param  int $itemCountPerPage Number of items per page

library/Zend/Serializer/Adapter/PythonPickle.php

@@ -449,7 +449,7 @@ protected function writeArrayList(array $value)
     }
 
     /**
-     * Write an object as an dictionary
+     * Write an object as a dictionary
      *
      * @param  object $value
      */
@@ -466,7 +466,7 @@ protected function writeObject($value)
             $this->writeArrayDict($value->toArray());
 
         // If the object is an iterator simply iterate it
-        // and convert it to an dictionary
+        // and convert it to a dictionary
         } elseif ($value instanceof Traversable) {
             $this->writeArrayDict($value);
 

library/Zend/Stdlib/CallbackHandler.php

@@ -14,7 +14,7 @@
 /**
  * CallbackHandler
  *
- * A handler for a event, event, filterchain, etc. Abstracts PHP callbacks,
+ * A handler for an event, event, filterchain, etc. Abstracts PHP callbacks,
  * primarily to allow for lazy-loading and ensuring availability of default
  * arguments (currying).
  */

library/Zend/Stdlib/ErrorHandler.php

@@ -13,7 +13,7 @@
 
 /**
  * ErrorHandler that can be used to catch internal PHP errors
- * and convert to a ErrorException instance.
+ * and convert to an ErrorException instance.
  */
 abstract class ErrorHandler
 {

library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php

@@ -242,7 +242,7 @@ function (&$item, $key) { $item = $key . '=' . $item; }
     }
 
     /**
-     * Dispatch the MVC with an URL
+     * Dispatch the MVC with a URL
      * Accept a HTTP (simulate a customer action) or console route.
      *
      * The URL provided set the request URI in the request object.

library/Zend/Uri/UriInterface.php

@@ -10,7 +10,7 @@
 namespace Zend\Uri;
 
 /**
- * Interface defining an URI
+ * Interface defining a URI
  */
 interface UriInterface
 {

library/Zend/Validator/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
      */

library/Zend/Validator/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

library/Zend/Validator/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