Merge branch 'hotfix/sm-plugin-fixes' of https://github.com/EvanDotPr…

…o/zf2 into features/servicemanager-pluginmanager-config

Conflicts:
	library/Zend/ServiceManager/ServiceManager.php

src/HelperPluginManager.php

@@ -27,7 +27,7 @@
  * Plugin manager implementation for view helpers
  *
  * Enforces that heleprs retrieved are instances of
- * Helper\HelperInterface. Additionally, it registers a number of default 
+ * Helper\HelperInterface. Additionally, it registers a number of default
  * helpers.
  *
  * @category   Zend
@@ -39,15 +39,20 @@ class HelperPluginManager extends AbstractPluginManager
 {
     /**
      * Default set of helpers
-     * 
+     *
      * @var array
      */
     protected $invokableClasses = array(
+        // basepath, doctype, and url are set up as factories in the ViewHelperManagerFactory.
+        // basepath and url are not very useful without their factories, however the doctype
+        // helper works fine as an invokable. The factory for doctype simply checks for the
+        // config value from the merged config.
+        'doctype'             => 'Zend\View\Helper\Doctype', // overridden by a factory in ViewHelperManagerFactory
         'basepath'            => 'Zend\View\Helper\BasePath',
+        'url'                 => 'Zend\View\Helper\Url',
         'currency'            => 'Zend\View\Helper\Currency',
         'cycle'               => 'Zend\View\Helper\Cycle',
         'declarevars'         => 'Zend\View\Helper\DeclareVars',
-        'doctype'             => 'Zend\View\Helper\Doctype',
         'escape'              => 'Zend\View\Helper\Escape',
         'gravatar'            => 'Zend\View\Helper\Gravatar',
         'headlink'            => 'Zend\View\Helper\HeadLink',
@@ -71,7 +76,6 @@ class HelperPluginManager extends AbstractPluginManager
         'rendertoplaceholder' => 'Zend\View\Helper\RenderToPlaceholder',
         'serverurl'           => 'Zend\View\Helper\ServerUrl',
         'translator'          => 'Zend\View\Helper\Translator',
-        'url'                 => 'Zend\View\Helper\Url',
         'viewmodel'           => 'Zend\View\Helper\ViewModel',
     );
 
@@ -85,8 +89,8 @@ class HelperPluginManager extends AbstractPluginManager
      *
      * After invoking parent constructor, add an initializer to inject the
      * attached renderer, if any, to the currently requested helper.
-     * 
-     * @param  null|ConfigurationInterface $configuration 
+     *
+     * @param  null|ConfigurationInterface $configuration
      * @return void
      */
     public function __construct(ConfigurationInterface $configuration = null)
@@ -97,8 +101,8 @@ public function __construct(ConfigurationInterface $configuration = null)
 
     /**
      * Set renderer
-     * 
-     * @param  Renderer\RendererInterface $renderer 
+     *
+     * @param  Renderer\RendererInterface $renderer
      * @return HelperPluginManager
      */
     public function setRenderer(Renderer\RendererInterface $renderer)
@@ -109,7 +113,7 @@ public function setRenderer(Renderer\RendererInterface $renderer)
 
     /**
      * Retrieve renderer instance
-     * 
+     *
      * @return null|Renderer\RendererInterface
      */
     public function getRenderer()
@@ -120,13 +124,13 @@ public function getRenderer()
     /**
      * Inject a helper instance with the registered renderer
      *
-     * @param  Helper\HelperInterface $helper 
+     * @param  Helper\HelperInterface $helper
      * @return void
      */
     public function injectRenderer($helper)
     {
         $renderer = $this->getRenderer();
-        if (null === $renderer) { 
+        if (null === $renderer) {
             return;
         }
         $helper->setView($renderer);
@@ -136,8 +140,8 @@ public function injectRenderer($helper)
      * Validate the plugin
      *
      * Checks that the helper loaded is an instance of Helper\HelperInterface.
-     * 
-     * @param  mixed $plugin 
+     *
+     * @param  mixed $plugin
      * @return void
      * @throws Exception\InvalidHelperException if invalid
      */