Merge branch 'hotfix/3827' into develop

Forward port zendframework/zendframework#3827

src/Helper/FlashMessenger.php

@@ -56,6 +56,7 @@ class FlashMessenger extends AbstractTranslatorHelper implements ServiceLocatorA
     /**
      * Returns the flash messenger plugin controller
      *
+     * @param  string|null $namespace
      * @return FlashMessenger|PluginFlashMessenger
      */
     public function __invoke($namespace = null)
@@ -237,6 +238,7 @@ public function getPluginFlashMessenger()
     /**
      * Set the flash messenger plugin
      *
+     * @param  PluginFlashMessenger $pluginFlashMessenger
      * @return FlashMessenger
      */
     public function setPluginFlashMessenger(PluginFlashMessenger $pluginFlashMessenger)

src/Helper/Placeholder/Container/AbstractStandalone.php

@@ -99,6 +99,7 @@ public function setEscaper(Escaper $escaper)
      *
      * Lazy-loads one if none available
      *
+     * @param  string|null $enc Encoding to use
      * @return mixed
      */
     public function getEscaper($enc = 'UTF-8')