Merge branch 'master' of git://github.com/zendframework/zf2 into hotf…

…ix/uri-path-not-being-set-when-empty

src/Pattern/CaptureCache.php

@@ -351,7 +351,7 @@ protected function createDirectoryStructure($pathname)
             foreach ($parts as $part) {
                 $path.= \DIRECTORY_SEPARATOR . $part;
 
-                // create a single directory, set and reset umask immediatly
+                // create a single directory, set and reset umask immediately
                 $umask = ($umask !== false) ? umask($umask) : false;
                 $res   = mkdir($path, ($perm === false) ? 0777 : $perm, false);
                 if ($umask !== false) {

src/Pattern/OutputCache.php

@@ -72,7 +72,7 @@ public function start($key)
     }
 
     /**
-     * Stops bufferung output, write buffered data to cache using the given key on start()
+     * Stops buffering output, write buffered data to cache using the given key on start()
      * and displays the buffer.
      *
      * @return boolean TRUE on success, FALSE on failure writing to cache

src/Pattern/PatternOptions.php

@@ -641,7 +641,7 @@ public function setPublicDir($publicDir)
 
         if (!is_dir($publicDir)) {
             throw new Exception\InvalidArgumentException(
-                "Public directory '{$publicDir}' not found or not a directoy"
+                "Public directory '{$publicDir}' not found or not a directory"
             );
         } elseif (!is_writable($publicDir)) {
             throw new Exception\InvalidArgumentException(

src/Storage/Adapter/AbstractAdapter.php

@@ -1569,7 +1569,7 @@ protected function normalizeKeys(array & $keys)
     }
 
     /**
-     * Validates and normalizes an array of key-value paírs
+     * Validates and normalizes an array of key-value pairs
      *
      * @param  array $keyValuePairs
      * @return void

src/Storage/Adapter/ApcIterator.php

@@ -22,7 +22,7 @@ class ApcIterator implements IteratorInterface
 {
 
     /**
-     * The apc storage intance
+     * The apc storage instance
      *
      * @var Apc
      */

src/Storage/Adapter/Dba.php

@@ -509,7 +509,7 @@ protected function _open()
     }
 
     /**
-     * Close database file if opend
+     * Close database file if opened
      *
      * @return void
      */

src/Storage/Adapter/DbaIterator.php

@@ -21,7 +21,7 @@
 class DbaIterator implements IteratorInterface
 {
     /**
-     * The apc storage intance
+     * The apc storage instance
      *
      * @var Apc
      */
@@ -184,7 +184,7 @@ public function valid()
     public function rewind()
     {
         if ($this->currentInternalKey === false) {
-            throw new Exception\RuntimeException("Iterater is on an invalid state");
+            throw new Exception\RuntimeException("Iterator is on an invalid state");
         }
 
         $this->currentInternalKey = dba_firstkey($this->handle);

src/Storage/Adapter/Filesystem.php

@@ -1444,7 +1444,7 @@ protected function prepareDirectoryStructure($file)
             foreach ($parts as $part) {
                 $path.= \DIRECTORY_SEPARATOR . $part;
 
-                // create a single directory, set and reset umask immediatly
+                // create a single directory, set and reset umask immediately
                 $umask = ($umask !== false) ? umask($umask) : false;
                 $res   = mkdir($path, ($perm === false) ? 0777 : $perm, false);
                 if ($umask !== false) {

src/Storage/Adapter/FilesystemIterator.php

@@ -22,7 +22,7 @@ class FilesystemIterator implements IteratorInterface
 {
 
     /**
-     * The apc storage intance
+     * The apc storage instance
      *
      * @var Apc
      */

src/Storage/Adapter/FilesystemOptions.php

@@ -132,7 +132,7 @@ public function setCacheDir($cacheDir)
         if ($cacheDir !== null) {
             if (!is_dir($cacheDir)) {
                 throw new Exception\InvalidArgumentException(
-                    "Cache directory '{$cacheDir}' not found or not a directoy"
+                    "Cache directory '{$cacheDir}' not found or not a directory"
                 );
             } elseif (!is_writable($cacheDir)) {
                 throw new Exception\InvalidArgumentException(
@@ -339,14 +339,14 @@ public function getFilePermission()
     /**
      * Set namespace separator
      *
-     * @param  string $namespaceSeperator
+     * @param  string $namespaceSeparator
      * @return FilesystemOptions
      */
-    public function setNamespaceSeparator($namespaceSeperator)
+    public function setNamespaceSeparator($namespaceSeparator)
     {
-        $namespaceSeperator = (string) $namespaceSeperator;
-        $this->triggerOptionEvent('namespace_separator', $namespaceSeperator);
-        $this->namespaceSeparator = $namespaceSeperator;
+        $namespaceSeparator = (string) $namespaceSeparator;
+        $this->triggerOptionEvent('namespace_separator', $namespaceSeparator);
+        $this->namespaceSeparator = $namespaceSeparator;
         return $this;
     }
 

src/Storage/Capabilities.php

@@ -433,7 +433,7 @@ public function getMaxKeyLength()
     }
 
     /**
-     * Set maximum key lenth
+     * Set maximum key length
      *
      * @param  stdClass $marker
      * @param  int $maxKeyLength

src/Storage/Plugin/PluginOptions.php

@@ -105,7 +105,7 @@ public function getClearingFactor()
      * Used by:
      * - ExceptionHandler
      *
-     * @param  callable EexceptionCallback
+     * @param  callable ExceptionCallback
      * @return PluginOptions
      */
     public function setExceptionCallback($exceptionCallback)