Merge branch '3.2.x'

* 3.2.x:
  [ticket/14589] Fix @var usage
This commit is contained in:
Tristan Darricau 2016-04-13 19:14:18 +02:00
commit 36c87313a4
No known key found for this signature in database
GPG key ID: 817043C2E29DB881
2 changed files with 2 additions and 2 deletions

View file

@ -29,7 +29,7 @@ class delete
/** @var driver_interface */ /** @var driver_interface */
protected $db; protected $db;
/** @var \phpbb\event\dispatcher */ /** @var dispatcher */
protected $dispatcher; protected $dispatcher;
/** @var filesystem */ /** @var filesystem */

View file

@ -39,7 +39,7 @@ class upload
/** @var \phpbb\files\upload Upload class */ /** @var \phpbb\files\upload Upload class */
protected $files_upload; protected $files_upload;
/** @var \phpbb\language\language */ /** @var language */
protected $language; protected $language;
/** @var guesser Mimetype guesser */ /** @var guesser Mimetype guesser */