Merge pull request zendframework/zendframework#2101 from pborreli/typos

Fixed few typos

src/Helper/Gravatar.php

@@ -59,7 +59,7 @@ class Gravatar extends AbstractHtmlElement
     );
 
     /**
-     * Email Adress
+     * Email Address
      *
      * @var string
      */
@@ -77,13 +77,13 @@ class Gravatar extends AbstractHtmlElement
      *
      * $options may include the following:
      * - 'img_size' int height of img to return
-     * - 'default_img' string img to return if email adress has not found
+     * - 'default_img' string img to return if email address has not found
      * - 'rating' string rating parameter for avatar
      * - 'secure' bool load from the SSL or Non-SSL location
      *
      * @see    http://pl.gravatar.com/site/implement/url
      * @see    http://pl.gravatar.com/site/implement/url More information about gravatar's service.
-     * @param  string|null $email Email adress.
+     * @param  string|null $email Email address.
      * @param  null|array $options Options
      * @param  array $attribs Attributes for image tag (title, alt etc.)
      * @return Zend\View\Helper\Gravatar
@@ -204,7 +204,7 @@ public function getRating()
     }
 
     /**
-     * Set email adress
+     * Set email address
      *
      * @param string $email
      * @return Gravatar
@@ -216,7 +216,7 @@ public function setEmail( $email )
     }
 
     /**
-     * Get email adress
+     * Get email address
      *
      * @return string
      */
@@ -292,7 +292,7 @@ protected function getGravatarUrl()
     }
 
     /**
-     * Get avatar url (including size, rating and default image oprions)
+     * Get avatar url (including size, rating and default image options)
      *
      * @return string
      */

src/Helper/HeadLink.php

@@ -330,7 +330,7 @@ public function createData(array $attributes)
      * Create item for stylesheet link item
      *
      * @param  array $args
-     * @return stdClass|false Returns fals if stylesheet is a duplicate
+     * @return stdClass|false Returns false if stylesheet is a duplicate
      */
     public function createDataStylesheet(array $args)
     {

src/Helper/HeadMeta.php

@@ -79,7 +79,7 @@ public function __invoke($content = null, $keyValue = null, $keyType = 'name', $
     }
 
     /**
-     * Normalize type attribut of meta
+     * Normalize type attribute of meta
      *
      * @param $type type in CamelCase
      * @return string
@@ -107,11 +107,11 @@ protected function normalizeType($type)
      *
      * Allows the following 'virtual' methods:
      * - appendName($keyValue, $content, $modifiers = array())
-     * - offsetGetName($index, $keyValue, $content, $modifers = array())
+     * - offsetGetName($index, $keyValue, $content, $modifiers = array())
      * - prependName($keyValue, $content, $modifiers = array())
      * - setName($keyValue, $content, $modifiers = array())
      * - appendHttpEquiv($keyValue, $content, $modifiers = array())
-     * - offsetGetHttpEquiv($index, $keyValue, $content, $modifers = array())
+     * - offsetGetHttpEquiv($index, $keyValue, $content, $modifiers = array())
      * - prependHttpEquiv($keyValue, $content, $modifiers = array())
      * - setHttpEquiv($keyValue, $content, $modifiers = array())
      * - appendProperty($keyValue, $content, $modifiers = array())

src/Helper/HeadScript.php

@@ -22,7 +22,7 @@
 class HeadScript extends Placeholder\Container\AbstractStandalone
 {
     /**#@+
-     * Script type contants
+     * Script type constants
      * @const string
      */
     const FILE   = 'FILE';

src/Helper/Navigation/AbstractHelper.php

@@ -74,7 +74,7 @@ abstract class AbstractHelper extends View\Helper\AbstractHtmlElement implements
     protected $acl;
 
     /**
-     * Wheter invisible items should be rendered by this helper
+     * Whether invisible items should be rendered by this helper
      *
      * @var bool
      */

src/Helper/Navigation/Menu.php

@@ -311,7 +311,7 @@ protected function normalizeOptions(array $options = array())
     // Render methods:
 
     /**
-     * Renders the deepest active menu within [$minDepth, $maxDeth], (called
+     * Renders the deepest active menu within [$minDepth, $maxDepth], (called
      * from {@link renderMenu()})
      *
      * @param  AbstractContainer         $container  container to render
@@ -407,7 +407,7 @@ protected function renderNormalMenu(AbstractContainer $container,
             $depth = $iterator->getDepth();
             $isActive = $page->isActive(true);
             if ($depth < $minDepth || !$this->accept($page)) {
-                // page is below minDepth or not accepted by acl/visibilty
+                // page is below minDepth or not accepted by acl/visibility
                 continue;
             } elseif ($onlyActive && !$isActive) {
                 // page is not active itself, but might be in the active branch

src/Helper/Navigation/Sitemap.php

@@ -125,7 +125,7 @@ public function getFormatOutput()
     /**
      * Sets whether the XML declaration should be used in output
      *
-     * @param  bool $useXmlDecl whether XML delcaration should be rendered
+     * @param  bool $useXmlDecl whether XML declaration should be rendered
      * @returnSitemap  fluent interface, returns self
      */
     public function setUseXmlDeclaration($useXmlDecl)

src/Helper/Placeholder/Container/AbstractStandalone.php

@@ -14,7 +14,7 @@
 use Zend\View\Helper\Placeholder\Registry;
 
 /**
- * Base class for targetted placeholder helpers
+ * Base class for targeted placeholder helpers
  *
  * @package    Zend_View
  * @subpackage Helper
@@ -40,8 +40,8 @@ abstract class AbstractStandalone
     protected $regKey;
 
     /**
-     * Flag wheter to automatically escape output, must also be
-     * enforced in the child class if __toString/toString is overriden
+     * Flag whether to automatically escape output, must also be
+     * enforced in the child class if __toString/toString is overridden
      * @var book
      */
     protected $autoEscape = true;

test/Helper/HeadStyleTest.php

@@ -347,7 +347,7 @@ public function testMediaAttributeAsArray()
 
     }
 
-    public function testMediaAttributeAsCommaSeperatedString()
+    public function testMediaAttributeAsCommaSeparatedString()
     {
         $this->helper->setIndent(4);
         $this->helper->appendStyle('

test/PhpRendererTest.php

@@ -183,7 +183,7 @@ public function testCanSpecifyArrayForVarsAndGetAlwaysArrayObject()
     /**
      * @group ZF2-68
      */
-    public function testPassingVariablesObjectToSetVarsShouldUseItDirectoy()
+    public function testPassingVariablesObjectToSetVarsShouldUseItDirectory()
     {
         $vars = new Variables(array('foo' => '<p>Bar</p>'));
         $this->renderer->setVars($vars);