Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2017-06-25 14:13:58 +02:00
commit c876392b98
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -18,7 +18,7 @@ namespace phpbb\help;
*/ */
class manager class manager
{ {
/** @var \phpbb\event\dispatcher */ /** @var \phpbb\event\dispatcher_interface */
protected $dispatcher; protected $dispatcher;
/** @var \phpbb\language\language */ /** @var \phpbb\language\language */
@ -33,11 +33,11 @@ class manager
/** /**
* Constructor * Constructor
* *
* @param \phpbb\event\dispatcher $dispatcher * @param \phpbb\event\dispatcher_interface $dispatcher
* @param \phpbb\language\language $language * @param \phpbb\language\language $language
* @param \phpbb\template\template $template * @param \phpbb\template\template $template
*/ */
public function __construct(\phpbb\event\dispatcher $dispatcher, \phpbb\language\language $language, \phpbb\template\template $template) public function __construct(\phpbb\event\dispatcher_interface $dispatcher, \phpbb\language\language $language, \phpbb\template\template $template)
{ {
$this->dispatcher = $dispatcher; $this->dispatcher = $dispatcher;
$this->language = $language; $this->language = $language;