Merge branch 'hotfix/104' into develop

Forward port #104

Author: weierophinney

CHANGELOG.md

@@ -45,6 +45,9 @@ All notable changes to this project will be documented in this file, in reverse
   rendered. As long as the `HeadMeta` helper is called early in your markup, this
   should ensure it is within the first 1024 characters, ensuring your document
   validates.
+- [#104](https://github.com/zendframework/zend-view/pull/104) fixes the
+  `@method` annotation for the `Placeholder` view helper to use the correct case,
+  fixing issues with method completion in IDEs.
 
 ## 2.8.1 - 2016-06-30
 

src/Renderer/PhpRenderer.php

@@ -61,7 +61,7 @@
  * @method string paginationControl(\Zend\Paginator\Paginator $paginator = null, $scrollingStyle = null, $partial = null, $params = null)
  * @method string|\Zend\View\Helper\Partial partial($name = null, $values = null)
  * @method string partialLoop($name = null, $values = null)
- * @method \Zend\View\Helper\Placeholder\Container\AbstractContainer placeHolder($name = null)
+ * @method \Zend\View\Helper\Placeholder\Container\AbstractContainer placeholder($name = null)
  * @method string renderChildModel($child)
  * @method void renderToPlaceholder($script, $placeholder)
  * @method string serverUrl($requestUri = null)