Fix PHPDoc comments project-wide

src/App.php

@@ -121,6 +121,7 @@ class App
 	 * @see initHead()
 	 *
 	 * @param string $path
+	 * @throws InternalServerErrorException
 	 */
 	public function registerStylesheet($path)
 	{
@@ -137,6 +138,7 @@ class App
 	 * @see initFooter()
 	 *
 	 * @param string $path
+	 * @throws InternalServerErrorException
 	 */
 	public function registerFooterScript($path)
 	{
@@ -617,6 +619,7 @@ class App
 	 * finally for PWD
 	 *
 	 * @return string
+	 * @throws InternalServerErrorException
 	 */
 	public function getBasePath()
 	{
@@ -676,6 +679,7 @@ class App
 	 *
 	 * @param bool $ssl Whether to append http or https under SSL_POLICY_SELFSIGN
 	 * @return string Friendica server base URL
+	 * @throws InternalServerErrorException
 	 */
 	public function getBaseURL($ssl = false)
 	{
@@ -709,6 +713,7 @@ class App
 	 * Clears the baseurl cache to prevent inconsistencies
 	 *
 	 * @param string $url
+	 * @throws InternalServerErrorException
 	 */
 	public function setBaseURL($url)
 	{
@@ -882,6 +887,7 @@ class App
 	 * @param string $origURL
 	 *
 	 * @return string The cleaned url
+	 * @throws InternalServerErrorException
 	 */
 	public function removeBaseURL($origURL)
 	{
@@ -935,6 +941,7 @@ class App
 	 * Returns the current UserAgent as a String
 	 *
 	 * @return string the UserAgent as a String
+	 * @throws InternalServerErrorException
 	 */
 	public function getUserAgent()
 	{
@@ -1058,6 +1065,7 @@ class App
 	 * @brief Checks if the minimal memory is reached
 	 *
 	 * @return bool Is the memory limit reached?
+	 * @throws InternalServerErrorException
 	 */
 	public function isMinMemoryReached()
 	{
@@ -1102,6 +1110,7 @@ class App
 	 * @brief Checks if the maximum load is reached
 	 *
 	 * @return bool Is the load reached?
+	 * @throws InternalServerErrorException
 	 */
 	public function isMaxLoadReached()
 	{
@@ -1134,6 +1143,7 @@ class App
 	 *
 	 * @param string $command The command to execute
 	 * @param array  $args    Arguments to pass to the command ( [ 'key' => value, 'key2' => value2, ... ]
+	 * @throws InternalServerErrorException
 	 */
 	public function proc_run($command, $args)
 	{
@@ -1190,7 +1200,10 @@ class App
 	/**
 	 * @brief Checks if a given directory is usable for the system
 	 *
+	 * @param      $directory
+	 * @param bool $check_writable
 	 * @return boolean the directory is usable
+	 * @throws Exception
 	 */
 	public static function isDirectoryUsable($directory, $check_writable = true)
 	{
@@ -1368,6 +1381,7 @@ class App
 	 * Generates the site's default sender email address
 	 *
 	 * @return string
+	 * @throws InternalServerErrorException
 	 */
 	public function getSenderEmailAddress()
 	{
@@ -1388,6 +1402,7 @@ class App
 	 * Returns the current theme name.
 	 *
 	 * @return string the name of the current theme
+	 * @throws InternalServerErrorException
 	 */
 	public function getCurrentTheme()
 	{
@@ -1469,6 +1484,7 @@ class App
 	 * Provide a sane default if nothing is chosen or the specified theme does not exist.
 	 *
 	 * @return string
+	 * @throws InternalServerErrorException
 	 */
 	public function getCurrentThemeStylesheetPath()
 	{
@@ -1930,7 +1946,7 @@ class App
 	 * Should only be used if it isn't clear if the URL is either internal or external
 	 *
 	 * @param string $toUrl The target URL
-	 *
+	 * @throws InternalServerErrorException
 	 */
 	public function redirect($toUrl)
 	{

src/App/Mode.php

@@ -42,7 +42,7 @@ class Mode
 	 * - App::MODE_NORMAL     : Normal run with all features enabled
 	 *
 	 * @param string $basepath the Basepath of the Application
-	 *
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function determine($basepath = null)
 	{

src/BaseObject.php

@@ -23,6 +23,7 @@ class BaseObject
 	 * Same as get_app from boot.php
 	 *
 	 * @return App
+	 * @throws \Exception
 	 */
 	public static function getApp()
 	{

src/Content/ContactSelector.php

@@ -19,6 +19,8 @@ class ContactSelector
 	/**
 	 * @param string $current     current
 	 * @param string $foreign_net network
+	 * @return string
+	 * @throws \Exception
 	 */
 	public static function profileAssign($current, $foreign_net)
 	{
@@ -73,6 +75,7 @@ class ContactSelector
 	 * @param string $network network
 	 * @param string $profile optional, default empty
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function networkToName($network, $profile = "")
 	{
@@ -141,6 +144,7 @@ class ContactSelector
 	 * @param string $current optional, default empty
 	 * @param string $suffix  optionsl, default empty
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function gender($current = "", $suffix = "")
 	{
@@ -180,6 +184,7 @@ class ContactSelector
 	 * @param string $current optional, default empty
 	 * @param string $suffix  optionsl, default empty
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function sexualPreference($current = "", $suffix = "")
 	{
@@ -217,6 +222,7 @@ class ContactSelector
 	/**
 	 * @param string $current optional, default empty
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function maritalStatus($current = "")
 	{

src/Content/Feature.php

@@ -18,6 +18,7 @@ class Feature
 	 * @param integer $uid     user id
 	 * @param string  $feature feature
 	 * @return boolean
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function isEnabled($uid, $feature)
 	{
@@ -45,6 +46,7 @@ class Feature
 	 *
 	 * @param string $feature feature
 	 * @return boolean
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function getDefault($feature)
 	{
@@ -69,6 +71,7 @@ class Feature
 	 * @param bool $filtered True removes any locked features
 	 *
 	 * @return array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function get($filtered = true)
 	{

src/Content/ForumManager.php

@@ -34,6 +34,7 @@ class ForumManager
 	 *    'id'    => number of the key from the array
 	 *    'micro' => contact photo in format micro
 	 *    'thumb' => contact photo in format thumb
+	 * @throws \Exception
 	 */
 	public static function getList($uid, $lastitem, $showhidden = true, $showprivate = false)
 	{
@@ -88,6 +89,8 @@ class ForumManager
 	 * @param int $uid The ID of the User
 	 * @param int $cid The contact id which is used to mark a forum as "selected"
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function widget($uid, $cid = 0)
 	{
@@ -143,6 +146,8 @@ class ForumManager
 	 *
 	 * @param int $uid The ID of the User
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function profileAdvanced($uid)
 	{

src/Content/Nav.php

@@ -42,6 +42,8 @@ class Nav
 
 	/**
 	 * Set a menu item in navbar as selected
+	 *
+	 * @param string $item
 	 */
 	public static function setSelected($item)
 	{
@@ -50,6 +52,10 @@ class Nav
 
 	/**
 	 * Build page header and site navigation bars
+	 *
+	 * @param  App    $a
+	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function build(App $a)
 	{
@@ -120,6 +126,7 @@ class Nav
 	 *    array 'nav' => Array of links used in the nav menu
 	 *    string 'banner' => Formatted html link with banner image
 	 *    array 'userinfo' => Array of user information (name, icon)
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function getInfo(App $a)
 	{

src/Content/OEmbed.php

@@ -51,6 +51,7 @@ class OEmbed
 	 * @param bool   $no_rich_type If set to true rich type content won't be fetched.
 	 *
 	 * @return \Friendica\Object\OEmbed
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function fetchURL($embedurl, $no_rich_type = false)
 	{
@@ -260,6 +261,9 @@ class OEmbed
 	/**
 	 * Find <span class='oembed'>..<a href='url' rel='oembed'>..</a></span>
 	 * and replace it with [embed]url[/embed]
+	 *
+	 * @param $text
+	 * @return string
 	 */
 	public static function HTML2BBCode($text)
 	{
@@ -298,6 +302,7 @@ class OEmbed
 	 * @brief Determines if rich content OEmbed is allowed for the provided URL
 	 * @param string $url
 	 * @return boolean
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function isAllowedURL($url)
 	{
@@ -360,6 +365,7 @@ class OEmbed
 	 * @param string $height
 	 * @return string formatted HTML
 	 *
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @see   oembed_format_object()
 	 */
 	private static function iframe($src, $width, $height)

src/Content/Pager.php

@@ -65,7 +65,7 @@ class Pager
 	/**
 	 * Returns the current page number
 	 *
-	 * @return type
+	 * @return int
 	 */
 	public function getPage()
 	{
@@ -140,6 +140,7 @@ class Pager
 	 *
 	 * @param integer $itemCount The number of displayed items on the page
 	 * @return string HTML string of the pager
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function renderMinimal($itemCount)
 	{
@@ -182,6 +183,7 @@ class Pager
 	 *
 	 * @param integer $itemCount The total number of items including those note displayed on the page
 	 * @return string HTML string of the pager
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function renderFull($itemCount)
 	{

src/Content/Smilies.php

@@ -58,6 +58,7 @@ class Smilies
 	 *    'texts' => smilie shortcut
 	 *    'icons' => icon in html
 	 *
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @hook  smilie ('texts' => smilies texts array, 'icons' => smilies html array)
 	 */
 	public static function getList()
@@ -182,6 +183,7 @@ class Smilies
 	 * @param boolean $no_images Only replace emoticons without images
 	 *
 	 * @return string HTML Output of the Smilie
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function replace($s, $no_images = false)
 	{
@@ -201,6 +203,7 @@ class Smilies
 	 * @param array  $smilies   An string replacement array with the following structure: ['texts' => [], 'icons' => []]
 	 * @param bool   $no_images Only replace shortcodes without image replacement (e.g. Unicode characters)
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function replaceFromArray($text, array $smilies, $no_images = false)
 	{
@@ -248,6 +251,7 @@ class Smilies
 	 * @param string $m string
 	 *
 	 * @return string base64 decoded string
+	 * @throws \Exception
 	 */
 	private static function decode($m)
 	{
@@ -262,6 +266,7 @@ class Smilies
 	 *
 	 * @return string HTML Output
 	 *
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @todo  : Rework because it doesn't work correctly
 	 */
 	private static function pregHeart($x)

src/Content/Text/BBCode.php

@@ -44,6 +44,7 @@ class BBCode extends BaseObject
 	 *                     'url' -> Url to the attached message
 	 *                     'title' -> Title of the attachment
 	 *                     'description' -> Description of the attachment
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function getOldAttachmentData($body)
 	{
@@ -115,6 +116,7 @@ class BBCode extends BaseObject
 	 *                     'url' -> Url to the attached message
 	 *                     'title' -> Title of the attachment
 	 *                     'description' -> Description of the attachment
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getAttachmentData($body)
 	{
@@ -345,6 +347,7 @@ class BBCode extends BaseObject
 	/**
 	 * @brief Converts a BBCode text into plaintext
 	 *
+	 * @param      $text
 	 * @param bool $keep_urls Whether to keep URLs in the resulting plaintext
 	 *
 	 * @return string
@@ -446,6 +449,7 @@ class BBCode extends BaseObject
 	 * @brief Truncates imported message body string length to max_import_size
 	 * @param string $body
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function limitBodySize($body)
 	{
@@ -536,6 +540,7 @@ class BBCode extends BaseObject
 	 * @param bool|int $simplehtml
 	 * @param bool     $tryoembed
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function convertAttachment($return, $simplehtml = false, $tryoembed = true)
 	{
@@ -777,10 +782,10 @@ class BBCode extends BaseObject
 	/**
 	 * Performs a preg_replace within the boundaries of all named BBCode tags in a text
 	 *
-	 * @param type $pattern Preg pattern string
-	 * @param type $replace Preg replace string
-	 * @param type $name    BBCode tag name
-	 * @param type $text    Text to search
+	 * @param string $pattern Preg pattern string
+	 * @param string $replace Preg replace string
+	 * @param string $name    BBCode tag name
+	 * @param string $text    Text to search
 	 * @return string
 	 */
 	public static function pregReplaceInTag($pattern, $replace, $name, $text)
@@ -930,6 +935,7 @@ class BBCode extends BaseObject
 	 * @param boolean $is_quote_share Whether there is content before the [share] block
 	 * @param integer $simplehtml     Mysterious integer value depending on the target network/formatting style
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function convertShareCallback(array $attributes, array $author_contact, $content, $is_quote_share, $simplehtml)
 	{
@@ -1142,6 +1148,7 @@ class BBCode extends BaseObject
 	 * @param int    $simple_html
 	 * @param bool   $for_plaintext
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function convert($text, $try_oembed = true, $simple_html = false, $for_plaintext = false)
 	{
@@ -1813,6 +1820,8 @@ class BBCode extends BaseObject
 	 *                     [2] = Name
 	 *                     [3] = Address
 	 * @return string Replaced mention
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function bbCodeMention2DiasporaCallback($match)
 	{
@@ -1839,6 +1848,7 @@ class BBCode extends BaseObject
 	 * @param string $text
 	 * @param bool   $for_diaspora Diaspora requires more changes than Libertree
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function toMarkdown($text, $for_diaspora = true)
 	{

src/Content/Text/HTML.php

@@ -123,6 +123,7 @@ class HTML
 	 * @param string $message
 	 * @param string $basepath
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function toBBCode($message, $basepath = '')
 	{
@@ -713,6 +714,7 @@ class HTML
 	 * @brief Convert video HTML to BBCode tags
 	 *
 	 * @param string $s
+	 * @return string
 	 */
 	public static function toBBCodeVideo($s)
 	{
@@ -789,7 +791,9 @@ class HTML
 
 	/**
 	 * Loader for infinite scrolling
+	 *
 	 * @return string html for loader
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function scrollLoader()
 	{
@@ -806,6 +810,8 @@ class HTML
 	 * @template contact_block.tpl
 	 * @hook     contact_block_end (contacts=>array, output=>string)
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function contactBlock()
 	{
@@ -903,8 +909,9 @@ class HTML
 	 * @param string  $class    CSS class for the
 	 * @param boolean $textmode If true display the contacts as text links
 	 *                          if false display the contacts as picture links
-
 	 * @return string Formatted html
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function micropro($contact, $redirect = false, $class = '', $textmode = false)
 	{
@@ -947,10 +954,10 @@ class HTML
 	 * @param string $s     Search query.
 	 * @param string $id    HTML id
 	 * @param string $url   Search url.
-	 * @param bool   $save  Show save search button.
 	 * @param bool   $aside Display the search widgit aside.
 	 *
 	 * @return string Formatted HTML.
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function search($s, $id = 'search-box', $url = 'search', $aside = true)
 	{
@@ -990,6 +997,7 @@ class HTML
 	 * Replace naked text hyperlink with HTML formatted hyperlink
 	 *
 	 * @param string $s
+	 * @return string
 	 */
 	public static function toLink($s)
 	{
@@ -1006,6 +1014,7 @@ class HTML
 	 * @param string $html
 	 * @param array  $reasons
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function applyContentFilter($html, array $reasons)
 	{

src/Content/Text/Markdown.php

@@ -26,6 +26,7 @@ class Markdown extends BaseObject
 	 * @param string $text
 	 * @param bool   $hardwrap
 	 * @return string
+	 * @throws \Exception
 	 */
 	public static function convert($text, $hardwrap = true) {
 		$stamp1 = microtime(true);
@@ -48,6 +49,8 @@ class Markdown extends BaseObject
 	 *                     [2] = name (optional)
 	 *                     [3] = address
 	 * @return string Replaced mention
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function diasporaMention2BBCodeCallback($match)
 	{

src/Content/Text/Plaintext.php

@@ -9,9 +9,9 @@ class Plaintext
 	/**
 	 * Shortens message
 	 *
-	 * @param type $msg
-	 * @param type $limit
-	 * @return type
+	 * @param  string $msg
+	 * @param  int    $limit
+	 * @return string
 	 *
 	 * @todo For Twitter URLs aren't shortened, but they have to be calculated as if.
 	 */

src/Content/Widget.php

@@ -28,6 +28,8 @@ class Widget
 	 * Return the follow widget
 	 *
 	 * @param string $value optional, default empty
+	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function follow($value = "")
 	{
@@ -125,6 +127,8 @@ class Widget
 	 *
 	 * @param string $baseurl  baseurl
 	 * @param string $selected optional, default empty
+	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function networks($baseurl, $selected = '')
 	{
@@ -167,6 +171,8 @@ class Widget
 	 *
 	 * @param string $baseurl  baseurl
 	 * @param string $selected optional, default empty
+	 * @return string|void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function fileAs($baseurl, $selected = '')
 	{
@@ -205,6 +211,8 @@ class Widget
 	 *
 	 * @param string $baseurl  baseurl
 	 * @param string $selected optional, default empty
+	 * @return string|void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function categories($baseurl, $selected = '')
 	{
@@ -244,6 +252,8 @@ class Widget
 	 * Return common friends visitor widget
 	 *
 	 * @param string $profile_uid uid
+	 * @return string|void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function commonFriendsVisitor($profile_uid)
 	{
@@ -329,6 +339,8 @@ class Widget
 	 * @brief Insert a tag cloud widget for the present profile.
 	 * @param int $limit Max number of displayed tags.
 	 * @return string HTML formatted output.
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function tagCloud($limit = 50)
 	{

src/Content/Widget/CalendarExport.php

@@ -21,6 +21,7 @@ class CalendarExport
 	 * @brief Get the events widget.
 	 *
 	 * @return string Formated HTML of the calendar widget.
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getHTML() {
 		$a = \get_app();

src/Content/Widget/TagCloud.php

@@ -31,6 +31,7 @@ class TagCloud
 	 * @param int    $type     The tag/term type.
 	 *
 	 * @return string       HTML formatted output.
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getHTML($uid, $count = 0, $owner_id = 0, $flags = '', $type = TERM_HASHTAG)
 	{
@@ -69,7 +70,8 @@ class TagCloud
 	 * @param string $flags    Special item flags.
 	 * @param int    $type     The tag/term type.
 	 *
-	 * @return arr          Alphabetical sorted array of used tags of an user.
+	 * @return array        Alphabetical sorted array of used tags of an user.
+	 * @throws \Exception
 	 */
 	private static function tagadelic($uid, $count = 0, $owner_id = 0, $flags = '', $type = TERM_HASHTAG)
 	{
@@ -146,8 +148,8 @@ class TagCloud
 	 * Compare function to sort tags/terms alphabetically.
 	 *
 	 * @brief Compare function to sort tags/terms alphabetically.
-	 * @param type $a
-	 * @param type $b
+	 * @param string $a
+	 * @param string $b
 	 *
 	 * @return int
 	 */

src/Core/ACL.php

@@ -32,6 +32,7 @@ class ACL extends BaseObject
 	 *                            - exclude: Only used for the hook
 	 * @param array  $preselected Contact ID that should be already selected
 	 * @return string
+	 * @throws \Exception
 	 */
 	public static function getSuggestContactSelectHTML($selname, $selclass, array $options = [], array $preselected = [])
 	{
@@ -141,6 +142,7 @@ class ACL extends BaseObject
 	 * @param int    $size        Length of the select box
 	 * @param int    $tabindex    Select input tag tabindex attribute
 	 * @return string
+	 * @throws \Exception
 	 */
 	public static function getMessageContactSelectHTML($selname, $selclass, array $preselected = [], $size = 4, $tabindex = null)
 	{
@@ -215,6 +217,7 @@ class ACL extends BaseObject
 	 *
 	 * @param array $user
 	 * @return array Hash of contact id lists
+	 * @throws \Exception
 	 */
 	public static function getDefaultUserPermissions(array $user = null)
 	{
@@ -251,9 +254,10 @@ class ACL extends BaseObject
 	 * Return the full jot ACL selector HTML
 	 *
 	 * @param array $user                User array
-	 * @param array $default_permissions Static defaults permission array: ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '']
 	 * @param bool  $show_jotnets
+	 * @param array $default_permissions Static defaults permission array: ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '']
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getFullSelectorHTML(array $user, $show_jotnets = false, array $default_permissions = [])
 	{
@@ -320,6 +324,7 @@ class ACL extends BaseObject
 	 * @param string $search Name or part of a name or nick
 	 * @param string $mode   Search mode (e.g. "community")
 	 * @return array with the search results
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function contactAutocomplete($search, $mode)
 	{

src/Core/Addon.php

@@ -70,7 +70,8 @@ class Addon extends BaseObject
 	 * @brief uninstalls an addon.
 	 *
 	 * @param string $addon name of the addon
-	 * @return boolean
+	 * @return void
+	 * @throws \Exception
 	 */
 	public static function uninstall($addon)
 	{
@@ -91,6 +92,7 @@ class Addon extends BaseObject
 	 *
 	 * @param string $addon name of the addon
 	 * @return bool
+	 * @throws \Exception
 	 */
 	public static function install($addon)
 	{
@@ -190,6 +192,7 @@ class Addon extends BaseObject
 	 *   *\endcode
 	 * @param string $addon the name of the addon
 	 * @return array with the addon information
+	 * @throws \Exception
 	 */
 	public static function getInfo($addon)
 	{
@@ -269,6 +272,7 @@ class Addon extends BaseObject
 	 * Saves the current enabled addon list in the system.addon config key
 	 *
 	 * @return boolean
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function saveEnabledList()
 	{
@@ -279,6 +283,7 @@ class Addon extends BaseObject
 	 * Returns the list of non-hidden enabled addon names
 	 *
 	 * @return array
+	 * @throws \Exception
 	 */
 	public static function getVisibleList()
 	{
@@ -303,6 +308,7 @@ class Addon extends BaseObject
 	 * @param string $function the name of the function that the hook will call
 	 * @param int    $priority A priority (defaults to 0)
 	 * @return mixed|bool
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function registerHook($hook, $file, $function, $priority = 0)
 	{
@@ -318,6 +324,7 @@ class Addon extends BaseObject
 	 * @param string $file     the name of the file that hooks into
 	 * @param string $function the name of the function that the hook called
 	 * @return boolean
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function unregisterHook($hook, $file, $function)
 	{
@@ -331,6 +338,7 @@ class Addon extends BaseObject
 	 * @deprecated since version 2018.12
 	 * @param string        $name of the hook to call
 	 * @param string|array &$data to transmit to the callback handler
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function callHooks($name, &$data = null)
 	{

src/Core/Authentication.php

@@ -21,6 +21,7 @@ class Authentication extends BaseObject
 	 * @param array $user Record from "user" table
 	 *
 	 * @return string Hashed data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getCookieHashForUser($user)
 	{
@@ -34,6 +35,7 @@ class Authentication extends BaseObject
 	 *
 	 * @param int   $time
 	 * @param array $user Record from "user" table
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static  function setCookie($time, $user = [])
 	{
@@ -57,10 +59,11 @@ class Authentication extends BaseObject
 	 *
 	 * @todo  Should be moved to Friendica\Core\Session once it's created
 	 *
-	 * @param type $user_record
-	 * @param type $login_initial
-	 * @param type $interactive
-	 * @param type $login_refresh
+	 * @param array $user_record
+	 * @param bool  $login_initial
+	 * @param bool  $interactive
+	 * @param bool  $login_refresh
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function setAuthenticatedSessionForUser($user_record, $login_initial = false, $interactive = false, $login_refresh = false)
 	{

src/Core/Cache.php

@@ -55,6 +55,7 @@ class Cache extends \Friendica\BaseObject
 	 * @param string $prefix Prefix of the keys (optional)
 	 *
 	 * @return array Empty if the driver doesn't support this feature
+	 * @throws \Exception
 	 */
 	public static function getAllKeys($prefix = null)
 	{
@@ -73,6 +74,7 @@ class Cache extends \Friendica\BaseObject
 	 * @param string $key The key to the cached data
 	 *
 	 * @return mixed Cached $value or "null" if not found
+	 * @throws \Exception
 	 */
 	public static function get($key)
 	{
@@ -95,6 +97,7 @@ class Cache extends \Friendica\BaseObject
 	 * @param integer $duration The cache lifespan
 	 *
 	 * @return bool
+	 * @throws \Exception
 	 */
 	public static function set($key, $value, $duration = self::MONTH)
 	{
@@ -113,6 +116,7 @@ class Cache extends \Friendica\BaseObject
 	 * @param string $key The key to the cached data
 	 *
 	 * @return bool
+	 * @throws \Exception
 	 */
 	public static function delete($key)
 	{
@@ -130,7 +134,7 @@ class Cache extends \Friendica\BaseObject
 	 *
 	 * @param boolean $outdated just remove outdated values
 	 *
-	 * @return void
+	 * @return bool
 	 */
 	public static function clear($outdated = true)
 	{

src/Core/Cache/AbstractCacheDriver.php

@@ -16,6 +16,7 @@ abstract class AbstractCacheDriver extends BaseObject
 	/**
 	 * @param string $key The original key
 	 * @return string        The cache key used for the cache
+	 * @throws \Exception
 	 */
 	protected function getCacheKey($key)
 	{

src/Core/Config.php

@@ -22,7 +22,7 @@ use Friendica\Core\Config;
 class Config extends BaseObject
 {
 	/**
-	 * @var Friendica\Core\Config\IConfigAdapter
+	 * @var \Friendica\Core\Config\IConfigAdapter
 	 */
 	private static $adapter = null;
 
@@ -49,6 +49,7 @@ class Config extends BaseObject
 	 * @param string $family The category of the configuration value
 	 *
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function load($family = "config")
 	{
@@ -82,6 +83,7 @@ class Config extends BaseObject
 	 * @param boolean $refresh       optional, If true the config is loaded from the db and not from the cache (default: false)
 	 *
 	 * @return mixed Stored value or null if it does not exist
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function get($family, $key, $default_value = null, $refresh = false)
 	{
@@ -110,6 +112,7 @@ class Config extends BaseObject
 	 * @param mixed  $value  The value to store
 	 *
 	 * @return bool Operation success
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function set($family, $key, $value)
 	{
@@ -135,6 +138,7 @@ class Config extends BaseObject
 	 * @param string $key    The configuration key to delete
 	 *
 	 * @return mixed
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function delete($family, $key)
 	{

src/Core/Config/IConfigAdapter.php

@@ -49,8 +49,8 @@ interface IConfigAdapter
 	 *
 	 * Note: Please do not store booleans - convert to 0/1 integer values!
 	 *
-	 * @param string $family The category of the configuration value
-	 * @param string $key    The configuration key to set
+	 * @param string $cat   The category of the configuration value
+	 * @param string $k     The configuration key to set
 	 * @param mixed  $value The value to store
 	 *
 	 * @return bool Operation success

src/Core/Console/AutomaticInstallation.php

@@ -185,6 +185,7 @@ HELP;
 	 * @param Installer $installer the Installer instance
 	 *
 	 * @return bool true if checks were successfully, otherwise false
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private function runBasicChecks(Installer $installer)
 	{

src/Core/Console/PhpToPo.php

@@ -206,6 +206,9 @@ HELP;
 	 * - replace " with \"
 	 * - replace tab char with \t
 	 * - manage multiline strings
+	 *
+	 * @param string $str
+	 * @return string
 	 */
 	private function massageString($str)
 	{

src/Core/Hook.php

@@ -48,9 +48,9 @@ class Hook extends BaseObject
 	 *
 	 * This function is meant to be called by modules on each page load as it works after loadHooks has been called.
 	 *
-	 * @param type $hook
-	 * @param type $file
-	 * @param type $function
+	 * @param string $hook
+	 * @param string $file
+	 * @param string $function
 	 */
 	public static function add($hook, $file, $function)
 	{
@@ -70,6 +70,7 @@ class Hook extends BaseObject
 	 * @param string $function the name of the function that the hook will call
 	 * @param int    $priority A priority (defaults to 0)
 	 * @return mixed|bool
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function register($hook, $file, $function, $priority = 0)
 	{
@@ -92,6 +93,7 @@ class Hook extends BaseObject
 	 * @param string $file     the name of the file that hooks into
 	 * @param string $function the name of the function that the hook called
 	 * @return boolean
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function unregister($hook, $file, $function)
 	{
@@ -131,6 +133,7 @@ class Hook extends BaseObject
 	 * @param integer $priority of the hook
 	 * @param string  $name     of the hook to call
 	 * @param mixed   $data     to transmit to the callback handler
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function fork($priority, $name, $data = null)
 	{
@@ -165,6 +168,7 @@ class Hook extends BaseObject
 	 *
 	 * @param string        $name of the hook to call
 	 * @param string|array &$data to transmit to the callback handler
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function callAll($name, &$data = null)
 	{
@@ -182,6 +186,7 @@ class Hook extends BaseObject
 	 * @param string          $name of the hook to call
 	 * @param array           $hook Hook data
 	 * @param string|array   &$data to transmit to the callback handler
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function callSingle(App $a, $name, $hook, &$data = null)
 	{

src/Core/Installer.php

@@ -47,6 +47,7 @@ class Installer
 	 * Returns the PHP path
 	 *
 	 * @return string the PHP Path
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function getPHPPath()
 	{
@@ -83,6 +84,7 @@ class Installer
 	 * @param string $phpath  Optional path to the PHP binary
 	 *
 	 * @return bool if the check succeed
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function checkEnvironment($baseurl, $phpath = null)
 	{
@@ -138,6 +140,7 @@ class Installer
 	 * @param string $basepath  The basepath of Friendica
 	 *
 	 * @return bool true if the config was created, otherwise false
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function createConfig($phppath, $urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $timezone, $language, $adminmail, $basepath)
 	{
@@ -167,6 +170,7 @@ class Installer
 	 * Installs the DB-Scheme for Friendica
 	 *
 	 * @return bool true if the installation was successful, otherwise false
+	 * @throws Exception
 	 */
 	public function installDatabase()
 	{
@@ -217,6 +221,7 @@ class Installer
 	 * @param bool   $required Optional. If set to true, the PHP-Binary has to exist (Default false)
 	 *
 	 * @return bool false if something required failed
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function checkPHP($phppath = null, $required = false)
 	{
@@ -509,6 +514,7 @@ class Installer
 	 *
 	 * @param string $baseurl The baseurl of the app
 	 * @return bool false if something required failed
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function checkHtAccess($baseurl)
 	{
@@ -582,6 +588,7 @@ class Installer
 	 * @param string $dbdata Name of the Database
 	 *
 	 * @return bool true if the check was successful, otherwise false
+	 * @throws Exception
 	 */
 	public function checkDB($dbhost, $dbuser, $dbpass, $dbdata)
 	{

src/Core/L10n.php

@@ -90,6 +90,7 @@ class L10n extends BaseObject
 	/**
 	 * @brief Returns the preferred language from the HTTP_ACCEPT_LANGUAGE header
 	 * @return string The two-letter language code
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function detectLanguage()
 	{
@@ -144,6 +145,7 @@ class L10n extends BaseObject
 	 * @see   popLang()
 	 * @brief Stores the current language strings and load a different language.
 	 * @param string $lang Language code
+	 * @throws \Exception
 	 */
 	public static function pushLang($lang)
 	{
@@ -187,6 +189,7 @@ class L10n extends BaseObject
 	 * Uses an App object shim since all the strings files refer to $a->strings
 	 *
 	 * @param string $lang language code to load
+	 * @throws \Exception
 	 */
 	private static function loadTranslationTable($lang)
 	{
@@ -271,6 +274,7 @@ class L10n extends BaseObject
 	 * @param string $plural
 	 * @param int    $count
 	 * @return string
+	 * @throws \Exception
 	 */
 	public static function tt($singular, $plural, $count)
 	{
@@ -314,6 +318,9 @@ class L10n extends BaseObject
 
 	/**
 	 * Provide a fallback which will not collide with a function defined in any language file
+	 *
+	 * @param int $n
+	 * @return bool
 	 */
 	private static function stringPluralSelectDefault($n)
 	{
@@ -392,6 +399,7 @@ class L10n extends BaseObject
 	 *
 	 * @return array index is present tense verb
 	 *                 value is array containing past tense verb, translation of present, translation of past
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @hook poke_verbs pokes array
 	 */
 	public static function getPokeVerbs()

src/Core/Logger.php

@@ -140,13 +140,14 @@ class Logger extends BaseObject
 
 	/**
 	 * System is unusable.
+	 *
 	 * @see LoggerInterface::emergency()
 	 *
 	 * @param string $message
 	 * @param array  $context
 	 *
 	 * @return void
-	 *
+	 * @throws \Exception
 	 */
 	public static function emergency($message, $context = [])
 	{
@@ -170,7 +171,7 @@ class Logger extends BaseObject
 	 * @param array  $context
 	 *
 	 * @return void
-	 *
+	 * @throws \Exception
 	 */
 	public static function alert($message, $context = [])
 	{
@@ -193,7 +194,7 @@ class Logger extends BaseObject
 	 * @param array  $context
 	 *
 	 * @return void
-	 *
+	 * @throws \Exception
 	 */
 	public static function critical($message, $context = [])
 	{
@@ -215,7 +216,7 @@ class Logger extends BaseObject
 	 * @param array  $context
 	 *
 	 * @return void
-	 *
+	 * @throws \Exception
 	 */
 	public static function error($message, $context = [])
 	{
@@ -240,7 +241,7 @@ class Logger extends BaseObject
 	 * @param array  $context
 	 *
 	 * @return void
-	 *
+	 * @throws \Exception
 	 */
 	public static function warning($message, $context = [])
 	{
@@ -261,7 +262,7 @@ class Logger extends BaseObject
 	 * @param array  $context
 	 *
 	 * @return void
-	 *
+	 * @throws \Exception
 	 */
 	public static function notice($message, $context = [])
 	{
@@ -284,7 +285,7 @@ class Logger extends BaseObject
 	 * @param array  $context
 	 *
 	 * @return void
-	 *
+	 * @throws \Exception
 	 */
 	public static function info($message, $context = [])
 	{
@@ -305,6 +306,7 @@ class Logger extends BaseObject
 	 * @param array  $context
 	 *
 	 * @return void
+	 * @throws \Exception
 	 */
 	public static function debug($message, $context = [])
 	{
@@ -321,8 +323,9 @@ class Logger extends BaseObject
 	 * @brief      Logs the given message at the given log level
 	 *
 	 * @param string $msg
-     * @param int $level
+	 * @param string $level
 	 *
+	 * @throws \Exception
 	 * @deprecated since 2019.03 Use Logger::debug() Logger::info() , ... instead
 	 */
     public static function log($msg, $level = LogLevel::NOTICE)
@@ -344,6 +347,7 @@ class Logger extends BaseObject
 	 *
 	 * @param string $msg
 	 * @param string $level
+	 * @throws \Exception
 	 */
     public static function devLog($msg, $level = LogLevel::DEBUG)
     {

src/Core/NotificationsManager.php

@@ -36,6 +36,7 @@ class NotificationsManager extends BaseObject
 	 *  - date_rel : relative date string
 	 *  - msg_html: message as html string
 	 *  - msg_plain: message as plain text string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private function _set_extra($notes)
 	{
@@ -61,6 +62,7 @@ class NotificationsManager extends BaseObject
 	 * @param string $limit  optional Query limits
 	 *
 	 * @return array of results or false on errors
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function getAll($filter = [], $order = "-date", $limit = "")
 	{
@@ -109,6 +111,7 @@ class NotificationsManager extends BaseObject
 	 *
 	 * @param int $id identity
 	 * @return array note values or null if not found
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function getByID($id)
 	{
@@ -161,6 +164,7 @@ class NotificationsManager extends BaseObject
 	 * @brief List of pages for the Notifications TabBar
 	 *
 	 * @return array with with notifications TabBar data
+	 * @throws \Exception
 	 */
 	public function getTabs()
 	{
@@ -221,6 +225,7 @@ class NotificationsManager extends BaseObject
 	 *                       string 'when' => The date of the notification
 	 *                       string 'ago' => T relative date of the notification
 	 *                       bool 'seen' => Is the notification marked as "seen"
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private function formatNotifs(array $notifs, $ident = "")
 	{
@@ -406,6 +411,7 @@ class NotificationsManager extends BaseObject
 	 * @return array with
 	 *    string 'ident' => Notification identifier
 	 *    array 'notifications' => Network notifications
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function networkNotifs($seen = 0, $start = 0, $limit = 80)
 	{
@@ -447,6 +453,7 @@ class NotificationsManager extends BaseObject
 	 * @return array with
 	 *    string 'ident' => Notification identifier
 	 *    array 'notifications' => System notifications
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function systemNotifs($seen = 0, $start = 0, $limit = 80)
 	{
@@ -489,6 +496,7 @@ class NotificationsManager extends BaseObject
 	 * @return array with
 	 *    string 'ident' => Notification identifier
 	 *    array 'notifications' => Personal notifications
+	 * @throws \Exception
 	 */
 	public function personalNotifs($seen = 0, $start = 0, $limit = 80)
 	{
@@ -534,6 +542,7 @@ class NotificationsManager extends BaseObject
 	 * @return array with
 	 *    string 'ident' => Notification identifier
 	 *    array 'notifications' => Home notifications
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function homeNotifs($seen = 0, $start = 0, $limit = 80)
 	{
@@ -574,6 +583,8 @@ class NotificationsManager extends BaseObject
 	 * @return array with
 	 *    string 'ident' => Notification identifier
 	 *    array 'notifications' => Introductions
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public function introNotifs($all = false, $start = 0, $limit = 80)
 	{
@@ -620,6 +631,8 @@ class NotificationsManager extends BaseObject
 	 *
 	 * @param array $intros The array from the db query
 	 * @return array with the introductions
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private function formatIntros($intros)
 	{
@@ -703,6 +716,7 @@ class NotificationsManager extends BaseObject
 	 * @param array $arr The input array with the intro data
 	 *
 	 * @return array The array with the intro data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private function getMissingIntroData($arr)
 	{

src/Core/PConfig.php

@@ -21,7 +21,7 @@ use Friendica\BaseObject;
 class PConfig extends BaseObject
 {
 	/**
-	 * @var Friendica\Core\Config\IPConfigAdapter
+	 * @var \Friendica\Core\Config\IPConfigAdapter
 	 */
 	private static $adapter = null;
 
@@ -51,6 +51,7 @@ class PConfig extends BaseObject
 	 * @param string $family The category of the configuration value
 	 *
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function load($uid, $family)
 	{
@@ -80,6 +81,7 @@ class PConfig extends BaseObject
 	 * @param boolean $refresh       optional, If true the config is loaded from the db and not from the cache (default: false)
 	 *
 	 * @return mixed Stored value or null if it does not exist
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function get($uid, $family, $key, $default_value = null, $refresh = false)
 	{
@@ -109,6 +111,7 @@ class PConfig extends BaseObject
 	 * @param string $value  The value to store
 	 *
 	 * @return bool Operation success
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function set($uid, $family, $key, $value)
 	{
@@ -135,6 +138,7 @@ class PConfig extends BaseObject
 	 * @param string $key    The configuration key to delete
 	 *
 	 * @return mixed
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function delete($uid, $family, $key)
 	{

src/Core/Protocol.php

@@ -50,7 +50,7 @@ class Protocol
 	 *
 	 * @param string $profile_url
 	 * @return string
-	 * @throws Exception
+	 * @throws \Exception
 	 */
 	public static function getAddrFromProfileUrl($profile_url)
 	{
@@ -70,7 +70,8 @@ class Protocol
 	 *
 	 * @param string $profile_url
 	 * @param array  $matches preg_match return array: [0] => Full match [1] => hostname [2] => username
-	 * @return type
+	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function matchByProfileUrl($profile_url, &$matches = [])
 	{
@@ -131,6 +132,7 @@ class Protocol
 	 * @param string $profile_url
 	 * @param string $display_name
 	 * @return string
+	 * @throws \Exception
 	 */
 	public static function formatMention($profile_url, $display_name)
 	{

src/Core/Renderer.php

@@ -56,6 +56,7 @@ class Renderer extends BaseObject
 	 * @param array                  $vars key value pairs (search => replace)
 	 *
 	 * @return string substituted string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
     public static function replaceMacros($s, $vars)
     {
@@ -85,6 +86,7 @@ class Renderer extends BaseObject
 	 * @param string $root Optional.
 	 *
 	 * @return string template.
+	 * @throws Exception
 	 */
     public static function getMarkupTemplate($s, $root = '')
     {

src/Core/Session/CacheSessionHandler.php

@@ -45,6 +45,7 @@ class CacheSessionHandler extends BaseObject implements SessionHandlerInterface
 	 * @param  string $session_id   Session ID with format: [a-z0-9]{26}
 	 * @param  string $session_data Serialized session data
 	 * @return boolean Returns false if parameters are missing, true otherwise
+	 * @throws \Exception
 	 */
 	public function write($session_id, $session_data)
 	{

src/Core/Session/DatabaseSessionHandler.php

@@ -46,6 +46,7 @@ class DatabaseSessionHandler extends BaseObject implements SessionHandlerInterfa
 	 * @param  string $session_id   Session ID with format: [a-z0-9]{26}
 	 * @param  string $session_data Serialized session data
 	 * @return boolean Returns false if parameters are missing, true otherwise
+	 * @throws \Exception
 	 */
 	public function write($session_id, $session_data)
 	{

src/Core/StorageManager.php

@@ -33,6 +33,7 @@ class StorageManager
 	/**
 	 * @brief Return current storage backend class
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getBackend()
 	{
@@ -55,6 +56,7 @@ class StorageManager
 	 * @brief Set current storage backend class
 	 *
 	 * @param string $class Backend class name
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function setBackend($class)
 	{
@@ -74,12 +76,12 @@ class StorageManager
 	}
 
 
-
 	/**
 	 * @brief Register a storage backend class
 	 *
 	 * @param string $name  User readable backend name
 	 * @param string $class Backend class name
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function register($name, $class)
 	{
@@ -94,6 +96,7 @@ class StorageManager
 	 * @brief Unregister a storage backend class
 	 *
 	 * @param string $name User readable backend name
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function unregister($name)
 	{
@@ -112,7 +115,8 @@ class StorageManager
 	 * @param string  $dest    Destination storage class name
 	 * @param array   $tables  Tables to look in for resources. Optional, defaults to ['photo', 'attach']
 	 *
-	 * @retur int Number of moved resources
+	 * @throws \Exception
+	 * @return int Number of moved resources
 	 */
 	public static function move($dest, $tables = null)
 	{

src/Core/System.php

@@ -27,6 +27,7 @@ class System extends BaseObject
 	 *
 	 * @param bool $ssl Whether to append http or https under SSL_POLICY_SELFSIGN
 	 * @return string Friendica server base URL
+	 * @throws InternalServerErrorException
 	 */
 	public static function baseUrl($ssl = false)
 	{
@@ -39,6 +40,7 @@ class System extends BaseObject
 	 * @param string $orig_url The url to be cleaned
 	 *
 	 * @return string The cleaned url
+	 * @throws \Exception
 	 */
 	public static function removedBaseUrl($orig_url)
 	{
@@ -92,6 +94,10 @@ class System extends BaseObject
 	 * Generic XML return
 	 * Outputs a basic dfrn XML status structure to STDOUT, with a <status> variable
 	 * of $st and an optional text <message> of $message and terminates the current process.
+	 *
+	 * @param        $st
+	 * @param string $message
+	 * @throws \Exception
 	 */
 	public static function xmlExit($st, $message = '')
 	{
@@ -121,6 +127,7 @@ class System extends BaseObject
 	 * @param array   $description optional message
 	 *                             'title' => header title
 	 *                             'description' => optional message
+	 * @throws InternalServerErrorException
 	 */
 	public static function httpExit($val, $description = [])
 	{
@@ -193,6 +200,7 @@ class System extends BaseObject
 	 *
 	 * @param bool|string $prefix A given prefix (default is empty)
 	 * @return string a generated UUID
+	 * @throws \Exception
 	 */
 	public static function createUUID($prefix = '')
 	{
@@ -206,6 +214,7 @@ class System extends BaseObject
 	 * @param int         $size   The size of the GUID (default is 16)
 	 * @param bool|string $prefix A given prefix (default is empty)
 	 * @return string a generated GUID
+	 * @throws \Exception
 	 */
 	public static function createGUID($size = 16, $prefix = '')
 	{

src/Core/Theme.php

@@ -90,8 +90,9 @@ class Theme
 	 *
 	 * The screenshot is expected as view/theme/$theme/screenshot.[png|jpg].
 	 *
-	 * @param sring $theme The name of the theme
+	 * @param string $theme The name of the theme
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getScreenshot($theme)
 	{
@@ -148,6 +149,7 @@ class Theme
 	 * @param string $file Filename
 	 * @param string $root Full root path
 	 * @return string Path to the file or empty string if the file isn't found
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getPathForFile($file, $root = '')
 	{

src/Core/Update.php

@@ -15,6 +15,7 @@ class Update
 	 * @brief Function to check if the Database structure needs an update.
 	 *
 	 * @param boolean $via_worker boolean Is the check run via the worker?
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function check($via_worker)
 	{
@@ -50,6 +51,7 @@ class Update
 	 * @param bool $sendMail Sends a Mail to the administrator in case of success/failure
 	 *
 	 * @return string Empty string if the update is successful, error messages otherwise
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function run($force = false, $verbose = false, $sendMail = true)
 	{
@@ -136,6 +138,7 @@ class Update
 	 * @param string $prefix the prefix of the function (update, pre_update)
 	 *
 	 * @return bool true, if the update function worked
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function runUpdateFunction($x, $prefix)
 	{
@@ -197,6 +200,7 @@ class Update
 	 *
 	 * @param int    $update_id     number of failed update
 	 * @param string $error_message error message
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function updateFailed($update_id, $error_message) {
 		//send the administrators an e-mail

src/Core/UserImport.php

@@ -34,6 +34,7 @@ class UserImport
 	 *
 	 * @param string $table Table name
 	 * @param array &$arr   Column=>Value array from json (by ref)
+	 * @throws \Exception
 	 */
 	private static function checkCols($table, &$arr)
 	{
@@ -58,6 +59,8 @@ class UserImport
 	 *
 	 * @param string $table Table name
 	 * @param array  $arr   Column=>Value array from json
+	 * @return array|bool
+	 * @throws \Exception
 	 */
 	private static function dbImportAssoc($table, $arr)
 	{
@@ -83,6 +86,8 @@ class UserImport
 	 *
 	 * @param App   $a    Friendica App Class
 	 * @param array $file array from $_FILES
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function importAccount(App $a, $file)
 	{

src/Core/Worker.php

@@ -31,6 +31,7 @@ class Worker
 	 *
 	 * @param boolean $run_cron Should the cron processes be executed?
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function processQueue($run_cron = true)
 	{
@@ -148,6 +149,7 @@ class Worker
 	 * @brief Returns the number of deferred entries in the worker queue
 	 *
 	 * @return integer Number of deferred entries in the worker queue
+	 * @throws \Exception
 	 */
 	private static function deferredEntries()
 	{
@@ -159,6 +161,7 @@ class Worker
 	 * @brief Returns the number of non executed entries in the worker queue
 	 *
 	 * @return integer Number of non executed entries in the worker queue
+	 * @throws \Exception
 	 */
 	private static function totalEntries()
 	{
@@ -170,6 +173,7 @@ class Worker
 	 * @brief Returns the highest priority in the worker queue that isn't executed
 	 *
 	 * @return integer Number of active worker processes
+	 * @throws \Exception
 	 */
 	private static function highestPriority()
 	{
@@ -188,6 +192,7 @@ class Worker
 	 * @param integer $priority The priority that should be checked
 	 *
 	 * @return integer Is there a process running with that priority?
+	 * @throws \Exception
 	 */
 	private static function processWithPriorityActive($priority)
 	{
@@ -202,6 +207,7 @@ class Worker
 	 * @param array $queue Workerqueue entry
 	 *
 	 * @return boolean "true" if further processing should be stopped
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function execute($queue)
 	{
@@ -315,6 +321,7 @@ class Worker
 	 * @param array   $argv        Array of values to be passed to the function
 	 * @param boolean $method_call boolean
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function execFunction($queue, $funcname, $argv, $method_call)
 	{
@@ -481,6 +488,7 @@ class Worker
 	 * @brief Checks if the number of database connections has reached a critical limit.
 	 *
 	 * @return bool Are more than 3/4 of the maximum connections used?
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function maxConnectionsReached()
 	{
@@ -558,6 +566,7 @@ class Worker
 	/**
 	 * @brief fix the queue entry if the worker process died
 	 * @return void
+	 * @throws \Exception
 	 */
 	private static function killStaleWorkers()
 	{
@@ -622,6 +631,7 @@ class Worker
 	 * @brief Checks if the number of active workers exceeds the given limits
 	 *
 	 * @return bool Are there too much workers running?
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function tooMuchWorkers()
 	{
@@ -726,6 +736,7 @@ class Worker
 	 * @brief Returns the number of active worker processes
 	 *
 	 * @return integer Number of active worker processes
+	 * @throws \Exception
 	 */
 	private static function activeWorkers()
 	{
@@ -740,6 +751,7 @@ class Worker
 	 *
 	 * @param string $highest_priority Returns the currently highest priority
 	 * @return bool We let pass a slower process than $highest_priority
+	 * @throws \Exception
 	 */
 	private static function passingSlow(&$highest_priority)
 	{
@@ -792,6 +804,7 @@ class Worker
 	 *
 	 * @param boolean $passing_slow Returns if we had passed low priority processes
 	 * @return boolean Have we found something?
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function findWorkerProcesses(&$passing_slow)
 	{
@@ -886,6 +899,7 @@ class Worker
 	 *
 	 * @param boolean $passing_slow Returns if we had passed low priority processes
 	 * @return string SQL statement
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function workerProcess(&$passing_slow)
 	{
@@ -921,6 +935,7 @@ class Worker
 	/**
 	 * @brief Removes a workerqueue entry from the current process
 	 * @return void
+	 * @throws \Exception
 	 */
 	public static function unclaimProcess()
 	{
@@ -932,6 +947,7 @@ class Worker
 	/**
 	 * @brief Call the front end worker
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function callWorker()
 	{
@@ -946,6 +962,7 @@ class Worker
 	/**
 	 * @brief Call the front end worker if there aren't any active
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function executeIfIdle()
 	{
@@ -996,6 +1013,7 @@ class Worker
 	/**
 	 * @brief Removes long running worker processes
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function clearProcesses()
 	{
@@ -1010,6 +1028,7 @@ class Worker
 	/**
 	 * @brief Runs the cron processes
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function runCron()
 	{
@@ -1027,7 +1046,9 @@ class Worker
 
 	/**
 	 * @brief Spawns a new worker
+	 * @param bool $do_cron
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function spawnWorker($do_cron = false)
 	{
@@ -1052,12 +1073,13 @@ class Worker
 	 * or: Worker::add(PRIORITY_HIGH, "Notifier", "drop", $drop_id);
 	 * or: Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), "CreateShadowEntry", $post_id);
 	 *
+	 * @return boolean "false" if proc_run couldn't be executed
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @note $cmd and string args are surrounded with ""
 	 *
 	 * @hooks 'proc_run'
 	 *    array $arr
 	 *
-	 * @return boolean "false" if proc_run couldn't be executed
 	 */
 	public static function add($cmd)
 	{
@@ -1186,6 +1208,7 @@ class Worker
 	 *
 	 * @brief Remove the active process from the "process" table
 	 * @return bool
+	 * @throws \Exception
 	 */
 	public static function endProcess()
 	{
@@ -1197,6 +1220,7 @@ class Worker
 	 *
 	 * @brief Set the flag if some job is waiting
 	 * @param boolean $jobs Is there a waiting job?
+	 * @throws \Exception
 	 */
 	public static function IPCSetJobState($jobs)
 	{
@@ -1208,6 +1232,7 @@ class Worker
 	 *
 	 * @brief Checks if some worker job waits to be executed
 	 * @return bool
+	 * @throws \Exception
 	 */
 	public static function IPCJobsExists()
 	{

src/Database/DBA.php

@@ -195,6 +195,7 @@ class DBA
 	 * @brief Returns the selected database name
 	 *
 	 * @return string
+	 * @throws \Exception
 	 */
 	public static function databaseName() {
 		$ret = self::p("SELECT DATABASE() AS `db`");
@@ -206,6 +207,7 @@ class DBA
 	 * @brief Analyze a database query and log this if some conditions are met.
 	 *
 	 * @param string $query The database query that will be analyzed
+	 * @throws \Exception
 	 */
 	private static function logIndex($query) {
 		$a = \get_app();
@@ -386,6 +388,7 @@ class DBA
 	 *
 	 * @param string $sql SQL statement
 	 * @return bool|object statement object or result object
+	 * @throws \Exception
 	 */
 	public static function p($sql) {
 		$a = \get_app();
@@ -604,6 +607,7 @@ class DBA
 	 *
 	 * @param string $sql SQL statement
 	 * @return boolean Was the query successfull? False is returned only if an error occurred
+	 * @throws \Exception
 	 */
 	public static function e($sql) {
 		$a = \get_app();
@@ -661,6 +665,7 @@ class DBA
 	 * @param array  $condition array of fields for condition
 	 *
 	 * @return boolean Are there rows for that condition?
+	 * @throws \Exception
 	 */
 	public static function exists($table, $condition) {
 		if (empty($table)) {
@@ -700,6 +705,7 @@ class DBA
 	 * @brief Fetches the first row
 	 * @param string $sql SQL statement
 	 * @return array first row of query
+	 * @throws \Exception
 	 */
 	public static function fetchFirst($sql) {
 		$params = self::getParam(func_get_args());
@@ -830,6 +836,7 @@ class DBA
 	 * @param bool   $on_duplicate_update Do an update on a duplicate entry
 	 *
 	 * @return boolean was the insert successful?
+	 * @throws \Exception
 	 */
 	public static function insert($table, $param, $on_duplicate_update = false) {
 
@@ -876,6 +883,7 @@ class DBA
 	 * @param string $table Table name
 	 *
 	 * @return boolean was the lock successful?
+	 * @throws \Exception
 	 */
 	public static function lock($table) {
 		// See here: https://dev.mysql.com/doc/refman/5.7/en/lock-tables-and-transactions.html
@@ -908,6 +916,7 @@ class DBA
 	 * @brief Unlocks all locked tables
 	 *
 	 * @return boolean was the unlock successful?
+	 * @throws \Exception
 	 */
 	public static function unlock() {
 		// See here: https://dev.mysql.com/doc/refman/5.7/en/lock-tables-and-transactions.html
@@ -1045,6 +1054,7 @@ class DBA
 	 * @param array  $callstack  Internal use: prevent endless loops
 	 *
 	 * @return boolean was the delete successful?
+	 * @throws \Exception
 	 */
 	public static function delete($table, array $conditions, array $options = [], array &$callstack = [])
 	{
@@ -1209,6 +1219,7 @@ class DBA
 	 * @param array|boolean $old_fields array with the old field values that are about to be replaced (true = update on duplicate)
 	 *
 	 * @return boolean was the update successfull?
+	 * @throws \Exception
 	 */
 	public static function update($table, $fields, $condition, $old_fields = []) {
 
@@ -1270,6 +1281,7 @@ class DBA
 	 * @param array  $condition
 	 * @param array  $params
 	 * @return bool|array
+	 * @throws \Exception
 	 * @see   self::select
 	 */
 	public static function selectFirst($table, array $fields = [], array $condition = [], $params = [])
@@ -1307,6 +1319,7 @@ class DBA
 	 * $params = array("order" => array("id", "received" => true), "limit" => 10);
 	 *
 	 * $data = DBA::select($table, $fields, $condition, $params);
+	 * @throws \Exception
 	 */
 	public static function select($table, array $fields = [], array $condition = [], array $params = [])
 	{
@@ -1349,6 +1362,7 @@ class DBA
 	 * $condition = ["`uid` = ? AND `network` IN (?, ?)", 1, 'dfrn', 'dspr'];
 	 *
 	 * $count = DBA::count($table, $condition);
+	 * @throws \Exception
 	 */
 	public static function count($table, array $condition = [])
 	{
@@ -1476,6 +1490,7 @@ class DBA
 	 * @brief Fills an array with data from a query
 	 *
 	 * @param object $stmt statement object
+	 * @param bool   $do_close
 	 * @return array Data array
 	 */
 	public static function toArray($stmt, $do_close = true) {
@@ -1557,6 +1572,7 @@ class DBA
 	 * @return array
 	 *      'list' => List of processes, separated in their different states
 	 *      'amount' => Number of concurrent database processes
+	 * @throws \Exception
 	 */
 	public static function processlist()
 	{

src/Database/DBStructure.php

@@ -251,6 +251,7 @@ class DBStructure
 	 * @param array $tables     An array of the database tables
 	 * @param array $definition An array of the definition tables
 	 * @return string Empty string if the update is successful, error messages otherwise
+	 * @throws Exception
 	 */
 	public static function update($verbose, $action, $install = false, array $tables = null, array $definition = null)
 	{
@@ -715,7 +716,7 @@ class DBStructure
 	 * @param int    $type             The type of renaming (Default is Column)
 	 *
 	 * @return boolean Was the renaming successful?
-	 *
+	 * @throws Exception
 	 */
 	public static function rename($table, $columns, $type = self::RENAME_COLUMN)
 	{
@@ -775,6 +776,7 @@ class DBStructure
 	 * @param array  $columns Columns to check ( Syntax: [ $col1, $col2, .. ] )
 	 *
 	 * @return boolean Does the table exist?
+	 * @throws Exception
 	 */
 	public static function existsColumn($table, $columns = [])
 	{
@@ -815,6 +817,7 @@ class DBStructure
 	 * @param string $table Table name
 	 *
 	 * @return boolean Does the table exist?
+	 * @throws Exception
 	 */
 	public static function existsTable($table)
 	{

src/Database/PostUpdate.php

@@ -43,6 +43,7 @@ class PostUpdate
 	 * @brief Updates the "global" field in the item table
 	 *
 	 * @return bool "true" when the job is done
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function update1194()
 	{
@@ -113,6 +114,7 @@ class PostUpdate
 	 * This field avoids cost intensive calls in the admin panel and in "nodeinfo"
 	 *
 	 * @return bool "true" when the job is done
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function update1206()
 	{
@@ -145,6 +147,8 @@ class PostUpdate
 	 * @brief update the item related tables
 	 *
 	 * @return bool "true" when the job is done
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function update1279()
 	{
@@ -295,6 +299,7 @@ class PostUpdate
 	 * @brief update item-uri data. Prerequisite for the next item structure update.
 	 *
 	 * @return bool "true" when the job is done
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function update1281()
 	{

src/LegacyModule.php

@@ -22,6 +22,7 @@ class LegacyModule extends BaseModule
 	 * The only method that needs to be called, with the module/addon file name.
 	 *
 	 * @param string $file_path
+	 * @throws \Exception
 	 */
 	public static function setModuleFile($file_path)
 	{
@@ -59,6 +60,7 @@ class LegacyModule extends BaseModule
 	 *
 	 * @param string $function_suffix
 	 * @return string
+	 * @throws \Exception
 	 */
 	private static function runModuleFunction($function_suffix)
 	{

src/Model/APContact.php

@@ -23,6 +23,7 @@ class APContact extends BaseObject
 	 *
 	 * @param string $addr profile address (user@domain.tld)
 	 * @return string url
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function addrToUrl($addr)
 	{
@@ -63,6 +64,8 @@ class APContact extends BaseObject
 	 * @param string  $url    profile url
 	 * @param boolean $update true = always update, false = never update, null = update when not found or outdated
 	 * @return array profile array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function getByURL($url, $update = null)
 	{

src/Model/Attach.php

@@ -25,6 +25,7 @@ class Attach extends BaseObject
 	 * @brief Return a list of fields that are associated with the attach table
 	 *
 	 * @return array field list
+	 * @throws \Exception
 	 */
 	private static function getFields()
 	{
@@ -43,6 +44,7 @@ class Attach extends BaseObject
 	 *
 	 * @return boolean|array
 	 *
+	 * @throws \Exception
 	 * @see   \Friendica\Database\DBA::select
 	 */
 	public static function select(array $fields = [], array $conditions = [], array $params = [])
@@ -64,6 +66,7 @@ class Attach extends BaseObject
 	 *
 	 * @return bool|array
 	 *
+	 * @throws \Exception
 	 * @see   \Friendica\Database\DBA::select
 	 */
 	public static function selectFirst(array $fields = [], array $conditions = [], array $params = [])
@@ -81,6 +84,7 @@ class Attach extends BaseObject
 	 * @param array $conditions Array of extra conditions
 	 *
 	 * @return boolean
+	 * @throws \Exception
 	 */
 	public static function exists(array $conditions)
 	{
@@ -94,6 +98,7 @@ class Attach extends BaseObject
 	 *
 	 * @return bool|array
 	 *
+	 * @throws \Exception
 	 * @see   \Friendica\Database\DBA::select
 	 */
 	public static function getById($id)
@@ -108,6 +113,7 @@ class Attach extends BaseObject
 	 *
 	 * @return bool|array
 	 *
+	 * @throws \Exception
 	 * @see   \Friendica\Database\DBA::select
 	 */
 	public static function getByIdWithPermission($id)
@@ -135,6 +141,7 @@ class Attach extends BaseObject
 	 * @param array $item Attachment data. Needs at least 'id', 'backend-class', 'backend-ref'
 	 *
 	 * @return string  file data
+	 * @throws \Exception
 	 */
 	public static function getData($item)
 	{
@@ -166,6 +173,7 @@ class Attach extends BaseObject
 	 * @param string  $deny_gid  Permissions, denied greoup.optional, default = ''
 	 *
 	 * @return boolean/integer Row id on success, False on errors
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function store($data, $uid, $filename, $filetype = '' , $filesize = null, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '')
 	{
@@ -214,7 +222,15 @@ class Attach extends BaseObject
 	/**
 	 * @brief Store new file metadata in db and binary in default backend from existing file
 	 *
+	 * @param        $src
+	 * @param        $uid
+	 * @param string $filename
+	 * @param string $allow_cid
+	 * @param string $allow_gid
+	 * @param string $deny_cid
+	 * @param string $deny_gid
 	 * @return boolean True on success
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function storeFile($src, $uid, $filename = '', $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '')
 	{
@@ -233,11 +249,12 @@ class Attach extends BaseObject
 	 *
 	 * @param array         $fields     Contains the fields that are updated
 	 * @param array         $conditions Condition array with the key values
-	 * @param string        $data       File data to update. Optional, default null.
+	 * @param Image         $img        Image data to update. Optional, default null.
 	 * @param array|boolean $old_fields Array with the old field values that are about to be replaced (true = update on duplicate)
 	 *
-	 * @return boolean  Was the update successfull?
+	 * @return boolean  Was the update successful?
 	 *
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @see   \Friendica\Database\DBA::update
 	 */
 	public static function update($fields, $conditions, $img = null, array $old_fields = [])
@@ -270,6 +287,7 @@ class Attach extends BaseObject
 	 *
 	 * @return boolean
 	 *
+	 * @throws \Exception
 	 * @see   \Friendica\Database\DBA::delete
 	 */
 	public static function delete(array $conditions, array $options = [])

src/Model/Contact.php

@@ -32,7 +32,7 @@ use Friendica\Util\Strings;
 class Contact extends BaseObject
 {
 	/**
-	 * @name page/profile types
+	 * Page/profile types
 	 *
 	 * PAGE_NORMAL is a typical personal profile account
 	 * PAGE_SOAPBOX automatically approves all friend requests as Contact::SHARING, (readonly)
@@ -81,7 +81,7 @@ class Contact extends BaseObject
 	 */
 
 	/**
-	 * @name Contact_is
+	 * Contact_is
 	 *
 	 * Relationship types
 	 * @{
@@ -100,6 +100,8 @@ class Contact extends BaseObject
 	 * @param int $uid User ID
 	 *
 	 * @return boolean is the contact id a follower?
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function isFollower($cid, $uid)
 	{
@@ -123,6 +125,8 @@ class Contact extends BaseObject
 	 * @param string $url The contact link
 	 *
 	 * @return string basepath
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function getBasepath($url)
 	{
@@ -142,6 +146,8 @@ class Contact extends BaseObject
 	 * @param int $uid User ID
 	 *
 	 * @return array with public and user's contact id
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function getPublicAndUserContacID($cid, $uid)
 	{
@@ -179,6 +185,7 @@ class Contact extends BaseObject
 	 * @param int     $cid     Either public contact id or user's contact id
 	 * @param int     $uid     User ID
 	 * @param boolean $blocked Is the contact blocked or unblocked?
+	 * @throws \Exception
 	 */
 	public static function setBlockedForUser($cid, $uid, $blocked)
 	{
@@ -201,6 +208,7 @@ class Contact extends BaseObject
 	 * @param int $uid User ID
 	 *
 	 * @return boolean is the contact id blocked for the given user?
+	 * @throws \Exception
 	 */
 	public static function isBlockedByUser($cid, $uid)
 	{
@@ -240,6 +248,7 @@ class Contact extends BaseObject
 	 * @param int     $cid     Either public contact id or user's contact id
 	 * @param int     $uid     User ID
 	 * @param boolean $ignored Is the contact ignored or unignored?
+	 * @throws \Exception
 	 */
 	public static function setIgnoredForUser($cid, $uid, $ignored)
 	{
@@ -262,6 +271,7 @@ class Contact extends BaseObject
 	 * @param int $uid User ID
 	 *
 	 * @return boolean is the contact id ignored for the given user?
+	 * @throws \Exception
 	 */
 	public static function isIgnoredByUser($cid, $uid)
 	{
@@ -301,6 +311,7 @@ class Contact extends BaseObject
 	 * @param int     $cid       Either public contact id or user's contact id
 	 * @param int     $uid       User ID
 	 * @param boolean $collapsed are the contact's posts collapsed or uncollapsed?
+	 * @throws \Exception
 	 */
 	public static function setCollapsedForUser($cid, $uid, $collapsed)
 	{
@@ -319,6 +330,8 @@ class Contact extends BaseObject
 	 * @param int $uid User ID
 	 *
 	 * @return boolean is the contact id blocked for the given user?
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function isCollapsedByUser($cid, $uid)
 	{
@@ -344,6 +357,7 @@ class Contact extends BaseObject
 	 *
 	 * @param int $gid
 	 * @return array
+	 * @throws \Exception
 	 */
 	public static function getByGroupId($gid)
 	{
@@ -378,6 +392,7 @@ class Contact extends BaseObject
 	 *
 	 * @param int $gid
 	 * @return int
+	 * @throws \Exception
 	 */
 	public static function getOStatusCountByGroupId($gid)
 	{
@@ -406,6 +421,7 @@ class Contact extends BaseObject
 	 *
 	 * @param int $uid
 	 * @return bool Operation success
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function createSelfFromUserId($uid)
 	{
@@ -452,6 +468,7 @@ class Contact extends BaseObject
 	 *
 	 * @param int     $uid
 	 * @param boolean $update_avatar Force the avatar update
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function updateSelfFromUserID($uid, $update_avatar = false)
 	{
@@ -552,6 +569,7 @@ class Contact extends BaseObject
 	 *
 	 * @param int $id contact id
 	 * @return null
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function remove($id)
 	{
@@ -575,6 +593,8 @@ class Contact extends BaseObject
 	 * @param array   $contact  Contact unfriended
 	 * @param boolean $dissolve Remove the contact on the remote side
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function terminateFriendship(array $user, array $contact, $dissolve = false)
 	{
@@ -620,6 +640,7 @@ class Contact extends BaseObject
 	 *
 	 * @param array $contact contact to mark for archival
 	 * @return null
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function markForArchival(array $contact)
 	{
@@ -672,6 +693,7 @@ class Contact extends BaseObject
 	 *
 	 * @param array $contact contact to be unmarked for archival
 	 * @return null
+	 * @throws \Exception
 	 */
 	public static function unmarkForArchival(array $contact)
 	{
@@ -715,6 +737,7 @@ class Contact extends BaseObject
 	 * @param array  $default If not data was found take this data as default value
 	 *
 	 * @return array Contact data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getDetailsByURL($url, $uid = -1, array $default = [])
 	{
@@ -857,6 +880,8 @@ class Contact extends BaseObject
 	 * @param int    $uid  User id
 	 *
 	 * @return array Contact data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function getDetailsByAddr($addr, $uid = -1)
 	{
@@ -912,6 +937,8 @@ class Contact extends BaseObject
 	 * @param array $contact contact
 	 * @param int   $uid     optional, default 0
 	 * @return array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function photoMenu(array $contact, $uid = 0)
 	{
@@ -1026,9 +1053,6 @@ class Contact extends BaseObject
 	 * id or a paginated list of ungrouped contacts.
 	 *
 	 * @param int $uid uid
-	 * @param int $start optional, default 0
-	 * @param int $count optional, default 0
-	 *
 	 * @return array
 	 */
 	public static function getUngroupedList($uid)
@@ -1073,6 +1097,8 @@ class Contact extends BaseObject
 	 * @param boolean $in_loop   Internally used variable to prevent an endless loop
 	 *
 	 * @return integer Contact ID
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function getIdForURL($url, $uid = 0, $no_update = false, $default = [], $in_loop = false)
 	{
@@ -1330,6 +1356,7 @@ class Contact extends BaseObject
 	 * @param int $cid contact id
 	 *
 	 * @return boolean Is the contact blocked?
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function isBlocked($cid)
 	{
@@ -1355,6 +1382,7 @@ class Contact extends BaseObject
 	 * @param int $cid contact id
 	 *
 	 * @return boolean Is the contact hidden?
+	 * @throws \Exception
 	 */
 	public static function isHidden($cid)
 	{
@@ -1374,7 +1402,10 @@ class Contact extends BaseObject
 	 *
 	 * @param string $contact_url Contact URL
 	 *
+	 * @param bool   $thread_mode
+	 * @param int    $update
 	 * @return string posts in HTML
+	 * @throws \Exception
 	 */
 	public static function getPostsFromUrl($contact_url, $thread_mode = false, $update = 0)
 	{
@@ -1489,6 +1520,7 @@ class Contact extends BaseObject
 	 *
 	 * @param int $uid
 	 * @return bool
+	 * @throws \Exception
 	 */
 	public static function block($uid)
 	{
@@ -1502,6 +1534,7 @@ class Contact extends BaseObject
 	 *
 	 * @param int $uid
 	 * @return bool
+	 * @throws \Exception
 	 */
 	public static function unblock($uid)
 	{
@@ -1519,6 +1552,8 @@ class Contact extends BaseObject
 	 * @param bool   $force  force picture update
 	 *
 	 * @return array Returns array of the different avatar sizes
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function updateAvatar($avatar, $uid, $cid, $force = false)
 	{
@@ -1558,6 +1593,8 @@ class Contact extends BaseObject
 	 * @param integer $id      contact id
 	 * @param string  $network Optional network we are probing for
 	 * @return boolean
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function updateFromProbe($id, $network = '')
 	{
@@ -1633,7 +1670,9 @@ class Contact extends BaseObject
 	 * @param string $url
 	 * @param bool   $interactive
 	 * @param string $network
-	 * @return boolean|string
+	 * @return array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function createFromProbe($uid, $url, $interactive = false, $network = '')
 	{
@@ -1852,6 +1891,7 @@ class Contact extends BaseObject
 	 * @param string $new_policy New policy, valid: self,full
 	 *
 	 * @return array Contact array with updated values
+	 * @throws \Exception
 	 */
 	public static function updateSslPolicy(array $contact, $new_policy)
 	{
@@ -2055,6 +2095,7 @@ class Contact extends BaseObject
 	 * Remove the unavailable contact ids from the provided list
 	 *
 	 * @param array $contact_ids Contact id list
+	 * @throws \Exception
 	 */
 	public static function pruneUnavailable(array &$contact_ids)
 	{
@@ -2085,6 +2126,8 @@ class Contact extends BaseObject
 	 * @param string $url         An url that we will be redirected to after the authentication
 	 *
 	 * @return string with "redir" link
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function magicLink($contact_url, $url = '')
 	{
@@ -2104,9 +2147,11 @@ class Contact extends BaseObject
 	 * @brief Returns a magic link to authenticate remote visitors
 	 *
 	 * @param integer $cid The contact id of the target contact profile
-	 * @param integer $url An url that we will be redirected to after the authentication
+	 * @param string  $url An url that we will be redirected to after the authentication
 	 *
 	 * @return string with "redir" link
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function magicLinkbyId($cid, $url = '')
 	{
@@ -2122,6 +2167,8 @@ class Contact extends BaseObject
 	 * @param string $url     An url that we will be redirected to after the authentication
 	 *
 	 * @return string with "redir" link
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function magicLinkbyContact($contact, $url = '')
 	{

src/Model/Conversation.php

@@ -35,6 +35,7 @@ class Conversation
 	 *
 	 * @param array $arr Item array with conversation data
 	 * @return array Item array with removed conversation data
+	 * @throws \Exception
 	 */
 	public static function insert(array $arr)
 	{

src/Model/Event.php

@@ -148,6 +148,7 @@ class Event extends BaseObject
 	 * @brief Extract bbcode formatted event data from a string.
 	 *
 	 * @params: string $s The string which should be parsed for event data.
+	 * @param $text
 	 * @return array The array with the event information.
 	 */
 	public static function fromBBCode($text)
@@ -215,6 +216,7 @@ class Event extends BaseObject
 	 *
 	 * @param int $event_id Event ID.
 	 * @return void
+	 * @throws \Exception
 	 */
 	public static function delete($event_id)
 	{
@@ -233,6 +235,7 @@ class Event extends BaseObject
 	 *
 	 * @param array $arr Array with event data.
 	 * @return int The new event id.
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function store($arr)
 	{
@@ -371,6 +374,7 @@ class Event extends BaseObject
 	 * @brief Create an array with translation strings used for events.
 	 *
 	 * @return array Array with translations strings.
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getStrings()
 	{
@@ -546,6 +550,8 @@ class Event extends BaseObject
 	 *
 	 * @param array $event_result Event query array.
 	 * @return array Event array for the template.
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function prepareListForTemplate(array $event_result)
 	{
@@ -629,7 +635,6 @@ class Event extends BaseObject
 	 *
 	 * @param array  $events   Query result for events.
 	 * @param string $format   The output format (ical/csv).
-	 * @param string $timezone The timezone of the user (not implemented yet).
 	 *
 	 * @return string Content according to selected export format.
 	 *
@@ -741,6 +746,7 @@ class Event extends BaseObject
 	 * @param int $uid The user ID.
 	 *
 	 * @return array Query results.
+	 * @throws \Exception
 	 */
 	private static function getListByUserId($uid = 0)
 	{
@@ -779,6 +785,7 @@ class Event extends BaseObject
 	 *                       string 'extension' => The file extension of the output format,<br>
 	 *                       string 'content' => The formatted output content.<br>
 	 *
+	 * @throws \Exception
 	 * @todo Respect authenticated users with events_by_uid().
 	 */
 	public static function exportListByUserId($uid, $format = 'ical')
@@ -831,6 +838,8 @@ class Event extends BaseObject
 	 *
 	 * @param array $item Array with item and event data.
 	 * @return string HTML output.
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function getItemHTML(array $item) {
 		$same_date = false;
@@ -989,6 +998,7 @@ class Event extends BaseObject
 	 * @param array  $contact  Contact array, expects: id, uid, url, name
 	 * @param string $birthday Birthday of the contact
 	 * @return bool
+	 * @throws \Exception
 	 */
 	public static function createBirthday($contact, $birthday)
 	{

src/Model/FileTag.php

@@ -143,6 +143,7 @@ class FileTag
 	 * @param string $type     Optional file type.
 	 *
 	 * @return boolean          A value indicating success or failure.
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
     public static function updatePconfig($uid, $file_old, $file_new, $type = 'file')
     {
@@ -228,6 +229,7 @@ class FileTag
 	 * @param string $file    File tag.
 	 *
 	 * @return boolean      A value indicating success or failure.
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
     public static function saveFile($uid, $item_id, $file)
     {
@@ -267,6 +269,7 @@ class FileTag
 	 * @param boolean $cat     Optional value indicating the term type (i.e. Category or File)
 	 *
 	 * @return boolean      A value indicating success or failure.
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
     public static function unsaveFile($uid, $item_id, $file, $cat = false)
     {

src/Model/GContact.php

@@ -31,6 +31,7 @@ class GContact
 	 * @param string $mode   Search mode (e.g. "community")
 	 *
 	 * @return array with search results
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function searchByName($search, $mode = '')
 	{
@@ -91,6 +92,7 @@ class GContact
 	 * @param integer $cid  Contact ID
 	 * @param integer $zcid Global Contact ID
 	 * @return void
+	 * @throws Exception
 	 */
 	public static function link($gcid, $uid = 0, $cid = 0, $zcid = 0)
 	{
@@ -105,16 +107,16 @@ class GContact
 	/**
 	 * @brief Sanitize the given gcontact data
 	 *
-	 * @param array $gcontact array with gcontact data
-	 * @throw Exception
-	 *
 	 * Generation:
 	 *  0: No definition
 	 *  1: Profiles on this server
 	 *  2: Contacts of profiles on this server
 	 *  3: Contacts of contacts of profiles on this server
 	 *  4: ...
+	 *
+	 * @param array $gcontact array with gcontact data
 	 * @return array $gcontact
+	 * @throws Exception
 	 */
 	public static function sanitize($gcontact)
 	{
@@ -412,6 +414,7 @@ class GContact
 	 * @param integer $start optional, default 0
 	 * @param integer $limit optional, default 80
 	 * @return array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function suggestionQuery($uid, $start = 0, $limit = 80)
 	{
@@ -515,6 +518,7 @@ class GContact
 
 	/**
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function updateSuggestions()
 	{
@@ -568,6 +572,7 @@ class GContact
 	 * @param string $url Contact url
 	 *
 	 * @return string Contact url with the wanted parts
+	 * @throws Exception
 	 */
 	public static function cleanContactUrl($url)
 	{
@@ -599,6 +604,8 @@ class GContact
 	 *
 	 * @param array $contact contact array (called by reference)
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function fixAlternateContactAddress(&$contact)
 	{
@@ -620,6 +627,8 @@ class GContact
 	 * @param array $contact contact array
 	 *
 	 * @return bool|int Returns false if not found, integer if contact was found
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function getId($contact)
 	{
@@ -715,6 +724,8 @@ class GContact
 	 * @param array $contact contact array
 	 *
 	 * @return bool|int Returns false if not found, integer if contact was found
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function update($contact)
 	{
@@ -879,6 +890,8 @@ class GContact
 	 *
 	 * @param string $url profile link
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function updateFromProbe($url)
 	{
@@ -898,7 +911,9 @@ class GContact
 	 * @brief Update the gcontact entry for a given user id
 	 *
 	 * @param int $uid User ID
-	 * @return void
+	 * @return bool
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function updateForUser($uid)
 	{
@@ -949,7 +964,9 @@ class GContact
 	 * If the "Statistics" addon is enabled (See http://gstools.org/ for details) we query user data with this.
 	 *
 	 * @param string $server Server address
-	 * @return void
+	 * @return bool
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function fetchGsUsers($server)
 	{
@@ -1009,6 +1026,8 @@ class GContact
 	/**
 	 * @brief Asking GNU Social server on a regular base for their user data
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function discoverGsUsers()
 	{

src/Model/Group.php

@@ -25,6 +25,7 @@ class Group extends BaseObject
 	 * @param int    $uid
 	 * @param string $name
 	 * @return boolean
+	 * @throws \Exception
 	 */
 	public static function create($uid, $name)
 	{
@@ -60,6 +61,7 @@ class Group extends BaseObject
 	 * @param  string $name Group name
 	 *
 	 * @return bool Was the update successful?
+	 * @throws \Exception
 	 */
 	public static function update($id, $name)
 	{
@@ -71,6 +73,7 @@ class Group extends BaseObject
 	 *
 	 * @param int $cid
 	 * @return array
+	 * @throws \Exception
 	 */
 	public static function getIdsByContactId($cid)
 	{
@@ -95,6 +98,7 @@ class Group extends BaseObject
 	 *    'id' => group id
 	 *    'name' => group name
 	 *    'count' => counted unseen group items
+	 * @throws \Exception
 	 */
 	public static function countUnseen()
 	{
@@ -124,6 +128,7 @@ class Group extends BaseObject
 	 * @param int    $uid
 	 * @param string $name
 	 * @return int|boolean
+	 * @throws \Exception
 	 */
 	public static function getIdByName($uid, $name)
 	{
@@ -144,6 +149,7 @@ class Group extends BaseObject
 	 *
 	 * @param int $gid
 	 * @return boolean
+	 * @throws \Exception
 	 */
 	public static function remove($gid) {
 		if (! $gid) {
@@ -195,6 +201,7 @@ class Group extends BaseObject
 	 * @param int    $uid
 	 * @param string $name
 	 * @return bool
+	 * @throws \Exception
 	 */
 	public static function removeByName($uid, $name) {
 		$return = false;
@@ -213,6 +220,7 @@ class Group extends BaseObject
 	 * @param int $gid
 	 * @param int $cid
 	 * @return boolean
+	 * @throws \Exception
 	 */
 	public static function addMember($gid, $cid)
 	{
@@ -237,6 +245,7 @@ class Group extends BaseObject
 	 * @param int $gid
 	 * @param int $cid
 	 * @return boolean
+	 * @throws \Exception
 	 */
 	public static function removeMember($gid, $cid)
 	{
@@ -258,6 +267,7 @@ class Group extends BaseObject
 	 * @param string $name
 	 * @param int    $cid
 	 * @return boolean
+	 * @throws \Exception
 	 */
 	public static function removeMemberByName($uid, $name, $cid)
 	{
@@ -274,6 +284,7 @@ class Group extends BaseObject
 	 * @param array   $group_ids
 	 * @param boolean $check_dead
 	 * @return array
+	 * @throws \Exception
 	 */
 	public static function expand($group_ids, $check_dead = false)
 	{
@@ -302,6 +313,7 @@ class Group extends BaseObject
 	 * @param int    $gid   An optional pre-selected group
 	 * @param string $label An optional label of the list
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function displayGroupSelection($uid, $gid = 0, $label = '')
 	{
@@ -345,9 +357,10 @@ class Group extends BaseObject
 	 *    'standard' => include link 'Edit groups'
 	 *    'extended' => include link 'Create new group'
 	 *    'full' => include link 'Create new group' and provide for each group a link to edit this group
-	 * @param int $group_id
+	 * @param string $group_id
 	 * @param int    $cid
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function sidebarWidget($every = 'contact', $each = 'group', $editmode = 'standard', $group_id = '', $cid = 0)
 	{

src/Model/Item.php

@@ -263,6 +263,7 @@ class Item extends BaseObject
 	 * @brief Fills an array with data from an item query
 	 *
 	 * @param object $stmt statement object
+	 * @param bool   $do_close
 	 * @return array Data array
 	 */
 	public static function inArray($stmt, $do_close = true) {
@@ -286,6 +287,7 @@ class Item extends BaseObject
 	 * @param array $condition array of fields for condition
 	 *
 	 * @return boolean Are there rows for that condition?
+	 * @throws \Exception
 	 */
 	public static function exists($condition) {
 		$stmt = self::select(['id'], $condition, ['limit' => 1]);
@@ -306,10 +308,11 @@ class Item extends BaseObject
 	 *
 	 * @brief Retrieve a single record from a table
 	 * @param integer $uid User ID
-	 * @param array  $fields
+	 * @param array   $selected
 	 * @param array   $condition
 	 * @param array   $params
 	 * @return bool|array
+	 * @throws \Exception
 	 * @see   DBA::select
 	 */
 	public static function selectFirstForUser($uid, array $selected = [], array $condition = [], $params = [])
@@ -332,6 +335,7 @@ class Item extends BaseObject
 	 * @param array   $params    Array of several parameters
 	 *
 	 * @return boolean|object
+	 * @throws \Exception
 	 */
 	public static function selectForUser($uid, array $selected = [], array $condition = [], $params = [])
 	{
@@ -352,6 +356,7 @@ class Item extends BaseObject
 	 * @param array $condition
 	 * @param array $params
 	 * @return bool|array
+	 * @throws \Exception
 	 * @see   DBA::select
 	 */
 	public static function selectFirst(array $fields = [], array $condition = [], $params = [])
@@ -377,6 +382,7 @@ class Item extends BaseObject
 	 * @param array $params    Array of several parameters
 	 *
 	 * @return boolean|object
+	 * @throws \Exception
 	 */
 	public static function select(array $selected = [], array $condition = [], $params = [])
 	{
@@ -413,11 +419,12 @@ class Item extends BaseObject
 	 * @brief Select rows from the starting post in the item table
 	 *
 	 * @param integer $uid       User ID
-	 * @param array  $fields    Array of selected fields, empty for all
+	 * @param array   $selected
 	 * @param array   $condition Array of fields for condition
 	 * @param array   $params    Array of several parameters
 	 *
 	 * @return boolean|object
+	 * @throws \Exception
 	 */
 	public static function selectThreadForUser($uid, array $selected = [], array $condition = [], $params = [])
 	{
@@ -439,6 +446,7 @@ class Item extends BaseObject
 	 * @param array   $condition
 	 * @param array   $params
 	 * @return bool|array
+	 * @throws \Exception
 	 * @see   DBA::select
 	 */
 	public static function selectFirstThreadForUser($uid, array $selected = [], array $condition = [], $params = [])
@@ -460,6 +468,7 @@ class Item extends BaseObject
 	 * @param array $condition
 	 * @param array $params
 	 * @return bool|array
+	 * @throws \Exception
 	 * @see   DBA::select
 	 */
 	public static function selectFirstThread(array $fields = [], array $condition = [], $params = [])
@@ -484,6 +493,7 @@ class Item extends BaseObject
 	 * @param array $params    Array of several parameters
 	 *
 	 * @return boolean|object
+	 * @throws \Exception
 	 */
 	public static function selectThread(array $selected = [], array $condition = [], $params = [])
 	{
@@ -529,6 +539,7 @@ class Item extends BaseObject
 	/**
 	 * @brief Returns a list of fields that are associated with the item table
 	 *
+	 * @param $usermode
 	 * @return array field list
 	 */
 	private static function fieldlist($usermode)
@@ -615,6 +626,7 @@ class Item extends BaseObject
 	 * @param string  $sql_commands The parts of the built SQL commands in the "select" functions
 	 * @param boolean $thread_mode  Called for the items (false) or for the threads (true)
 	 *
+	 * @param         $user_mode
 	 * @return string The SQL joins for the "select" functions
 	 */
 	private static function constructJoins($uid, $sql_commands, $thread_mode, $user_mode)
@@ -786,6 +798,7 @@ class Item extends BaseObject
 	 * A return value of "0" doesn't mean an error - but that 0 rows had been changed.
 	 *
 	 * @return integer|boolean number of affected rows - or "false" if there was an error
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function update(array $fields, array $condition)
 	{
@@ -934,6 +947,7 @@ class Item extends BaseObject
 	 *
 	 * @param array   $condition The condition for finding the item entries
 	 * @param integer $priority  Priority for the notification
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function delete($condition, $priority = PRIORITY_HIGH)
 	{
@@ -949,6 +963,7 @@ class Item extends BaseObject
 	 *
 	 * @param array   $condition The condition for finding the item entries
 	 * @param integer $uid       User who wants to delete this item
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function deleteForUser($condition, $uid)
 	{
@@ -977,6 +992,7 @@ class Item extends BaseObject
 	 * @param integer $priority Priority for the notification
 	 *
 	 * @return boolean success
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function deleteById($item_id, $priority = PRIORITY_HIGH)
 	{
@@ -1850,6 +1866,7 @@ class Item extends BaseObject
 	 *
 	 * @param array $item The item fields that are to be inserted
 	 * @return bool
+	 * @throws \Exception
 	 */
 	private static function insertActivity(&$item)
 	{
@@ -1896,6 +1913,7 @@ class Item extends BaseObject
 	 * @brief Insert a new item content entry
 	 *
 	 * @param array $item The item fields that are to be inserted
+	 * @throws \Exception
 	 */
 	private static function insertContent(&$item)
 	{
@@ -1936,6 +1954,8 @@ class Item extends BaseObject
 	 *
 	 * @param array $item      The item fields that are to be changed
 	 * @param array $condition The condition for finding the item content entries
+	 * @return bool
+	 * @throws \Exception
 	 */
 	private static function updateActivity($item, $condition)
 	{
@@ -1962,6 +1982,7 @@ class Item extends BaseObject
 	 *
 	 * @param array $item      The item fields that are to be changed
 	 * @param array $condition The condition for finding the item content entries
+	 * @throws \Exception
 	 */
 	private static function updateContent($item, $condition)
 	{
@@ -1989,6 +2010,7 @@ class Item extends BaseObject
 	 *
 	 * @param integer $itemid      Item ID that should be added
 	 * @param string  $signed_text Original text (for Diaspora signatures), JSON encoded.
+	 * @throws \Exception
 	 */
 	public static function distribute($itemid, $signed_text = '')
 	{
@@ -2085,6 +2107,7 @@ class Item extends BaseObject
 	 * @param integer $itemid Item ID that should be added
 	 * @param array   $item   The item entry that will be stored
 	 * @param integer $uid    The user that will receive the item entry
+	 * @throws \Exception
 	 */
 	private static function storeForUser($itemid, $item, $uid)
 	{
@@ -2132,6 +2155,7 @@ class Item extends BaseObject
 	 * It is planned that in the future we will store public item entries only once.
 	 *
 	 * @param integer $itemid Item ID that should be added
+	 * @throws \Exception
 	 */
 	public static function addShadow($itemid)
 	{
@@ -2193,6 +2217,7 @@ class Item extends BaseObject
 	 * This function does the same like the function above - but for comments
 	 *
 	 * @param integer $itemid Item ID that should be added
+	 * @throws \Exception
 	 */
 	public static function addShadowPost($itemid)
 	{
@@ -2252,6 +2277,9 @@ class Item extends BaseObject
 	/**
 	 * Adds a language specification in a "language" element of given $arr.
 	 * Expects "body" element to exist in $arr.
+	 *
+	 * @param $item
+	 * @throws \Text_LanguageDetect_Exception
 	 */
 	private static function addLanguageToItemArray(&$item)
 	{
@@ -2301,6 +2329,7 @@ class Item extends BaseObject
 	 * @param string  $guid An existing GUID (Otherwise it will be generated)
 	 *
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function newURI($uid, $guid = "")
 	{
@@ -2319,6 +2348,7 @@ class Item extends BaseObject
 	 * Don't set this value if it isn't from the owner (could be an author that we don't know)
 	 *
 	 * @param array $arr Contains the just posted item record
+	 * @throws \Exception
 	 */
 	private static function updateContact($arr)
 	{
@@ -2439,9 +2469,11 @@ class Item extends BaseObject
 
 	/**
 	 * This function is only used for the old Friendica app on Android that doesn't like paths with guid
+	 *
 	 * @param string $guid item guid
 	 * @param int    $uid  user id
 	 * @return array with id and nick of the item with the given guid
+	 * @throws \Exception
 	 */
 	public static function getIdAndNickByGuid($guid, $uid = 0)
 	{
@@ -2483,9 +2515,12 @@ class Item extends BaseObject
 
 	/**
 	 * look for mention tags and setup a second delivery chain for forum/community posts if appropriate
+	 *
 	 * @param int $uid
 	 * @param int $item_id
-	 * @return bool true if item was deleted, else false
+	 * @return void true if item was deleted, else false
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function tagDeliver($uid, $item_id)
 	{
@@ -2671,6 +2706,8 @@ class Item extends BaseObject
 	 * @param array  $item
 	 * @param int    $cid
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function fixPrivatePhotos($s, $uid, $item = null, $cid = 0)
 	{
@@ -2931,6 +2968,9 @@ class Item extends BaseObject
 	 *            Activity verb. One of
 	 *            like, unlike, dislike, undislike, attendyes, unattendyes,
 	 *            attendno, unattendno, attendmaybe, unattendmaybe
+	 * @return bool
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 * @hook  'post_local_end'
 	 *            array $arr
 	 *            'post_id' => ID of posted item
@@ -3212,7 +3252,7 @@ class Item extends BaseObject
 	/**
 	 * get translated item type
 	 *
-	 * @param array $itme
+	 * @param $item
 	 * @return string
 	 */
 	public static function postType($item)
@@ -3238,6 +3278,7 @@ class Item extends BaseObject
 	 * @param array $item
 	 * @param bool  $update
 	 *
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @todo Remove reference, simply return "rendered-html" and "rendered-hash"
 	 */
 	public static function putInCache(&$item, $update = false)
@@ -3296,6 +3337,8 @@ class Item extends BaseObject
 	 * @param boolean $attach
 	 * @param boolean $is_preview
 	 * @return string item body html
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 * @hook  prepare_body_init item array before any work
 	 * @hook  prepare_body_content_filter ('item'=>item array, 'filter_reasons'=>string array) before first bbcode to html
 	 * @hook  prepare_body ('item'=>item array, 'html'=>body string, 'is_preview'=>boolean, 'filter_reasons'=>string array) after first bbcode to html
@@ -3467,8 +3510,10 @@ class Item extends BaseObject
 
 	/**
 	 * get private link for item
+	 *
 	 * @param array $item
 	 * @return boolean|array False if item has not plink, otherwise array('href'=>plink url, 'title'=>translated title)
+	 * @throws \Exception
 	 */
 	public static function getPlink($item)
 	{

src/Model/ItemContent.php

@@ -22,9 +22,10 @@ class ItemContent extends BaseObject
 	 * @param int    $htmlmode       This controls the behavior of the BBCode conversion
 	 * @param string $target_network Name of the network where the post should go to.
 	 *
+	 * @return array Same array structure than \Friendica\Content\Text\BBCode::getAttachedData
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @see   \Friendica\Content\Text\BBCode::getAttachedData
 	 *
-	 * @return array Same array structure than \Friendica\Content\Text\BBCode::getAttachedData
 	 */
 	public static function getPlaintextPost($item, $limit = 0, $includedlinks = false, $htmlmode = 2, $target_network = '')
 	{

src/Model/ItemDeliveryData.php

@@ -53,6 +53,7 @@ class ItemDeliveryData
 	 *
 	 * @param integer $item_id
 	 * @return bool
+	 * @throws \Exception
 	 */
 	public static function incrementQueueDone($item_id)
 	{
@@ -65,6 +66,7 @@ class ItemDeliveryData
 	 * @param integer $item_id
 	 * @param array   $fields
 	 * @return bool
+	 * @throws \Exception
 	 */
 	public static function insert($item_id, array $fields)
 	{
@@ -85,6 +87,7 @@ class ItemDeliveryData
 	 * @param integer $item_id
 	 * @param array   $fields
 	 * @return bool
+	 * @throws \Exception
 	 */
 	public static function update($item_id, array $fields)
 	{
@@ -105,6 +108,7 @@ class ItemDeliveryData
 	 *
 	 * @param integer $item_id
 	 * @return bool
+	 * @throws \Exception
 	 */
 	public static function delete($item_id)
 	{

src/Model/ItemURI.php

@@ -17,6 +17,7 @@ class ItemURI extends BaseObject
 	 * @param array $fields Item-uri fields
 	 *
 	 * @return integer item-uri id
+	 * @throws \Exception
 	 */
 	public static function insert($fields)
 	{
@@ -43,6 +44,7 @@ class ItemURI extends BaseObject
 	 * @param string $uri
 	 *
 	 * @return integer item-uri id
+	 * @throws \Exception
 	 */
 	public static function getIdByURI($uri)
 	{

src/Model/Mail.php

@@ -26,6 +26,8 @@ class Mail
 	 * @param string  $body      message body, default empty
 	 * @param string  $subject   message subject, default empty
 	 * @param string  $replyto   reply to
+	 * @return int
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function send($recipient = 0, $body = '', $subject = '', $replyto = '')
 	{
@@ -160,6 +162,9 @@ class Mail
 	 * @param string $body      message body, default empty
 	 * @param string $subject   message subject, default empty
 	 * @param string $replyto   reply to, default empty
+	 * @return int
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function sendWall($recipient = '', $body = '', $subject = '', $replyto = '')
 	{

src/Model/OpenWebAuthToken.php

@@ -22,6 +22,7 @@ class OpenWebAuthToken
 	 * @param string $meta
 	 *
 	 * @return boolean
+	 * @throws \Exception
 	 */
 	public static function create($type, $uid, $token, $meta)
 	{
@@ -43,6 +44,7 @@ class OpenWebAuthToken
 	 * @param string $token
 	 *
 	 * @return string|boolean The meta enry or false if not found.
+	 * @throws \Exception
 	 */
 	public static function getMeta($type, $uid, $token)
 	{
@@ -62,6 +64,7 @@ class OpenWebAuthToken
 	 *
 	 * @param string $type     Verify type.
 	 * @param string $interval SQL compatible time interval
+	 * @throws \Exception
 	 */
 	public static function purge($type, $interval)
 	{

src/Model/PermissionSet.php

@@ -16,7 +16,8 @@ class PermissionSet extends BaseObject
 	 * Fetch the id of a given permission set. Generate a new one when needed
 	 *
 	 * @param array $postarray The array from an item, picture or event post
-	 * @return id
+	 * @return int id
+	 * @throws \Exception
 	 */
 	public static function fetchIDForPost(&$postarray)
 	{
@@ -69,6 +70,7 @@ class PermissionSet extends BaseObject
 	 * @param array   $groups     Possibly previously fetched group ids for that contact
 	 *
 	 * @return array of permission set ids.
+	 * @throws \Exception
 	 */
 
 	static public function get($uid, $contact_id, $groups = null)

src/Model/Photo.php

@@ -35,6 +35,7 @@ class Photo extends BaseObject
 	 *
 	 * @return boolean|array
 	 *
+	 * @throws \Exception
 	 * @see   \Friendica\Database\DBA::select
 	 */
 	public static function select(array $fields = [], array $conditions = [], array $params = [])
@@ -56,6 +57,7 @@ class Photo extends BaseObject
 	 *
 	 * @return bool|array
 	 *
+	 * @throws \Exception
 	 * @see   \Friendica\Database\DBA::select
 	 */
 	public static function selectFirst(array $fields = [], array $conditions = [], array $params = [])
@@ -77,6 +79,7 @@ class Photo extends BaseObject
 	 *
 	 * @return bool|array
 	 *
+	 * @throws \Exception
 	 * @see   \Friendica\Database\DBA::select
 	 */
 	public static function getPhotosForUser($uid, $resourceid, array $conditions = [], array $params = [])
@@ -98,6 +101,7 @@ class Photo extends BaseObject
 	 *
 	 * @return bool|array
 	 *
+	 * @throws \Exception
 	 * @see   \Friendica\Database\DBA::select
 	 */
 	public static function getPhotoForUser($uid, $resourceid, $scale = 0, array $conditions = [], array $params = [])
@@ -120,6 +124,7 @@ class Photo extends BaseObject
 	 * @param integer $scale      Scale of the photo. Defaults to 0
 	 *
 	 * @return boolean|array
+	 * @throws \Exception
 	 */
 	public static function getPhoto($resourceid, $scale = 0)
 	{
@@ -148,6 +153,7 @@ class Photo extends BaseObject
 	 * @param array $conditions Array of extra conditions
 	 *
 	 * @return boolean
+	 * @throws \Exception
 	 */
 	public static function exists(array $conditions)
 	{
@@ -161,6 +167,8 @@ class Photo extends BaseObject
 	 * @param array $photo Photo data. Needs at least 'id', 'type', 'backend-class', 'backend-ref'
 	 *
 	 * @return \Friendica\Object\Image
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function getImageForPhoto(array $photo)
 	{
@@ -188,6 +196,7 @@ class Photo extends BaseObject
 	 * @brief Return a list of fields that are associated with the photo table
 	 *
 	 * @return array field list
+	 * @throws \Exception
 	 */
 	private static function getFields()
 	{
@@ -204,6 +213,7 @@ class Photo extends BaseObject
 	 * @param string $mimetype Image mime type. Defaults to "image/jpeg"
 	 *
 	 * @return array
+	 * @throws \Exception
 	 */
 	public static function createPhotoForSystemResource($filename, $mimetype = "image/jpeg")
 	{
@@ -236,6 +246,7 @@ class Photo extends BaseObject
 	 * @param string  $desc      Photo caption. optional, default = ""
 	 *
 	 * @return boolean True on success
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function store(Image $Image, $uid, $cid, $rid, $filename, $album, $scale, $profile = 0, $allow_cid = "", $allow_gid = "", $deny_cid = "", $deny_gid = "", $desc = "")
 	{
@@ -315,6 +326,7 @@ class Photo extends BaseObject
 	 *
 	 * @return boolean
 	 *
+	 * @throws \Exception
 	 * @see   \Friendica\Database\DBA::delete
 	 */
 	public static function delete(array $conditions, array $options = [])
@@ -342,6 +354,7 @@ class Photo extends BaseObject
 	 *
 	 * @return boolean  Was the update successfull?
 	 *
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @see   \Friendica\Database\DBA::update
 	 */
 	public static function update($fields, $conditions, Image $img = null, array $old_fields = [])
@@ -372,6 +385,8 @@ class Photo extends BaseObject
 	 * @param integer $cid           contact id
 	 * @param boolean $quit_on_error optional, default false
 	 * @return array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function importProfilePhoto($image_url, $uid, $cid, $quit_on_error = false)
 	{
@@ -508,6 +523,7 @@ class Photo extends BaseObject
 	 * @param bool $update Update the cache
 	 *
 	 * @return array Returns array of the photo albums
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getAlbums($uid, $update = false)
 	{
@@ -545,6 +561,7 @@ class Photo extends BaseObject
 	/**
 	 * @param int $uid User id of the photos
 	 * @return void
+	 * @throws \Exception
 	 */
 	public static function clearAlbumCache($uid)
 	{
@@ -556,6 +573,7 @@ class Photo extends BaseObject
 	 * Generate a unique photo ID.
 	 *
 	 * @return string
+	 * @throws \Exception
 	 */
 	public static function newResource()
 	{

src/Model/Process.php

@@ -19,6 +19,7 @@ class Process extends BaseObject
 	 * @param string $command
 	 * @param string $pid
 	 * @return bool
+	 * @throws \Exception
 	 */
 	public static function insert($command, $pid = null)
 	{
@@ -44,6 +45,7 @@ class Process extends BaseObject
 	 *
 	 * @param string $pid
 	 * @return bool
+	 * @throws \Exception
 	 */
 	public static function deleteByPid($pid = null)
 	{

src/Model/Profile.php

@@ -36,6 +36,7 @@ class Profile
 	 * @param integer User ID
 	 *
 	 * @return array Profile data
+	 * @throws \Exception
 	 */
 	public static function getByUID($uid)
 	{
@@ -102,6 +103,8 @@ class Profile
 	 * @param int     $profile      int
 	 * @param array   $profiledata  array
 	 * @param boolean $show_connect Show connect link
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function load(App $a, $nickname, $profile = 0, array $profiledata = [], $show_connect = true)
 	{
@@ -210,6 +213,7 @@ class Profile
 	 * @param int    $uid        uid
 	 * @param int    $profile_id ID of the profile
 	 * @return array
+	 * @throws \Exception
 	 */
 	public static function getByNickname($nickname, $uid = 0, $profile_id = 0)
 	{
@@ -271,6 +275,8 @@ class Profile
 	 *
 	 * @return string HTML sidebar module
 	 *
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 * @note  Returns empty string if passed $profile is wrong type or not populated
 	 *
 	 * @hooks 'profile_sidebar_enter'
@@ -1022,6 +1028,8 @@ class Profile
 	 * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/channel.php
 	 *
 	 * @param App $a Application instance.
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function zrlInit(App $a)
 	{
@@ -1091,6 +1099,8 @@ class Profile
 	 * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/zid.php
 	 *
 	 * @param string $token
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function openWebAuthInit($token)
 	{
@@ -1184,6 +1194,7 @@ class Profile
 	 * @brief Get the user ID of the page owner
 	 * @return int user ID
 	 *
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @note Returns local_user instead of user ID if "always_my_theme" is set to true
 	 */
 	public static function getThemeUid(App $a)
@@ -1208,9 +1219,10 @@ class Profile
 	}
 
 	/**
-	* Stip query parameter from a string.
+	 * Strip query parameter from a string.
 	 *
 	 * @param string $s The input string.
+	 * @param        $param
 	 * @return string The query parameter.
 	 */
 	public static function stripQueryParam($s, $param)

src/Model/PushSubscriber.php

@@ -15,7 +15,8 @@ class PushSubscriber
 	 * @brief Send subscription notifications for the given user
 	 *
 	 * @param integer $uid User ID
-	 * @param string  $priority Priority for push workers
+	 * @param int     $default_priority
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function publishFeed($uid, $default_priority = PRIORITY_HIGH)
 	{
@@ -28,7 +29,8 @@ class PushSubscriber
 	/**
 	 * @brief start workers to transmit the feed data
 	 *
-	 * @param string $priority Priority for push workers
+	 * @param int $default_priority
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function requeue($default_priority = PRIORITY_HIGH)
 	{
@@ -60,6 +62,7 @@ class PushSubscriber
 	 * @param string  $hub_callback Callback address
 	 * @param string  $hub_topic    Feed topic
 	 * @param string  $hub_secret   Subscription secret
+	 * @throws \Exception
 	 */
 	public static function renew($uid, $nick, $subscribe, $hub_callback, $hub_topic, $hub_secret)
 	{
@@ -98,6 +101,7 @@ class PushSubscriber
 	 * @brief Delay the push subscriber
 	 *
 	 * @param integer $id Subscriber ID
+	 * @throws \Exception
 	 */
 	public static function delay($id)
 	{
@@ -135,7 +139,8 @@ class PushSubscriber
 	 * @brief Reset the push subscriber
 	 *
 	 * @param integer $id          Subscriber ID
-	 * @param date    $last_update Date of last transmitted item
+	 * @param string  $last_update Date of last transmitted item
+	 * @throws \Exception
 	 */
 	public static function reset($id, $last_update)
 	{

src/Model/Queue.php

@@ -13,6 +13,7 @@ class Queue
 {
 	/**
 	 * @param string $id id
+	 * @throws \Exception
 	 */
 	public static function updateTime($id)
 	{
@@ -37,6 +38,7 @@ class Queue
 
 	/**
 	 * @param string $id id
+	 * @throws \Exception
 	 */
 	public static function removeItem($id)
 	{
@@ -78,6 +80,8 @@ class Queue
 	 * @param string  $network network
 	 * @param string  $msg     message
 	 * @param boolean $batch   batch, default false
+	 * @param string  $guid
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function add($cid, $network, $msg, $batch = false, $guid = '')
 	{

src/Model/Register.php

@@ -20,6 +20,7 @@ class Register
 	 * Return the list of pending registrations
 	 *
 	 * @return array
+	 * @throws \Exception
 	 */
 	public static function getPending()
 	{
@@ -37,6 +38,7 @@ class Register
 	 * Returns the pending registration count
 	 *
 	 * @return int
+	 * @throws \Exception
 	 */
 	public static function getPendingCount()
 	{
@@ -54,6 +56,7 @@ class Register
 	 *
 	 * @param  string $hash
 	 * @return array
+	 * @throws \Exception
 	 */
 	public static function getByHash($hash)
 	{
@@ -65,6 +68,7 @@ class Register
 	 *
 	 * @param  string $hash
 	 * @return boolean
+	 * @throws \Exception
 	 */
 	public static function existsByHash($hash)
 	{
@@ -75,6 +79,7 @@ class Register
 	 * Creates a register record for an invitation and returns the auto-generated code for it
 	 *
 	 * @return string
+	 * @throws \Exception
 	 */
 	public static function createForInvitation()
 	{
@@ -98,6 +103,7 @@ class Register
 	 * @param  string  $language The registration language
 	 * @param  string  $note     An additional message from the user
 	 * @return boolean
+	 * @throws \Exception
 	 */
 	public static function createForApproval($uid, $language, $note = '')
 	{
@@ -124,6 +130,7 @@ class Register
 	 *
 	 * @param  string $hash
 	 * @return boolean
+	 * @throws \Exception
 	 */
 	public static function deleteByHash($hash)
 	{

src/Model/Storage/Filesystem.php

@@ -50,6 +50,7 @@ class Filesystem implements IStorage
 	/**
 	 * @brief Create dirctory tree to store file, with .htaccess and index.html files
 	 * @param string $file Path and filename
+	 * @throws StorageException
 	 */
 	private static function createFoldersForFile($file)
 	{

src/Model/Term.php

@@ -192,7 +192,9 @@ class Term
 
 	/**
 	 * @param integer $itemid item id
+	 * @param         $files
 	 * @return void
+	 * @throws \Exception
 	 */
 	public static function insertFromFileFieldByItemId($itemid, $files)
 	{
@@ -241,6 +243,8 @@ class Term
 	 *
 	 * @param array $item
 	 * @return array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function populateTagsFromItem(&$item)
 	{
@@ -291,8 +295,10 @@ class Term
 
 	/**
 	 * Delete all tags from an item
+	 *
 	 * @param int itemid - choose from which item the tags will be removed
-	 * @param array type - items type. default is [TERM_HASHTAG, TERM_MENTION]
+	 * @param array $type
+	 * @throws \Exception
 	 */
 	public static function deleteByItemId($itemid, $type = [TERM_HASHTAG, TERM_MENTION])
 	{

src/Model/User.php

@@ -34,6 +34,7 @@ class User
 	 *
 	 * @param  integer $uid
 	 * @return boolean
+	 * @throws Exception
 	 */
 	public static function exists($uid)
 	{
@@ -43,6 +44,7 @@ class User
 	/**
 	 * @param  integer       $uid
 	 * @return array|boolean User record if it exists, false otherwise
+	 * @throws Exception
 	 */
 	public static function getById($uid)
 	{
@@ -55,6 +57,7 @@ class User
 	 * @param string $url
 	 *
 	 * @return integer user id
+	 * @throws Exception
 	 */
 	public static function getIdForURL($url)
 	{
@@ -71,6 +74,7 @@ class User
 	 *
 	 * @param int $uid
 	 * @return boolean|array
+	 * @throws Exception
 	 */
 	public static function getOwnerDataById($uid) {
 		$r = DBA::fetchFirst("SELECT
@@ -115,6 +119,7 @@ class User
 	 *
 	 * @param int $nick
 	 * @return boolean|array
+	 * @throws Exception
 	 */
 	public static function getOwnerDataByNick($nick)
 	{
@@ -134,6 +139,7 @@ class User
 	 * @param string $network network name
 	 *
 	 * @return int group id
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getDefaultGroup($uid, $network = '')
 	{
@@ -364,6 +370,7 @@ class User
 	 * @param int    $uid
 	 * @param string $pasword_hashed
 	 * @return bool
+	 * @throws Exception
 	 */
 	private static function updatePasswordHashed($uid, $pasword_hashed)
 	{
@@ -385,6 +392,7 @@ class User
 	 *
 	 * @param string $nickname The nickname that should be checked
 	 * @return boolean True is the nickname is blocked on the node
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function isNicknameBlocked($nickname)
 	{
@@ -422,6 +430,7 @@ class User
 	 * @return array
 	 * @throws \ErrorException
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 * @throws Exception
 	 */
 	public static function create(array $data)
@@ -807,7 +816,8 @@ class User
 
 	/**
 	 * @param object $uid user to remove
-	 * @return void
+	 * @return bool
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function remove($uid)
 	{
@@ -860,6 +870,7 @@ class User
 	 *            'nickname' => 'John Doe'
 	 *        ]
 	 *    ]
+	 * @throws Exception
 	 */
 	public static function identities($uid)
 	{

src/Module/Contact.php

@@ -845,8 +845,8 @@ class Contact extends BaseModule
 	 * @param array $contact    The contact array
 	 * @param int   $active_tab 1 if tab should be marked as active
 	 *
-	 * @return string | HTML string of the contact page tabs buttons.
-
+	 * @return string HTML string of the contact page tabs buttons.
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getTabsHTML($a, $contact, $active_tab)
 	{

src/Module/Install.php

@@ -254,6 +254,7 @@ class Install extends BaseModule
 	 * @param App $a The global App
 	 *
 	 * @return string The text for the next steps
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function whatNext($a)
 	{

src/Module/Login.php

@@ -79,6 +79,7 @@ class Login extends BaseModule
 	 *
 	 * @param string $openid_url OpenID URL string
 	 * @param bool   $remember   Whether to set the session remember flag
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function openIdAuthentication($openid_url, $remember)
 	{
@@ -112,6 +113,7 @@ class Login extends BaseModule
 	 * @param string $username User name
 	 * @param string $password Clear password
 	 * @param bool   $remember Whether to set the session remember flag
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function passwordAuthentication($username, $password, $remember)
 	{
@@ -277,6 +279,7 @@ class Login extends BaseModule
 	 *
 	 * @return string Returns the complete html for inserting into the page
 	 *
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @hooks 'login_hook' string $o
 	 */
 	public static function form($return_path = null, $register = false, $hiddens = [])

src/Module/Proxy.php

@@ -32,7 +32,6 @@ class Proxy extends BaseModule
 	 *
 	 * Sets application instance and checks if /proxy/ path is writable.
 	 *
-	 * @param \Friendica\App $app Application instance
 	 */
 	public static function init()
 	{
@@ -157,6 +156,7 @@ class Proxy extends BaseModule
 	 *      'size' => requested image size (int)
 	 *      'sizetype' => requested image size (string): ':micro', ':thumb', ':small', ':medium', ':large'
 	 *    ]
+	 * @throws \Exception
 	 */
 	private static function getRequestInfo()
 	{
@@ -230,6 +230,7 @@ class Proxy extends BaseModule
 	 * @brief setup ./proxy folder for direct cache
 	 *
 	 * @return bool  False if direct cache can't be used.
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function setupDirectCache()
 	{
@@ -258,6 +259,8 @@ class Proxy extends BaseModule
 	 * @return string  Cache file name, empty string if cache is not enabled.
 	 *
 	 * If cachefile exists, script ends here and this function will never returns
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function responseFromCache(&$request)
 	{
@@ -276,6 +279,8 @@ class Proxy extends BaseModule
 	 * @param array $request Array from getRequestInfo
 	 *
 	 * If the image exists in database, then script ends here and this function will never returns
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function responseFromDB(&$request) {
 	
@@ -301,7 +306,8 @@ class Proxy extends BaseModule
 	/**
 	 * @brief Output the image with cache headers
 	 *
-	 * @param Image $image
+	 * @param Image $img
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function responseImageHttpCache(Image $img)
 	{

src/Module/Tos.php

@@ -53,6 +53,7 @@ class Tos extends BaseModule
 			self::getApp()->internalRedirect('profile/' . Config::get('system','singleuser'));
 		}
 	}
+
 	/**
 	 * @brief generate the content of the /tos page
 	 *
@@ -63,7 +64,8 @@ class Tos extends BaseModule
 	 *     This privacy statement has fixed text, so it can be translated easily.
 	 *
 	 * @return string
-	 **/
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 */
 	public static function content() {
 		$tpl = Renderer::getMarkupTemplate('tos.tpl');
 		if (Config::get('system', 'tosdisplay')) {

src/Network/CurlResult.php

@@ -77,6 +77,7 @@ class CurlResult
 	 * @param string $url optional URL
 	 *
 	 * @return CurlResult a CURL with error response
+	 * @throws InternalServerErrorException
 	 */
 	public static function createErrorCurl($url = '')
 	{

src/Network/FKOAuth1.php

@@ -32,6 +32,7 @@ class FKOAuth1 extends OAuthServer
 	/**
 	 * @param string $uid user id
 	 * @return void
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	public function loginUser($uid)
 	{

src/Network/FKOAuthDataStore.php

@@ -35,6 +35,7 @@ class FKOAuthDataStore extends OAuthDataStore
 	/**
 	 * @param string $consumer_key key
 	 * @return mixed
+	 * @throws \Exception
 	 */
 	public function lookup_consumer($consumer_key)
 	{
@@ -55,6 +56,7 @@ class FKOAuthDataStore extends OAuthDataStore
 	 * @param string $token_type type
 	 * @param string $token      token
 	 * @return mixed
+	 * @throws \Exception
 	 */
 	public function lookup_token($consumer, $token_type, $token)
 	{
@@ -80,6 +82,7 @@ class FKOAuthDataStore extends OAuthDataStore
 	 * @param string $nonce     nonce
 	 * @param string $timestamp timestamp
 	 * @return mixed
+	 * @throws \Exception
 	 */
 	public function lookup_nonce($consumer, $token, $nonce, $timestamp)
 	{
@@ -95,6 +98,7 @@ class FKOAuthDataStore extends OAuthDataStore
 	 * @param string $consumer consumer
 	 * @param string $callback optional, default null
 	 * @return mixed
+	 * @throws \Exception
 	 */
 	public function new_request_token($consumer, $callback = null)
 	{
@@ -130,6 +134,7 @@ class FKOAuthDataStore extends OAuthDataStore
 	 * @param string $consumer consumer
 	 * @param string $verifier optional, defult null
 	 * @return object
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	public function new_access_token($token, $consumer, $verifier = null)
 	{

src/Network/Probe.php

@@ -97,6 +97,7 @@ class Probe
 	 * @param string $host The host part of an url
 	 *
 	 * @return array with template and type of the webfinger template for JSON or XML
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	private static function hostMeta($host)
 	{
@@ -188,6 +189,7 @@ class Probe
 	 * @param string $hcard_url Link to the hcard - is returned by reference
 	 *
 	 * @return string profile link
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	public static function webfingerDfrn($webbie, &$hcard_url)
 	{
@@ -221,6 +223,7 @@ class Probe
 	 * @param string $uri Address that should be probed
 	 *
 	 * @return array uri data
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	public static function lrdd($uri)
 	{
@@ -315,6 +318,8 @@ class Probe
 	 * @param boolean $cache   Use cached values?
 	 *
 	 * @return array uri data
+	 * @throws HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function uri($uri, $network = '', $uid = -1, $cache = true)
 	{
@@ -527,6 +532,7 @@ class Probe
 	 * @param string $type      type
 	 *
 	 * @return array fixed webfinger data
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	private static function fixOStatus($webfinger, $lrdd, $type)
 	{
@@ -572,6 +578,7 @@ class Probe
 	 * @param integer $uid     User ID for the probe (only used for mails)
 	 *
 	 * @return array uri data
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	private static function detect($uri, $network, $uid)
 	{
@@ -740,6 +747,7 @@ class Probe
 	 * @param string $type type
 	 *
 	 * @return array webfinger data
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	private static function webfinger($url, $type)
 	{
@@ -810,6 +818,7 @@ class Probe
 	 * @param array  $data         The already fetched data
 	 *
 	 * @return array noscrape data
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	private static function pollNoscrape($noscrape_url, $data)
 	{
@@ -926,6 +935,8 @@ class Probe
 	 * @param string $profile_link Link to the profile page
 	 *
 	 * @return array profile data
+	 * @throws HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function profile($profile_link)
 	{
@@ -976,6 +987,7 @@ class Probe
 	 * @param array $webfinger Webfinger data
 	 *
 	 * @return array DFRN data
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	private static function dfrn($webfinger)
 	{
@@ -1057,6 +1069,7 @@ class Probe
 	 * @param boolean $dfrn      Poll DFRN specific data
 	 *
 	 * @return array hcard data
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	private static function pollHcard($hcard_url, $data, $dfrn = false)
 	{
@@ -1181,6 +1194,7 @@ class Probe
 	 * @param array $webfinger Webfinger data
 	 *
 	 * @return array Diaspora data
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	private static function diaspora($webfinger)
 	{
@@ -1268,6 +1282,7 @@ class Probe
 	 * @param bool  $short     Short detection mode
 	 *
 	 * @return array|bool OStatus data or "false" on error or "true" on short mode
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	private static function ostatus($webfinger, $short = false)
 	{
@@ -1450,6 +1465,7 @@ class Probe
 	 *
 	 * @param array $webfinger Webfinger data
 	 *
+	 * @param       $addr
 	 * @return array pump.io data
 	 */
 	private static function pumpio($webfinger, $addr)
@@ -1552,6 +1568,7 @@ class Probe
 	 * @param boolean $probe Do a probe if the page contains a feed link
 	 *
 	 * @return array feed data
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	private static function feed($url, $probe = true)
 	{
@@ -1614,6 +1631,7 @@ class Probe
 	 * @param integer $uid User ID
 	 *
 	 * @return array mail data
+	 * @throws \Exception
 	 */
 	private static function mail($uri, $uid)
 	{
@@ -1701,6 +1719,7 @@ class Probe
 	 * @param string $base   Another path that is hopefully complete
 	 *
 	 * @return string fixed avatar path
+	 * @throws \Exception
 	 */
 	public static function fixAvatar($avatar, $base)
 	{

src/Object/Image.php

@@ -65,7 +65,8 @@ class Image
 	 * @brief Constructor
 	 * @param object  $data data
 	 * @param boolean $type optional, default null
-	 * @return object
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public function __construct($data, $type = null)
 	{
@@ -128,6 +129,8 @@ class Image
 	/**
 	 * @param object $data data
 	 * @return boolean
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private function loadData($data)
 	{
@@ -643,6 +646,7 @@ class Image
 	/**
 	 * @param string $path file path
 	 * @return mixed
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function saveToFilePath($path)
 	{
@@ -667,6 +671,7 @@ class Image
 	 * $data = (string) $Image;
 	 *
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function __toString() {
 		return $this->asString();
@@ -674,6 +679,7 @@ class Image
 
 	/**
 	 * @return mixed
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function asString()
 	{
@@ -724,6 +730,7 @@ class Image
 	 * @param string  $header   passed headers to take into account
 	 *
 	 * @return object
+	 * @throws \ImagickException
 	 */
 	public static function guessType($filename, $fromcurl = false, $header = '')
 	{
@@ -772,6 +779,7 @@ class Image
 	/**
 	 * @param string $url url
 	 * @return object
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getInfoFromURL($url)
 	{
@@ -876,11 +884,13 @@ class Image
 
 	/**
 	 * @brief This function is used by the fromgplus addon
-	 * @param object  $a         App
+	 * @param App     $a         App
 	 * @param integer $uid       user id
 	 * @param string  $imagedata optional, default empty
 	 * @param string  $url       optional, default empty
 	 * @return array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function storePhoto(App $a, $uid, $imagedata = "", $url = "")
 	{

src/Object/Post.php

@@ -61,6 +61,7 @@ class Post extends BaseObject
 	 * Constructor
 	 *
 	 * @param array $data data array
+	 * @throws \Exception
 	 */
 	public function __construct(array $data)
 	{
@@ -116,6 +117,8 @@ class Post extends BaseObject
 	 *
 	 * @return mixed The data requested on success
 	 *               false on failure
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public function getTemplateData(array $conv_responses, $thread_level = 1)
 	{
@@ -501,6 +504,7 @@ class Post extends BaseObject
 	 * @param Post $item The child item to add
 	 *
 	 * @return mixed
+	 * @throws \Exception
 	 */
 	public function addChild(Post $item)
 	{
@@ -590,6 +594,7 @@ class Post extends BaseObject
 	 * @param Post $item The child to be removed
 	 *
 	 * @return boolean Success or failure
+	 * @throws \Exception
 	 */
 	public function removeChild(Post $item)
 	{
@@ -679,6 +684,7 @@ class Post extends BaseObject
 	 *
 	 * @param string $name template name
 	 * @return bool
+	 * @throws \Exception
 	 */
 	private function setTemplate($name)
 	{
@@ -770,6 +776,7 @@ class Post extends BaseObject
 	 *
 	 * @return mixed The comment box string (empty if no comment box)
 	 *               false on failure
+	 * @throws \Exception
 	 */
 	private function getCommentBox($indent)
 	{
@@ -849,6 +856,7 @@ class Post extends BaseObject
 	 * Check if we are a wall to wall item and set the relevant properties
 	 *
 	 * @return void
+	 * @throws \Exception
 	 */
 	protected function checkWallToWall()
 	{

src/Object/Thread.php

@@ -29,6 +29,7 @@ class Thread extends BaseObject
 	 * @param string  $mode     The mode
 	 * @param boolean $preview  Are we in the preview mode?
 	 * @param boolean $writable Override the writable check
+	 * @throws \Exception
 	 */
 	public function __construct($mode, $preview, $writable = false)
 	{
@@ -43,6 +44,7 @@ class Thread extends BaseObject
 	 * @param boolean $writable Override the writable check
 	 *
 	 * @return void
+	 * @throws \Exception
 	 */
 	private function setMode($mode, $writable)
 	{
@@ -125,10 +127,11 @@ class Thread extends BaseObject
 	/**
 	 * Add a thread to the conversation
 	 *
-	 * @param object $item The item to insert
+	 * @param Post $item The item to insert
 	 *
 	 * @return mixed The inserted item on success
 	 *               false on failure
+	 * @throws \Exception
 	 */
 	public function addParent(Post $item)
 	{
@@ -172,6 +175,7 @@ class Thread extends BaseObject
 	 *
 	 * @return mixed The data requested on success
 	 *               false on failure
+	 * @throws \Exception
 	 */
 	public function getTemplateData($conv_responses)
 	{

src/Protocol/ActivityPub.php

@@ -49,7 +49,7 @@ class ActivityPub
 	/**
 	 * Checks if the web request is done for the AP protocol
 	 *
-	 * @return is it AP?
+	 * @return bool is it AP?
 	 */
 	public static function isRequest()
 	{
@@ -63,6 +63,7 @@ class ActivityPub
 	 * @param string  $url content url
 	 * @param integer $uid User ID for the signature
 	 * @return array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function fetchContent($url, $uid = 0)
 	{
@@ -89,6 +90,8 @@ class ActivityPub
 	 *
 	 * @param string $url profile url
 	 * @return array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function probeProfile($url)
 	{
@@ -130,6 +133,7 @@ class ActivityPub
 	 *
 	 * @param string  $url
 	 * @param integer $uid User ID
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function fetchOutbox($url, $uid)
 	{

src/Protocol/ActivityPub/Processor.php

@@ -30,7 +30,7 @@ class Processor
 	 *
 	 * @param string $body
 	 *
-	 * @return converted body
+	 * @return string converted body
 	 */
 	private static function convertMentions($body)
 	{
@@ -93,7 +93,7 @@ class Processor
 	 * @param array $attachments
 	 * @param array $item
 	 *
-	 * @return item array
+	 * @return array array
 	 */
 	private static function constructAttachList($attachments, $item)
 	{
@@ -125,6 +125,7 @@ class Processor
 	 * Updates a message
 	 *
 	 * @param array $activity Activity array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function updateItem($activity)
 	{
@@ -144,6 +145,8 @@ class Processor
 	 * Prepares data for a message
 	 *
 	 * @param array $activity Activity array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function createItem($activity)
 	{
@@ -173,6 +176,8 @@ class Processor
 	 * Delete items
 	 *
 	 * @param array $activity
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function deleteItem($activity)
 	{
@@ -187,6 +192,8 @@ class Processor
 	 *
 	 * @param array  $activity Activity array
 	 * @param string $verb     Activity verb
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function createActivity($activity, $verb)
 	{
@@ -206,6 +213,7 @@ class Processor
 	 *
 	 * @param array $activity Activity array
 	 * @param array $item
+	 * @throws \Exception
 	 */
 	public static function createEvent($activity, $item)
 	{
@@ -239,6 +247,8 @@ class Processor
 	 *
 	 * @param array $activity Activity data
 	 * @param array $item     item array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function postItem($activity, $item)
 	{
@@ -327,6 +337,7 @@ class Processor
 	 *
 	 * @param $url
 	 * @param $child
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function fetchMissingActivity($url, $child)
 	{
@@ -370,6 +381,8 @@ class Processor
 	 * perform a "follow" request
 	 *
 	 * @param array $activity
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function followUser($activity)
 	{
@@ -412,6 +425,7 @@ class Processor
 	 * Update the given profile
 	 *
 	 * @param array $activity
+	 * @throws \Exception
 	 */
 	public static function updatePerson($activity)
 	{
@@ -427,6 +441,7 @@ class Processor
 	 * Delete the given profile
 	 *
 	 * @param array $activity
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function deletePerson($activity)
 	{
@@ -453,6 +468,8 @@ class Processor
 	 * Accept a follow request
 	 *
 	 * @param array $activity
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function acceptFollowUser($activity)
 	{
@@ -487,6 +504,8 @@ class Processor
 	 * Reject a follow request
 	 *
 	 * @param array $activity
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function rejectFollowUser($activity)
 	{
@@ -517,6 +536,8 @@ class Processor
 	 * Undo activity like "like" or "dislike"
 	 *
 	 * @param array $activity
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function undoActivity($activity)
 	{
@@ -540,6 +561,8 @@ class Processor
 	 * Activity to remove a follower
 	 *
 	 * @param array $activity
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function undoFollowUser($activity)
 	{
@@ -571,6 +594,7 @@ class Processor
 	 * Switches a contact to AP if needed
 	 *
 	 * @param integer $cid Contact ID
+	 * @throws \Exception
 	 */
 	private static function switchContact($cid)
 	{

src/Protocol/ActivityPub/Receiver.php

@@ -42,7 +42,7 @@ class Receiver
 	/**
 	 * Checks if the web request is done for the AP protocol
 	 *
-	 * @return is it AP?
+	 * @return bool is it AP?
 	 */
 	public static function isRequest()
 	{
@@ -56,6 +56,7 @@ class Receiver
 	 * @param         $body
 	 * @param         $header
 	 * @param integer $uid User ID
+	 * @throws \Exception
 	 */
 	public static function processInbox($body, $header, $uid)
 	{
@@ -117,6 +118,8 @@ class Receiver
 	 * @param integer $uid       User ID
 	 *
 	 * @return string with object type
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function fetchObjectType($activity, $object_id, $uid = 0)
 	{
@@ -157,6 +160,8 @@ class Receiver
 	 * @param         $trust_source
 	 *
 	 * @return array with object data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function prepareObjectData($activity, $uid, &$trust_source)
 	{
@@ -264,6 +269,7 @@ class Receiver
 	 *
 	 * @param array  $activity Array with activity data
 	 * @param string $body     The raw message
+	 * @throws \Exception
 	 */
 	private static function storeConversation($activity, $body)
 	{
@@ -290,6 +296,7 @@ class Receiver
 	 * @param string  $body
 	 * @param integer $uid          User ID
 	 * @param boolean $trust_source Do we trust the source?
+	 * @throws \Exception
 	 */
 	public static function processActivity($activity, $body = '', $uid = null, $trust_source = false)
 	{
@@ -433,6 +440,7 @@ class Receiver
 	 * @param array  $tags
 	 *
 	 * @return array with receivers (user id)
+	 * @throws \Exception
 	 */
 	private static function getReceivers($activity, $actor, $tags = [])
 	{
@@ -526,6 +534,7 @@ class Receiver
 	 * @param array  $tags
 	 *
 	 * @return array with receivers (user id)
+	 * @throws \Exception
 	 */
 	public static function getReceiverForActor($actor, $tags)
 	{
@@ -550,7 +559,8 @@ class Receiver
 	 * @param string $actor
 	 * @param array  $tags
 	 *
-	 * @return array with receivers (user id)
+	 * @return bool with receivers (user id)
+	 * @throws \Exception
 	 */
 	private static function isValidReceiverForActor($contact, $actor, $tags)
 	{
@@ -590,6 +600,8 @@ class Receiver
 	 * @param integer $cid Contact ID
 	 * @param integer $uid User ID
 	 * @param string  $url Profile URL
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function switchContact($cid, $uid, $url)
 	{
@@ -622,6 +634,8 @@ class Receiver
 	 *
 	 * @param $receivers
 	 * @param $actor
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function switchContacts($receivers, $actor)
 	{
@@ -648,7 +662,7 @@ class Receiver
 	 * @param       $object_data
 	 * @param array $activity
 	 *
-	 * @return
+	 * @return mixed
 	 */
 	private static function addActivityFields($object_data, $activity)
 	{
@@ -674,6 +688,8 @@ class Receiver
 	 * @param integer $uid          User ID for the signature that we use to fetch data
 	 *
 	 * @return array with trusted and valid object data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function fetchObject($object_id, $object = [], $trust_source = false, $uid = 0)
 	{
@@ -759,8 +775,7 @@ class Receiver
 	/**
 	 * Convert emojis from JSON-LD format into a simplified format
 	 *
-	 * @param array $tags Tags in JSON-LD format
-	 *
+	 * @param $emojis
 	 * @return array with emojis in a simplified format
 	 */
 	private static function processEmojis($emojis)
@@ -819,6 +834,7 @@ class Receiver
 	 * @param array $object
 	 *
 	 * @return array
+	 * @throws \Exception
 	 */
 	private static function processObject($object)
 	{

src/Protocol/ActivityPub/Transmitter.php

@@ -46,6 +46,7 @@ class Transmitter
 	 * @param integer $page  Page number
 	 *
 	 * @return array of owners
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getFollowers($owner, $page = null)
 	{
@@ -93,6 +94,7 @@ class Transmitter
 	 * @param integer $page  Page numbe
 	 *
 	 * @return array of following contacts
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getFollowing($owner, $page = null)
 	{
@@ -140,6 +142,8 @@ class Transmitter
 	 * @param integer $page  Page numbe
 	 *
 	 * @return array of posts
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function getOutbox($owner, $page = null)
 	{
@@ -186,6 +190,7 @@ class Transmitter
 	 *
 	 * @param integer $uid User ID
 	 * @return array with profile data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getProfile($uid)
 	{
@@ -246,6 +251,8 @@ class Transmitter
 	 * @param array $item
 	 *
 	 * @return array with permissions
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function fetchPermissionBlockFromConversation($item)
 	{
@@ -300,6 +307,8 @@ class Transmitter
 	 * @param boolean $last_id
 	 *
 	 * @return array with permission data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function createPermissionBlockForItem($item, $blindcopy, $last_id = 0)
 	{
@@ -445,6 +454,8 @@ class Transmitter
 	 * @param boolean $personal fetch personal inboxes
 	 *
 	 * @return array of follower inboxes
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function fetchTargetInboxesforUser($uid, $personal = false)
 	{
@@ -492,6 +503,8 @@ class Transmitter
 	 * @param integer $last_id Last item id for adding receivers
 	 *
 	 * @return array with inboxes
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function fetchTargetInboxes($item, $uid, $personal = false, $last_id = 0)
 	{
@@ -545,6 +558,8 @@ class Transmitter
 	 * @param array $item
 	 *
 	 * @return string with activity type
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function getTypeOfItem($item)
 	{
@@ -588,6 +603,7 @@ class Transmitter
 	 * @param boolean $force Force new cache entry
 	 *
 	 * @return array with the activity
+	 * @throws \Exception
 	 */
 	public static function createCachedActivityFromItem($item_id, $force = false)
 	{
@@ -613,6 +629,7 @@ class Transmitter
 	 * @param boolean $object_mode Is the activity item is used inside another object?
 	 *
 	 * @return array of activity
+	 * @throws \Exception
 	 */
 	public static function createActivityFromItem($item_id, $object_mode = false)
 	{
@@ -692,6 +709,8 @@ class Transmitter
 	 * @param integer $item_id
 	 *
 	 * @return array with the object data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function createObjectFromItemID($item_id)
 	{
@@ -747,6 +766,7 @@ class Transmitter
 	 * @param array $item
 	 *
 	 * @return array of tags
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function createTagList($item)
 	{
@@ -775,9 +795,10 @@ class Transmitter
 	 * Adds attachment data to the JSON document
 	 *
 	 * @param array  $item Data of the item that is to be posted
-	 * @param text $type Object type
+	 * @param string $type Object type
 	 *
 	 * @return array with attachment data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function createAttachmentList($item, $type)
 	{
@@ -831,6 +852,7 @@ class Transmitter
 	 *
 	 * @param array $match Matching values for the callback
 	 * @return string Replaced mention
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function mentionCallback($match)
 	{
@@ -870,6 +892,7 @@ class Transmitter
 	 * @param array $item
 	 *
 	 * @return string with context url
+	 * @throws \Exception
 	 */
 	private static function fetchContextURLForItem($item)
 	{
@@ -890,6 +913,7 @@ class Transmitter
 	 * @param integer $item_id
 	 *
 	 * @return boolean
+	 * @throws \Exception
 	 */
 	private static function isSensitive($item_id)
 	{
@@ -903,6 +927,7 @@ class Transmitter
 	 * @param array $item
 	 *
 	 * @return array with the event data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function createEvent($item)
 	{
@@ -929,6 +954,8 @@ class Transmitter
 	 * @param array $item
 	 *
 	 * @return array with the object data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function createNote($item)
 	{
@@ -1019,6 +1046,8 @@ class Transmitter
 	 * @param array $item
 	 *
 	 * @return string with announced object url
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function createAnnounce($item)
 	{
@@ -1067,6 +1096,7 @@ class Transmitter
 	 * @param integer $suggestion_id Suggestion ID
 	 *
 	 * @return boolean was the transmission successful?
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function sendContactSuggestion($uid, $inbox, $suggestion_id)
 	{
@@ -1097,6 +1127,7 @@ class Transmitter
 	 * @param string  $inbox Target inbox
 	 *
 	 * @return boolean was the transmission successful?
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function sendProfileRelocation($uid, $inbox)
 	{
@@ -1125,6 +1156,7 @@ class Transmitter
 	 * @param string  $inbox Target inbox
 	 *
 	 * @return boolean was the transmission successful?
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function sendProfileDeletion($uid, $inbox)
 	{
@@ -1153,6 +1185,8 @@ class Transmitter
 	 * @param string  $inbox Target inbox
 	 *
 	 * @return boolean was the transmission successful?
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function sendProfileUpdate($uid, $inbox)
 	{
@@ -1181,7 +1215,9 @@ class Transmitter
 	 * @param array   $activity
 	 * @param string  $target Target profile
 	 * @param integer $uid    User ID
-	 * @param string $id activity id
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 * @throws \Exception
 	 */
 	public static function sendActivity($activity, $target, $uid, $id = '')
 	{
@@ -1213,6 +1249,8 @@ class Transmitter
 	 * @param string  $target Target profile
 	 * @param         $id
 	 * @param integer $uid    User ID
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function sendContactAccept($target, $id, $uid)
 	{
@@ -1241,6 +1279,8 @@ class Transmitter
 	 * @param string  $target Target profile
 	 * @param         $id
 	 * @param integer $uid    User ID
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function sendContactReject($target, $id, $uid)
 	{
@@ -1267,8 +1307,10 @@ class Transmitter
 	 * Transmits a message that we don't want to follow this contact anymore
 	 *
 	 * @param string  $target Target profile
-	 * @param integer $cid Contact ID of target
 	 * @param integer $uid    User ID
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 * @throws \Exception
 	 */
 	public static function sendContactUndo($target, $cid, $uid)
 	{

src/Protocol/DFRN.php

@@ -56,6 +56,7 @@ class DFRN
 	 * @param integer $uid User id
 	 *
 	 * @return array importer
+	 * @throws \Exception
 	 */
 	public static function getImporter($cid, $uid = 0)
 	{
@@ -96,6 +97,8 @@ class DFRN
 	 * @param array $owner Owner record
 	 *
 	 * @return string DFRN entries
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 * @todo  Find proper type-hints
 	 */
 	public static function entries($items, $owner)
@@ -134,6 +137,8 @@ class DFRN
 	 * @param boolean $onlyheader  Output only the header without content? (Default is "no")
 	 *
 	 * @return string DFRN feed entries
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function feed($dfrn_id, $owner_nick, $last_update, $direction = 0, $onlyheader = false)
 	{
@@ -341,6 +346,8 @@ class DFRN
 	 * @param boolean $conversation Show the conversation. If false show the single post.
 	 *
 	 * @return string DFRN feed entry
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function itemFeed($item_id, $conversation = false)
 	{
@@ -406,6 +413,7 @@ class DFRN
 	 * @param array $owner Owner record
 	 *
 	 * @return string DFRN mail
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @todo  Find proper type-hints
 	 */
 	public static function mail($item, $owner)
@@ -442,6 +450,7 @@ class DFRN
 	 * @param array $owner Owner record
 	 *
 	 * @return string DFRN suggestions
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @todo  Find proper type-hints
 	 */
 	public static function fsuggest($item, $owner)
@@ -471,6 +480,7 @@ class DFRN
 	 * @param int   $uid   User ID
 	 *
 	 * @return string DFRN relocations
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @todo  Find proper type-hints
 	 */
 	public static function relocate($owner, $uid)
@@ -532,6 +542,7 @@ class DFRN
 	 * @param bool   $public        Is it a header for public posts?
 	 *
 	 * @return object XML root object
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @todo  Find proper type-hints
 	 */
 	private static function addHeader($doc, $owner, $authorelement, $alternatelink = "", $public = false)
@@ -608,6 +619,7 @@ class DFRN
 	 * @param boolean $public        boolean
 	 *
 	 * @return object XML author object
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @todo  Find proper type-hints
 	 */
 	private static function addAuthor($doc, $owner, $authorelement, $public)
@@ -752,6 +764,7 @@ class DFRN
 	 * @param array  $item        Item elements
 	 *
 	 * @return object XML author object
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @todo  Find proper type-hints
 	 */
 	private static function addEntryAuthor($doc, $element, $contact_url, $item)
@@ -793,6 +806,7 @@ class DFRN
 	 * @param string $activity activity value
 	 *
 	 * @return object XML activity object
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @todo  Find proper type-hints
 	 */
 	private static function createActivity($doc, $element, $activity)
@@ -858,7 +872,7 @@ class DFRN
 	 * @param object $root XML root
 	 * @param array  $item Item element
 	 *
-	 * @return object XML attachment object
+	 * @return void XML attachment object
 	 * @todo  Find proper type-hints
 	 */
 	private static function getAttachment($doc, $root, $item)
@@ -899,6 +913,8 @@ class DFRN
 	 * @param bool   $single  If set, the entry is created as an XML document with a single "entry" element
 	 *
 	 * @return object XML entry object
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 * @todo  Find proper type-hints
 	 */
 	private static function entry($doc, $type, array $item, array $owner, $comment = false, $cid = 0, $single = false)
@@ -1155,7 +1171,10 @@ class DFRN
 	 * @param string $atom     Content that will be transmitted
 	 * @param bool   $dissolve (to be documented)
 	 *
+	 * @param bool   $legacy_transport
 	 * @return int Deliver status. Negative values mean an error.
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 * @todo  Add array type-hint for $owner, $contact
 	 */
 	public static function deliver($owner, $contact, $atom, $dissolve = false, $legacy_transport = false)
@@ -1416,7 +1435,10 @@ class DFRN
 	 * @param array  $contact Contact record of the receiver
 	 * @param string $atom    Content that will be transmitted
 	 *
+	 * @param bool   $public_batch
 	 * @return int Deliver status. Negative values mean an error.
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function transmit($owner, $contact, $atom, $public_batch = false)
 	{
@@ -1514,6 +1536,8 @@ class DFRN
 	 * @param string $xml       optional, default empty
 	 *
 	 * @return array Relevant data of the author
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 * @todo  Find good type-hints for all parameter
 	 */
 	private static function fetchauthor($xpath, $context, $importer, $element, $onlyfetch, $xml = "")
@@ -1835,6 +1859,7 @@ class DFRN
 	 * @param object $mail     mail elements
 	 * @param array  $importer Record of the importer user mixed with contact of the content
 	 * @return void
+	 * @throws \Exception
 	 * @todo  Find good type-hints for all parameter
 	 */
 	private static function processMail($xpath, $mail, $importer)
@@ -1890,6 +1915,7 @@ class DFRN
 	 * @param object $suggestion suggestion elements
 	 * @param array  $importer   Record of the importer user mixed with contact of the content
 	 * @return boolean
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @todo  Find good type-hints for all parameter
 	 */
 	private static function processSuggestion($xpath, $suggestion, $importer)
@@ -2008,6 +2034,8 @@ class DFRN
 	 * @param object $relocation relocation elements
 	 * @param array  $importer   Record of the importer user mixed with contact of the content
 	 * @return boolean
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 * @todo  Find good type-hints for all parameter
 	 */
 	private static function processRelocation($xpath, $relocation, $importer)
@@ -2092,6 +2120,7 @@ class DFRN
 	 * @param array $importer  Record of the importer user mixed with contact of the content
 	 * @param int   $entrytype Is it a toplevel entry, a comment or a relayed comment?
 	 * @return mixed
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @todo  set proper type-hints (array?)
 	 */
 	private static function updateContent($current, $item, $importer, $entrytype)
@@ -2123,6 +2152,7 @@ class DFRN
 	 * @param array $item     the new item record
 	 *
 	 * @return int Is it a toplevel entry, a comment or a relayed comment?
+	 * @throws \Exception
 	 * @todo  set proper type-hints (array?)
 	 */
 	private static function getEntryType($importer, $item)
@@ -2190,6 +2220,7 @@ class DFRN
 	 * @param array $importer  Record of the importer user mixed with contact of the content
 	 * @param int   $posted_id The record number of item record that was just posted
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @todo  set proper type-hints (array?)
 	 */
 	private static function doPoke($item, $importer, $posted_id)
@@ -2253,6 +2284,7 @@ class DFRN
 	 * @param bool  $is_like   Is the verb a "like"?
 	 *
 	 * @return bool Should the processing of the entries be continued?
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @todo  set proper type-hints (array?)
 	 */
 	private static function processVerbs($entrytype, $importer, &$item, &$is_like)
@@ -2400,6 +2432,8 @@ class DFRN
 	 * @param array  $importer Record of the importer user mixed with contact of the content
 	 * @param object $xml      xml
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 * @todo  Add type-hints
 	 */
 	private static function processEntry($header, $xpath, $entry, $importer, $xml)
@@ -2741,6 +2775,7 @@ class DFRN
 	 * @param object $deletion deletion elements
 	 * @param array  $importer Record of the importer user mixed with contact of the content
 	 * @return void
+	 * @throws \Exception
 	 * @todo  set proper type-hints
 	 */
 	private static function processDeletion($xpath, $deletion, $importer)
@@ -2801,6 +2836,8 @@ class DFRN
 	 * @param array  $importer     Record of the importer user mixed with contact of the content
 	 * @param bool   $sort_by_date Is used when feeds are polled
 	 * @return integer Import status
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 * @todo  set proper type-hints
 	 */
 	public static function import($xml, $importer, $sort_by_date = false)
@@ -2938,6 +2975,7 @@ class DFRN
 	/**
 	 * @param App    $a            App
 	 * @param string $contact_nick contact nickname
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function autoRedir(App $a, $contact_nick)
 	{
@@ -3091,6 +3129,10 @@ class DFRN
 	 * item is assumed to be up-to-date.  If the timestamps are equal it
 	 * assumes the update has been seen before and should be ignored.
 	 *
+	 * @param $existing
+	 * @param $update
+	 * @return bool
+	 * @throws \Exception
 	 */
 	private static function isEditedTimestampNewer($existing, $update)
 	{

src/Protocol/Diaspora.php

@@ -53,6 +53,7 @@ class Diaspora
 	 * @param array   $contacts The previously fetched contacts
 	 *
 	 * @return array of relay servers
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function relayList($item_id, array $contacts = [])
 	{
@@ -138,6 +139,7 @@ class Diaspora
 	 *
 	 * @param string $server_url The url of the server
 	 * @return array with the contact
+	 * @throws \Exception
 	 */
 	private static function getRelayContact($server_url)
 	{
@@ -171,6 +173,7 @@ class Diaspora
 	 *
 	 * @param string $server_url     The url of the server
 	 * @param array  $network_fields Optional network specific fields
+	 * @throws \Exception
 	 */
 	public static function setRelayContact($server_url, array $network_fields = [])
 	{
@@ -204,6 +207,7 @@ class Diaspora
 	 * @param array   $contacts The previously fetched contacts
 	 *
 	 * @return array of relay servers
+	 * @throws \Exception
 	 */
 	public static function participantsForThread($thread, array $contacts)
 	{
@@ -250,6 +254,7 @@ class Diaspora
 	 * @param integer $level     This value is only set inside this function to avoid endless loops
 	 *
 	 * @return string the repaired signature
+	 * @throws \Exception
 	 */
 	private static function repairSignature($signature, $handle = "", $level = 1)
 	{
@@ -276,6 +281,8 @@ class Diaspora
 	 * @param string $envelope The magic envelope
 	 *
 	 * @return string verified data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function verifyMagicEnvelope($envelope)
 	{
@@ -372,6 +379,8 @@ class Diaspora
 	 * 'message' -> decoded Diaspora XML message
 	 * 'author' -> author diaspora handle
 	 * 'key' -> author public key (converted to pkcs#8)
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function decodeRaw(array $importer, $raw, $no_exit = false)
 	{
@@ -475,6 +484,8 @@ class Diaspora
 	 * 'message' -> decoded Diaspora XML message
 	 * 'author' -> author diaspora handle
 	 * 'key' -> author public key (converted to pkcs#8)
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function decode(array $importer, $xml)
 	{
@@ -612,6 +623,8 @@ class Diaspora
 	 * @param array $msg The post that will be dispatched
 	 *
 	 * @return int The message id of the generated message, "true" or "false" if there was an error
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function dispatchPublic($msg)
 	{
@@ -640,6 +653,8 @@ class Diaspora
 	 * @param object $fields   SimpleXML object that contains the message
 	 *
 	 * @return int The message id of the generated message, "true" or "false" if there was an error
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function dispatch(array $importer, $msg, $fields = null)
 	{
@@ -746,6 +761,8 @@ class Diaspora
 	 * @param array $msg Array with the XML, the sender handle and the sender signature
 	 *
 	 * @return bool|array If the posting is valid then an array with an SimpleXML object is returned
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function validPosting($msg)
 	{
@@ -894,6 +911,8 @@ class Diaspora
 	 * @param string $handle The handle
 	 *
 	 * @return string The public key
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function key($handle)
 	{
@@ -915,6 +934,8 @@ class Diaspora
 	 * @param string $handle The handle
 	 *
 	 * @return array the queried data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function personByHandle($handle)
 	{
@@ -960,6 +981,7 @@ class Diaspora
 	 * @brief Updates the fcontact table
 	 *
 	 * @param array $arr The fcontact data
+	 * @throws \Exception
 	 */
 	private static function updateFContact($arr)
 	{
@@ -983,6 +1005,7 @@ class Diaspora
 	 * @param int $pcontact_id The id in the contact table (Used for the public contact)
 	 *
 	 * @return string the handle
+	 * @throws \Exception
 	 */
 	private static function handleFromContact($contact_id, $pcontact_id = 0)
 	{
@@ -1029,6 +1052,7 @@ class Diaspora
 	 * @param mixed $fcontact_guid Hexadecimal string guid
 	 *
 	 * @return string the contact url or null
+	 * @throws \Exception
 	 */
 	public static function urlFromContactGuid($fcontact_guid)
 	{
@@ -1056,6 +1080,8 @@ class Diaspora
 	 * @param string $handle The handle in the format user@domain.tld
 	 *
 	 * @return int Contact id
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function contactByHandle($uid, $handle)
 	{
@@ -1139,6 +1165,7 @@ class Diaspora
 	 * @param bool   $is_comment Is the check for a comment?
 	 *
 	 * @return array The contact data
+	 * @throws \Exception
 	 */
 	private static function allowedContactByHandle(array $importer, $handle, $is_comment = false)
 	{
@@ -1169,6 +1196,7 @@ class Diaspora
 	 * @param string $guid The guid of the message
 	 *
 	 * @return int|bool message id if the message already was stored into the system - or false.
+	 * @throws \Exception
 	 */
 	private static function messageExists($uid, $guid)
 	{
@@ -1249,6 +1277,8 @@ class Diaspora
 	 * @param array $match array containing a link that has to be checked for a message link
 	 * @param array $item  The item array
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function fetchGuidSub($match, $item)
 	{
@@ -1265,6 +1295,8 @@ class Diaspora
 	 * @param int    $uid    The user id of the user
 	 *
 	 * @return int the message id of the stored message or false
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function storeByGuid($guid, $server, $uid = 0)
 	{
@@ -1301,6 +1333,7 @@ class Diaspora
 	 *      'message' => The message XML
 	 *      'author' => The author handle
 	 *      'key' => The public key of the author
+	 * @throws \Exception
 	 */
 	private static function message($guid, $server, $level = 0)
 	{
@@ -1377,6 +1410,7 @@ class Diaspora
 	 * @param array  $contact The contact of the item owner
 	 *
 	 * @return array the item record
+	 * @throws \Exception
 	 */
 	private static function parentItem($uid, $guid, $author, array $contact)
 	{
@@ -1421,6 +1455,7 @@ class Diaspora
 	 * @return array
 	 *      'cid' => contact id
 	 *      'network' => network type
+	 * @throws \Exception
 	 */
 	private static function authorContactByUrl($def_contact, $person, $uid)
 	{
@@ -1457,6 +1492,8 @@ class Diaspora
 	 * @param string $parent_guid optional parent guid
 	 *
 	 * @return string the post link
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function plink($addr, $guid, $parent_guid = '')
 	{
@@ -1493,6 +1530,8 @@ class Diaspora
 	 * @param object $data     The message object
 	 *
 	 * @return bool Success
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function receiveAccountMigration(array $importer, $data)
 	{
@@ -1553,6 +1592,7 @@ class Diaspora
 	 * @param object $data The message object
 	 *
 	 * @return bool Success
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function receiveAccountDeletion($data)
 	{
@@ -1578,6 +1618,8 @@ class Diaspora
 	 * @param boolean $onlyfound Only return uri when found in the database
 	 *
 	 * @return string The constructed uri or the one from our database
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function getUriFromGuid($author, $guid, $onlyfound = false)
 	{
@@ -1604,6 +1646,7 @@ class Diaspora
 	 * @param string $uid Author handle
 	 *
 	 * @return string The post guid
+	 * @throws \Exception
 	 */
 	private static function getGuidFromUri($uri, $uid)
 	{
@@ -1621,6 +1664,7 @@ class Diaspora
 	 * @param string $guid The guid of the item
 	 *
 	 * @return array|boolean the origin owner of that post - or false
+	 * @throws \Exception
 	 */
 	private static function importerForGuid($guid)
 	{
@@ -1644,6 +1688,8 @@ class Diaspora
 	 * @param string $xml      The original XML of the message
 	 *
 	 * @return int The message id of the generated comment or "false" if there was an error
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function receiveComment(array $importer, $sender, $data, $xml)
 	{
@@ -1761,6 +1807,7 @@ class Diaspora
 	 * @param array  $conversation The conversation record to which this message belongs
 	 *
 	 * @return bool "true" if it was successful
+	 * @throws \Exception
 	 */
 	private static function receiveConversationMessage(array $importer, array $contact, $data, $msg, $mesg, $conversation)
 	{
@@ -1850,6 +1897,7 @@ class Diaspora
 	 * @param object $data     The message object
 	 *
 	 * @return bool Success
+	 * @throws \Exception
 	 */
 	private static function receiveConversation(array $importer, $msg, $data)
 	{
@@ -1908,6 +1956,8 @@ class Diaspora
 	 * @param object $data     The message object
 	 *
 	 * @return int The message id of the generated like or "false" if there was an error
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function receiveLike(array $importer, $sender, $data)
 	{
@@ -2017,6 +2067,7 @@ class Diaspora
 	 * @param object $data     The message object
 	 *
 	 * @return bool Success?
+	 * @throws \Exception
 	 */
 	private static function receiveMessage(array $importer, $data)
 	{
@@ -2109,6 +2160,8 @@ class Diaspora
 	 * @param object $data     The message object
 	 *
 	 * @return bool always true
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function receiveParticipation(array $importer, $data)
 	{
@@ -2202,6 +2255,8 @@ class Diaspora
 	 * @param object $data     The message object
 	 *
 	 * @return bool Success
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function receiveProfile(array $importer, $data)
 	{
@@ -2295,6 +2350,7 @@ class Diaspora
 	 * @param array $importer Array of the importer user
 	 * @param array $contact  The contact that send the request
 	 * @return void
+	 * @throws \Exception
 	 */
 	private static function receiveRequestMakeFriend(array $importer, array $contact)
 	{
@@ -2316,6 +2372,7 @@ class Diaspora
 	 * @param object $data     The message object
 	 *
 	 * @return bool Success
+	 * @throws \Exception
 	 */
 	private static function receiveContactRequest(array $importer, $data)
 	{
@@ -2496,9 +2553,9 @@ class Diaspora
 	 *
 	 * @param string $guid        message guid
 	 * @param string $orig_author handle of the original post
-	 * @param string $author      handle of the sharer
-	 *
 	 * @return array The fetched item
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function originalItem($guid, $orig_author)
 	{
@@ -2579,6 +2636,8 @@ class Diaspora
 	 * @param string $xml      The original XML of the message
 	 *
 	 * @return int the message id
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function receiveReshare(array $importer, $data, $xml)
 	{
@@ -2671,6 +2730,7 @@ class Diaspora
 	 * @param object $data     The message object
 	 *
 	 * @return bool success
+	 * @throws \Exception
 	 */
 	private static function itemRetraction(array $importer, array $contact, $data)
 	{
@@ -2735,6 +2795,7 @@ class Diaspora
 	 * @param object $data     The message object
 	 *
 	 * @return bool Success
+	 * @throws \Exception
 	 */
 	private static function receiveRetraction(array $importer, $sender, $data)
 	{
@@ -2776,10 +2837,12 @@ class Diaspora
 	 * @brief Receives status messages
 	 *
 	 * @param array            $importer Array of the importer user
-	 * @param object $data     The message object
+	 * @param SimpleXMLElement $data     The message object
 	 * @param string           $xml      The original XML of the message
 	 *
 	 * @return int The message id of the newly created item
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function receiveStatusMessage(array $importer, SimpleXMLElement $data, $xml)
 	{
@@ -2900,6 +2963,7 @@ class Diaspora
 	 * @param array $contact contact array
 	 *
 	 * @return string the handle in the format user@domain.tld
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function myHandle(array $contact)
 	{
@@ -2929,6 +2993,7 @@ class Diaspora
 	 * @param string $pubkey  The public key of the receiver
 	 *
 	 * @return string The encrypted data
+	 * @throws \Exception
 	 */
 	public static function encodePrivateData($msg, array $user, array $contact, $prvkey, $pubkey)
 	{
@@ -2967,6 +3032,7 @@ class Diaspora
 	 * @param array  $user The record of the sender
 	 *
 	 * @return string The envelope
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function buildMagicEnvelope($msg, array $user)
 	{
@@ -3010,6 +3076,7 @@ class Diaspora
 	 * @param bool   $public  Is the message public?
 	 *
 	 * @return string The message that will be transmitted to other servers
+	 * @throws \Exception
 	 */
 	public static function buildMessage($msg, array $user, array $contact, $prvkey, $pubkey, $public = false)
 	{
@@ -3053,7 +3120,10 @@ class Diaspora
 	 * @param bool   $queue_run    Is the transmission called from the queue?
 	 * @param string $guid         message guid
 	 *
+	 * @param bool   $no_queue
 	 * @return int Result of the transmission
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function transmit(array $owner, array $contact, $envelope, $public_batch, $queue_run = false, $guid = "", $no_queue = false)
 	{
@@ -3145,6 +3215,8 @@ class Diaspora
 	 * @param bool   $spool        Should the transmission be spooled or transmitted?
 	 *
 	 * @return int Result of the transmission
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function buildAndTransmit(array $owner, array $contact, $type, $message, $public_batch = false, $guid = "", $spool = false)
 	{
@@ -3179,6 +3251,7 @@ class Diaspora
 	 * @param array $item    Item array
 	 *
 	 * @return int The result of the transmission
+	 * @throws \Exception
 	 */
 	private static function sendParticipation(array $contact, array $item)
 	{
@@ -3228,6 +3301,8 @@ class Diaspora
 	 * @param int   $uid     User ID
 	 *
 	 * @return int The result of the transmission
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function sendAccountMigration(array $owner, array $contact, $uid)
 	{
@@ -3253,6 +3328,7 @@ class Diaspora
 	 * @param array $contact Target of the communication
 	 *
 	 * @return int The result of the transmission
+	 * @throws \Exception
 	 */
 	public static function sendShare(array $owner, array $contact)
 	{
@@ -3296,6 +3372,7 @@ class Diaspora
 	 * @param array $contact Target of the communication
 	 *
 	 * @return int The result of the transmission
+	 * @throws \Exception
 	 */
 	public static function sendUnshare(array $owner, array $contact)
 	{
@@ -3316,6 +3393,8 @@ class Diaspora
 	 * @param bool   $complete Should it be a complete check or a simple check?
 	 *
 	 * @return array|bool Reshare details or "false" if no reshare
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function isReshare($body, $complete = true)
 	{
@@ -3403,6 +3482,7 @@ class Diaspora
 	 * @param integer $event_id The id of the event
 	 *
 	 * @return array with event data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function buildEvent($event_id)
 	{
@@ -3485,6 +3565,8 @@ class Diaspora
 	 * @return array
 	 * 'type' -> Message type ("status_message" or "reshare")
 	 * 'message' -> Array of XML elements of the status
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function buildStatus(array $item, array $owner)
 	{
@@ -3599,6 +3681,8 @@ class Diaspora
 	 * @param bool  $public_batch Is it a public post?
 	 *
 	 * @return int The result of the transmission
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function sendStatus(array $item, array $owner, array $contact, $public_batch = false)
 	{
@@ -3614,6 +3698,7 @@ class Diaspora
 	 * @param array $owner the array of the item owner
 	 *
 	 * @return array The data for a "like"
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function constructLike(array $item, array $owner)
 	{
@@ -3645,6 +3730,7 @@ class Diaspora
 	 * @param array $owner the array of the item owner
 	 *
 	 * @return array The data for an "EventParticipation"
+	 * @throws \Exception
 	 */
 	private static function constructAttend(array $item, array $owner)
 	{
@@ -3682,6 +3768,7 @@ class Diaspora
 	 * @param array $owner the array of the item owner
 	 *
 	 * @return array The data for a comment
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function constructComment(array $item, array $owner)
 	{
@@ -3726,6 +3813,8 @@ class Diaspora
 	 * @param bool  $public_batch Is it a public post?
 	 *
 	 * @return int The result of the transmission
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function sendFollowup(array $item, array $owner, array $contact, $public_batch = false)
 	{
@@ -3753,9 +3842,7 @@ class Diaspora
 	 * @brief Creates a message from a signature record entry
 	 *
 	 * @param array $item The item that will be exported
-	 * @param array $signature The entry of the "sign" record
-	 *
-	 * @return string The message
+	 * @return array The message
 	 */
 	private static function messageFromSignature(array $item)
 	{
@@ -3806,6 +3893,7 @@ class Diaspora
 	 * @param bool  $public_batch Is it a public post?
 	 *
 	 * @return int The result of the transmission
+	 * @throws \Exception
 	 */
 	public static function sendRelay(array $item, array $owner, array $contact, $public_batch = false)
 	{
@@ -3862,6 +3950,7 @@ class Diaspora
 	 * @param bool  $relay        Is the retraction transmitted from a relay?
 	 *
 	 * @return int The result of the transmission
+	 * @throws \Exception
 	 */
 	public static function sendRetraction(array $item, array $owner, array $contact, $public_batch = false, $relay = false)
 	{
@@ -3894,6 +3983,8 @@ class Diaspora
 	 * @param array $contact Target of the communication
 	 *
 	 * @return int The result of the transmission
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function sendMail(array $item, array $owner, array $contact)
 	{
@@ -4004,6 +4095,7 @@ class Diaspora
 	 * @param int $uid The user id
 	 *
 	 * @return array The profile data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function createProfileData($uid)
 	{
@@ -4088,6 +4180,7 @@ class Diaspora
 	 * @param int  $uid    The user id
 	 * @param bool $recips optional, default false
 	 * @return void
+	 * @throws \Exception
 	 */
 	public static function sendProfile($uid, $recips = false)
 	{
@@ -4129,6 +4222,7 @@ class Diaspora
 	 * @param array   $item Item array
 	 *
 	 * @return array Signed content
+	 * @throws \Exception
 	 */
 	public static function createLikeSignature($uid, array $item)
 	{
@@ -4159,6 +4253,7 @@ class Diaspora
 	 * @param array   $item Item array
 	 *
 	 * @return array Signed content
+	 * @throws \Exception
 	 */
 	public static function createCommentSignature($uid, array $item)
 	{

src/Protocol/Email.php

@@ -19,6 +19,7 @@ class Email
 	 * @param string $username The username
 	 * @param string $password The password
 	 * @return object
+	 * @throws \Exception
 	 */
 	public static function connect($mailbox, $username, $password)
 	{
@@ -45,6 +46,7 @@ class Email
 	 * @param object $mbox       mailbox
 	 * @param string $email_addr email
 	 * @return array
+	 * @throws \Exception
 	 */
 	public static function poll($mbox, $email_addr)
 	{
@@ -106,6 +108,7 @@ class Email
 	 * @param integer $uid   user id
 	 * @param string  $reply reply
 	 * @return array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getMessage($mbox, $uid, $reply)
 	{
@@ -321,6 +324,8 @@ class Email
 	 *
 	 * @return void
 	 *
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 * @todo This could be changed to use the Emailer class
 	 */
 	public static function send($addr, $subject, $headers, $item)

src/Protocol/Feed.php

@@ -32,6 +32,7 @@ class Feed {
 	 * @param bool   $simulate If enabled, no data is imported
 	 *
 	 * @return array In simulation mode it returns the header and the first item
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function import($xml, $importer, &$contact, &$hub, $simulate = false) {
 

src/Protocol/OStatus.php

@@ -43,13 +43,15 @@ class OStatus
 	/**
 	 * @brief Fetches author data
 	 *
-	 * @param object $xpath     The xpath object
+	 * @param DOMXPath $xpath     The xpath object
 	 * @param object   $context   The xml context of the author details
 	 * @param array    $importer  user record of the importing user
 	 * @param array    $contact   Called by reference, will contain the fetched contact
 	 * @param bool     $onlyfetch Only fetch the header without updating the contact entries
 	 *
 	 * @return array Array of author related entries for the item
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function fetchAuthor(DOMXPath $xpath, $context, array $importer, array &$contact = null, $onlyfetch)
 	{
@@ -242,6 +244,8 @@ class OStatus
 	 * @param array  $importer user record of the importing user
 	 *
 	 * @return array Array of author related entries for the item
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function salmonAuthor($xml, array $importer)
 	{
@@ -296,6 +300,8 @@ class OStatus
 	 * @param array  $contact  contact
 	 * @param string $hub      Called by reference, returns the fetched hub data
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function import($xml, array $importer, array &$contact = null, &$hub)
 	{
@@ -313,6 +319,8 @@ class OStatus
 	 * @param boolean $initialize Is it the leading post so that data has to be initialized?
 	 *
 	 * @return boolean Could the XML be processed?
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function process($xml, array $importer, array &$contact = null, &$hub, $stored = false, $initialize = true)
 	{
@@ -556,8 +564,10 @@ class OStatus
 
 	/**
 	 * Removes notice item from database
+	 *
 	 * @param array $item item
 	 * @return void
+	 * @throws \Exception
 	 */
 	private static function deleteNotice(array $item)
 	{
@@ -575,11 +585,13 @@ class OStatus
 	/**
 	 * @brief Processes the XML for a post
 	 *
-	 * @param object $xpath    The xpath object
+	 * @param DOMXPath $xpath    The xpath object
 	 * @param object   $entry    The xml entry that is processed
 	 * @param array    $item     The item array
 	 * @param array    $importer user record of the importing user
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function processPost(DOMXPath $xpath, $entry, array &$item, array $importer)
 	{
@@ -725,6 +737,7 @@ class OStatus
 	 * @param string $conversation     The link to the conversation
 	 * @param string $conversation_uri The conversation in "uri" format
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function fetchConversation($conversation, $conversation_uri)
 	{
@@ -787,6 +800,7 @@ class OStatus
 	 * @param string $conversation     conversation
 	 * @param string $conversation_uri conversation uri
 	 * @return void
+	 * @throws \Exception
 	 */
 	private static function storeConversation($xml, $conversation = '', $conversation_uri = '')
 	{
@@ -870,6 +884,7 @@ class OStatus
 	 * @param string $self The link to the self item
 	 * @param array  $item The item array
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function fetchSelf($self, array &$item)
 	{
@@ -905,6 +920,8 @@ class OStatus
 	 * @param string $related_uri The related item in "uri" format
 	 * @param array  $importer    user record of the importing user
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function fetchRelated($related, $related_uri, $importer)
 	{
@@ -1008,12 +1025,14 @@ class OStatus
 	/**
 	 * @brief Processes the XML for a repeated post
 	 *
-	 * @param object $xpath    The xpath object
+	 * @param DOMXPath $xpath    The xpath object
 	 * @param object   $entry    The xml entry that is processed
 	 * @param array    $item     The item array
 	 * @param array    $importer user record of the importing user
 	 *
 	 * @return array with data from links
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function processRepeatedItem(DOMXPath $xpath, $entry, array &$item, array $importer)
 	{
@@ -1223,6 +1242,7 @@ class OStatus
 	 * @param string $body The body
 	 *
 	 * @return string The cleaned body
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function formatPicturePost($body)
 	{
@@ -1257,12 +1277,13 @@ class OStatus
 	/**
 	 * @brief Adds the header elements to the XML document
 	 *
-	 * @param object $doc    XML document
+	 * @param DOMDocument $doc       XML document
 	 * @param array       $owner     Contact data of the poster
 	 * @param string      $filter    The related feed filter (activity, posts or comments)
 	 * @param bool        $feed_mode Behave like a regular feed for users if true
 	 *
 	 * @return object header root element
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function addHeader(DOMDocument $doc, array $owner, $filter, $feed_mode = false)
 	{
@@ -1347,10 +1368,11 @@ class OStatus
 	/**
 	 * @brief Add the link to the push hubs to the XML document
 	 *
-	 * @param object $doc  XML document
+	 * @param DOMDocument $doc  XML document
 	 * @param object      $root XML root element where the hub links are added
 	 * @param object      $nick nick
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function hublinks(DOMDocument $doc, $root, $nick)
 	{
@@ -1361,14 +1383,14 @@ class OStatus
 	/**
 	 * @brief Adds attachment data to the XML document
 	 *
-	 * @param object $doc  XML document
+	 * @param DOMDocument $doc  XML document
 	 * @param object      $root XML root element where the hub links are added
 	 * @param array       $item Data of the item that is to be posted
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function getAttachment(DOMDocument $doc, $root, $item)
 	{
-		$o = "";
 		$siteinfo = BBCode::getAttachedData($item["body"]);
 
 		switch ($siteinfo["type"]) {
@@ -1433,11 +1455,12 @@ class OStatus
 	/**
 	 * @brief Adds the author element to the XML document
 	 *
-	 * @param object $doc   XML document
+	 * @param DOMDocument $doc          XML document
 	 * @param array       $owner        Contact data of the poster
 	 * @param bool        $show_profile Whether to show profile
 	 *
 	 * @return object author element
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function addAuthor(DOMDocument $doc, array $owner, $show_profile = true)
 	{
@@ -1550,13 +1573,15 @@ class OStatus
 	/**
 	 * @brief Adds an entry element to the XML document
 	 *
-	 * @param object $doc       XML document
+	 * @param DOMDocument $doc       XML document
 	 * @param array       $item      Data of the item that is to be posted
 	 * @param array       $owner     Contact data of the poster
 	 * @param bool        $toplevel  optional default false
 	 * @param bool        $feed_mode Behave like a regular feed for users if true
 	 *
 	 * @return object Entry element
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function entry(DOMDocument $doc, array $item, array $owner, $toplevel = false, $feed_mode = false)
 	{
@@ -1583,10 +1608,11 @@ class OStatus
 	/**
 	 * @brief Adds a source entry to the XML document
 	 *
-	 * @param object $doc     XML document
+	 * @param DOMDocument $doc     XML document
 	 * @param array       $contact Array of the contact that is added
 	 *
 	 * @return object Source element
+	 * @throws \Exception
 	 */
 	private static function sourceEntry(DOMDocument $doc, array $contact)
 	{
@@ -1608,6 +1634,8 @@ class OStatus
 	 * @param array  $owner Contact data of the poster
 	 *
 	 * @return array Contact array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function contactEntry($url, array $owner)
 	{
@@ -1655,13 +1683,15 @@ class OStatus
 	/**
 	 * @brief Adds an entry element with reshared content
 	 *
-	 * @param object $doc           XML document
+	 * @param DOMDocument $doc           XML document
 	 * @param array       $item          Data of the item that is to be posted
 	 * @param array       $owner         Contact data of the poster
 	 * @param string      $repeated_guid guid
 	 * @param bool        $toplevel      Is it for en entry element (false) or a feed entry (true)?
 	 *
-	 * @return object Entry element
+	 * @return bool Entry element
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function reshareEntry(DOMDocument $doc, array $item, array $owner, $repeated_guid, $toplevel)
 	{
@@ -1719,12 +1749,14 @@ class OStatus
 	/**
 	 * @brief Adds an entry element with a "like"
 	 *
-	 * @param object $doc      XML document
+	 * @param DOMDocument $doc      XML document
 	 * @param array       $item     Data of the item that is to be posted
 	 * @param array       $owner    Contact data of the poster
 	 * @param bool        $toplevel Is it for en entry element (false) or a feed entry (true)?
 	 *
 	 * @return object Entry element with "like"
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function likeEntry(DOMDocument $doc, array $item, array $owner, $toplevel)
 	{
@@ -1759,7 +1791,7 @@ class OStatus
 	/**
 	 * @brief Adds the person object element to the XML document
 	 *
-	 * @param object $doc     XML document
+	 * @param DOMDocument $doc     XML document
 	 * @param array       $owner   Contact data of the poster
 	 * @param array       $contact Contact data of the target
 	 *
@@ -1804,12 +1836,14 @@ class OStatus
 	/**
 	 * @brief Adds a follow/unfollow entry element
 	 *
-	 * @param object $doc      XML document
+	 * @param DOMDocument $doc      XML document
 	 * @param array       $item     Data of the follow/unfollow message
 	 * @param array       $owner    Contact data of the poster
 	 * @param bool        $toplevel Is it for en entry element (false) or a feed entry (true)?
 	 *
 	 * @return object Entry element
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function followEntry(DOMDocument $doc, array $item, array $owner, $toplevel)
 	{
@@ -1866,13 +1900,15 @@ class OStatus
 	/**
 	 * @brief Adds a regular entry element
 	 *
-	 * @param object $doc       XML document
+	 * @param DOMDocument $doc       XML document
 	 * @param array       $item      Data of the item that is to be posted
 	 * @param array       $owner     Contact data of the poster
 	 * @param bool        $toplevel  Is it for en entry element (false) or a feed entry (true)?
 	 * @param bool        $feed_mode Behave like a regular feed for users if true
 	 *
 	 * @return object Entry element
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function noteEntry(DOMDocument $doc, array $item, array $owner, $toplevel, $feed_mode)
 	{
@@ -1894,12 +1930,15 @@ class OStatus
 	/**
 	 * @brief Adds a header element to the XML document
 	 *
-	 * @param object $doc      XML document
+	 * @param DOMDocument $doc      XML document
 	 * @param object      $entry    The entry element where the elements are added
 	 * @param array       $owner    Contact data of the poster
+	 * @param array       $item
 	 * @param bool        $toplevel Is it for en entry element (false) or a feed entry (true)?
 	 *
 	 * @return string The title for the element
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function entryHeader(DOMDocument $doc, &$entry, array $owner, array $item, $toplevel)
 	{
@@ -1940,7 +1979,7 @@ class OStatus
 	/**
 	 * @brief Adds elements to the XML document
 	 *
-	 * @param object $doc       XML document
+	 * @param DOMDocument $doc       XML document
 	 * @param object      $entry     Entry element where the content is added
 	 * @param array       $item      Data of the item that is to be posted
 	 * @param array       $owner     Contact data of the poster
@@ -1949,6 +1988,7 @@ class OStatus
 	 * @param bool        $complete  Add the "status_net" element?
 	 * @param bool        $feed_mode Behave like a regular feed for users if true
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function entryContent(DOMDocument $doc, $entry, array $item, array $owner, $title, $verb = "", $complete = true, $feed_mode = false)
 	{
@@ -1988,13 +2028,14 @@ class OStatus
 	/**
 	 * @brief Adds the elements at the foot of an entry to the XML document
 	 *
-	 * @param object $doc       XML document
+	 * @param DOMDocument $doc       XML document
 	 * @param object      $entry     The entry element where the elements are added
 	 * @param array       $item      Data of the item that is to be posted
 	 * @param array       $owner     Contact data of the poster
 	 * @param bool        $complete  default true
 	 * @param bool        $feed_mode Behave like a regular feed for users if true
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function entryFooter(DOMDocument $doc, $entry, array $item, array $owner, $complete = true, $feed_mode = false)
 	{
@@ -2159,6 +2200,8 @@ class OStatus
 	 * @param boolean $feed_mode   Behave like a regular feed for users if true
 	 *
 	 * @return string XML feed
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function feed($owner_nick, &$last_update, $max_items = 300, $filter = 'activity', $nocache = false, $feed_mode = false)
 	{
@@ -2250,6 +2293,8 @@ class OStatus
 	 * @param array $owner Contact data of the poster
 	 *
 	 * @return string XML for the salmon
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function salmon(array $item, array $owner)
 	{

src/Protocol/PortableContact.php

@@ -44,7 +44,7 @@ class PortableContact
 	 * Once the global contact is stored add (if necessary) the contact linkage which associates
 	 * the given uid, cid to the global contact entry. There can be many uid/cid combinations
 	 * pointing to the same global contact id.
-	 *
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function loadWorker($cid, $uid = 0, $zcid = 0, $url = null)
 	{
@@ -59,7 +59,7 @@ class PortableContact
 	 * @param integer $uid  User ID
 	 * @param integer $zcid Global Contact ID
 	 * @param integer $url  POCO address that should be polled
-	 *
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function load($cid, $uid, $zcid, $url)
 	{
@@ -643,6 +643,7 @@ class PortableContact
 	 *
 	 * @param string $server_url address of the server
 	 * @return array Server data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function fetchNodeinfo($server_url)
 	{
@@ -696,6 +697,7 @@ class PortableContact
 	 *
 	 * @param string $nodeinfo_url address of the nodeinfo path
 	 * @return array Server data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function parseNodeinfo1($nodeinfo_url)
 	{
@@ -780,6 +782,7 @@ class PortableContact
 	 *
 	 * @param string $nodeinfo_url address of the nodeinfo path
 	 * @return array Server data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function parseNodeinfo2($nodeinfo_url)
 	{
@@ -1444,6 +1447,7 @@ class PortableContact
 	 * @brief Fetch relay data from a given server url
 	 *
 	 * @param string $server_url address of the server
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function discoverRelay($server_url)
 	{
@@ -1542,6 +1546,7 @@ class PortableContact
 	 * @brief Fetch server list from remote servers and adds them when they are new.
 	 *
 	 * @param string $poco URL to the POCO endpoint
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function fetchServerlist($poco)
 	{

src/Protocol/Salmon.php

@@ -22,6 +22,7 @@ class Salmon
 	 * @param string $uri     Uniform Resource Identifier
 	 * @param string $keyhash encoded key
 	 * @return mixed
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getKey($uri, $keyhash)
 	{
@@ -86,6 +87,7 @@ class Salmon
 	 * @param string $url   url
 	 * @param string $slap  slap
 	 * @return integer
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function slapper($owner, $url, $slap)
 	{
@@ -205,6 +207,7 @@ class Salmon
 	/**
 	 * @param string $pubkey public key
 	 * @return string
+	 * @throws \Exception
 	 */
 	public static function salmonKey($pubkey)
 	{

src/Util/Crypto.php

@@ -42,7 +42,7 @@ class Crypto
 
 	/**
 	 * @param string $Der     der formatted string
-	 * @param string $Private key type optional, default false
+	 * @param bool   $Private key type optional, default false
 	 * @return string
 	 */
 	private static function DerToPem($Der, $Private = false)
@@ -149,6 +149,7 @@ class Crypto
 	 * @param string $m   modulo reference
 	 * @param object $e   exponent reference
 	 * @return void
+	 * @throws \Exception
 	 */
 	private static function pubRsaToMe($key, &$m, &$e)
 	{
@@ -166,6 +167,7 @@ class Crypto
 	/**
 	 * @param string $key key
 	 * @return string
+	 * @throws \Exception
 	 */
 	public static function rsaToPem($key)
 	{
@@ -176,6 +178,7 @@ class Crypto
 	/**
 	 * @param string $key key
 	 * @return string
+	 * @throws \Exception
 	 */
 	private static function pemToRsa($key)
 	{
@@ -188,6 +191,7 @@ class Crypto
 	 * @param string $m   modulo reference
 	 * @param string $e   exponent reference
 	 * @return void
+	 * @throws \Exception
 	 */
 	public static function pemToMe($key, &$m, &$e)
 	{
@@ -217,6 +221,7 @@ class Crypto
 	/**
 	 * @param integer $bits number of bits
 	 * @return mixed
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function newKeypair($bits)
 	{
@@ -326,6 +331,7 @@ class Crypto
 	 * @param string $alg    The algorithm used for encryption.
 	 *
 	 * @return array
+	 * @throws \Exception
 	 */
 	public static function encapsulate($data, $pubkey, $alg = 'aes256cbc')
 	{
@@ -339,11 +345,12 @@ class Crypto
 	 *
 	 * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/crypto.php
 	 *
-	 * @param type $data
-	 * @param type $pubkey The public key.
-	 * @param type $alg    The algorithm used for encryption.
+	 * @param string $data
+	 * @param string $pubkey The public key.
+	 * @param string $alg    The algorithm used for encryption.
 	 *
 	 * @return array
+	 * @throws \Exception
 	 */
 	private static function encapsulateOther($data, $pubkey, $alg)
 	{
@@ -385,6 +392,7 @@ class Crypto
 	 * @param string $pubkey
 	 *
 	 * @return array
+	 * @throws \Exception
 	 */
 	private static function encapsulateAes($data, $pubkey)
 	{
@@ -419,6 +427,7 @@ class Crypto
 	 * @param string $prvkey The private key used for decryption.
 	 *
 	 * @return string|boolean The decrypted string or false on failure.
+	 * @throws \Exception
 	 */
 	public static function unencapsulate($data, $prvkey)
 	{
@@ -442,6 +451,7 @@ class Crypto
 	 * @param string $alg
 	 *
 	 * @return string|boolean The decrypted string or false on failure.
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function unencapsulateOther($data, $prvkey, $alg)
 	{
@@ -468,6 +478,7 @@ class Crypto
 	 * @param string $prvkey The private key used for decryption.
 	 *
 	 * @return string|boolean The decrypted string or false on failure.
+	 * @throws \Exception
 	 */
 	private static function unencapsulateAes($data, $prvkey)
 	{

src/Util/DateTimeFormat.php

@@ -26,6 +26,7 @@ class DateTimeFormat
 	 * @param string $time   A date/time string
 	 * @param string $format DateTime format string or Temporal constant
 	 * @return string
+	 * @throws Exception
 	 */
 	public static function utc($time, $format = self::MYSQL)
 	{
@@ -38,6 +39,7 @@ class DateTimeFormat
 	 * @param string $time   A date/time string
 	 * @param string $format DateTime format string or Temporal constant
 	 * @return string
+	 * @throws Exception
 	 */
 	public static function local($time, $format = self::MYSQL)
 	{
@@ -47,8 +49,10 @@ class DateTimeFormat
 	/**
 	 * convert() shorthand for timezoned now.
 	 *
+	 * @param        $timezone
 	 * @param string $format DateTime format string or Temporal constant
 	 * @return string
+	 * @throws Exception
 	 */
 	public static function timezoneNow($timezone, $format = self::MYSQL)
 	{
@@ -60,6 +64,7 @@ class DateTimeFormat
 	 *
 	 * @param string $format DateTime format string or Temporal constant
 	 * @return string
+	 * @throws Exception
 	 */
 	public static function localNow($format = self::MYSQL)
 	{
@@ -71,6 +76,7 @@ class DateTimeFormat
 	 *
 	 * @param string $format DateTime format string or Temporal constant
 	 * @return string
+	 * @throws Exception
 	 */
 	public static function utcNow($format = self::MYSQL)
 	{
@@ -87,6 +93,7 @@ class DateTimeFormat
 	 *                        http://www.php.net/manual/en/datetime.format.php
 	 *
 	 * @return string Formatted date according to given format
+	 * @throws Exception
 	 */
 	public static function convert($s = 'now', $tz_to = 'UTC', $tz_from = 'UTC', $format = self::MYSQL)
 	{

src/Util/Emailer.php

@@ -20,16 +20,17 @@ class Emailer
 	 *
 	 * @param array $params parameters
 	 *                      fromName             name of the sender
-	 *                      fromEmail			 email fo the sender
-	 *                      replyTo			     replyTo address to direct responses
+	 *                      fromEmail            email of the sender
+	 *                      replyTo              address to direct responses
 	 *                      toEmail              destination email address
 	 *                      messageSubject       subject of the message
 	 *                      htmlVersion          html version of the message
 	 *                      textVersion          text only version of the message
-	 *                      additionalMailHeader additions to the smtp mail header
+	 *                      additionalMailHeader additions to the SMTP mail header
 	 *                      optional             uid user id of the destination user
 	 *
 	 * @return object
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function send($params)
 	{

src/Util/ExAuth.php

@@ -47,7 +47,6 @@ class ExAuth
 	/**
 	 * @brief Create the class
 	 *
-	 * @param boolean $bDebug Debug mode
 	 */
 	public function __construct()
 	{
@@ -63,6 +62,7 @@ class ExAuth
 	 * parameters
 	 *
 	 * @return null
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function readStdin()
 	{
@@ -119,6 +119,7 @@ class ExAuth
 	 * @brief Check if the given username exists
 	 *
 	 * @param array $aCommand The command array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private function isUser(array $aCommand)
 	{
@@ -170,6 +171,7 @@ class ExAuth
 	 * @param boolean $ssl  Should the check be done via SSL?
 	 *
 	 * @return boolean Was the user found?
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private function checkUser($host, $user, $ssl)
 	{
@@ -199,6 +201,7 @@ class ExAuth
 	 * @brief Authenticate the given user and password
 	 *
 	 * @param array $aCommand The command array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private function auth(array $aCommand)
 	{
@@ -294,6 +297,7 @@ class ExAuth
 	 * @brief Set the hostname for this process
 	 *
 	 * @param string $host The hostname
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private function setHost($host)
 	{

src/Util/HTTPSignature.php

@@ -34,6 +34,7 @@ class HTTPSignature
 	 * @param $key
 	 *
 	 * @return array with verification data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function verifyMagic($key)
 	{
@@ -188,6 +189,7 @@ class HTTPSignature
 	 *   - \e string \b algorithm
 	 *   - \e array  \b headers
 	 *   - \e string \b signature
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function parseSigheader($header)
 	{
@@ -235,6 +237,7 @@ class HTTPSignature
 	 *   - \e string \b key
 	 *   - \e string \b alg
 	 *   - \e string \b data
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function decryptSigheader($header, $prvkey = null)
 	{
@@ -281,6 +284,7 @@ class HTTPSignature
 	 * @param integer $uid    User id of the sender
 	 *
 	 * @return boolean Was the transmission successful?
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function transmit($data, $target, $uid)
 	{
@@ -324,6 +328,7 @@ class HTTPSignature
 	 * @param integer $uid     User id of the requester
 	 *
 	 * @return array JSON array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function fetch($request, $uid)
 	{
@@ -372,7 +377,8 @@ class HTTPSignature
 	 * @param $content
 	 * @param $http_headers
 	 *
-	 * @return signer string
+	 * @return string Signer
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getSigner($content, $http_headers)
 	{
@@ -493,6 +499,7 @@ class HTTPSignature
 	 * @param $actor
 	 *
 	 * @return array with actor url and public key
+	 * @throws \Exception
 	 */
 	private static function fetchKey($id, $actor)
 	{

src/Util/JsonLD.php

@@ -18,7 +18,8 @@ class JsonLD
 	 *
 	 * @param $url
 	 *
-	 * @return the loaded data
+	 * @return mixed the loaded data
+	 * @throws \JsonLdException
 	 */
 	public static function documentLoader($url)
 	{
@@ -53,7 +54,8 @@ class JsonLD
 	 *
 	 * @param array $json
 	 *
-	 * @return normalized JSON string
+	 * @return mixed|bool normalized JSON string
+	 * @throws Exception
 	 */
 	public static function normalize($json)
 	{
@@ -77,7 +79,8 @@ class JsonLD
 	 *
 	 * @param array $json
 	 *
-	 * @return comacted JSON array
+	 * @return array Compacted JSON array
+	 * @throws Exception
 	 */
 	public static function compact($json)
 	{
@@ -131,7 +134,7 @@ class JsonLD
 	 * @param $element
 	 * @param $key
 	 *
-	 * @return fetched element array
+	 * @return array fetched element
 	 */
 	public static function fetchElementArray($array, $element, $key = '@id')
 	{
@@ -172,7 +175,7 @@ class JsonLD
 	 * @param $type
 	 * @param $type_value
 	 *
-	 * @return fetched element
+	 * @return string fetched element
 	 */
 	public static function fetchElement($array, $element, $key = '@id', $type = null, $type_value = null)
 	{

src/Util/Network.php

@@ -31,6 +31,7 @@ class Network
 	 * @param string  $cookiejar      Path to cookie jar file
 	 *
 	 * @return string The fetched content
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function fetchUrl($url, $binary = false, &$redirects = 0, $timeout = 0, $accept_content = null, $cookiejar = '')
 	{
@@ -55,6 +56,7 @@ class Network
 	 * @param string  $cookiejar      Path to cookie jar file
 	 *
 	 * @return CurlResult With all relevant information, 'body' contains the actual fetched content.
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function fetchUrlFull($url, $binary = false, &$redirects = 0, $timeout = 0, $accept_content = null, $cookiejar = '')
 	{
@@ -86,6 +88,7 @@ class Network
 	 *                           'header' => header array
 	 *
 	 * @return CurlResult
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function curl($url, $binary = false, &$redirects = 0, $opts = [])
 	{
@@ -245,6 +248,7 @@ class Network
 	 * @param integer $timeout   The timeout in seconds, default system config value or 60 seconds
 	 *
 	 * @return CurlResult The content
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function post($url, $params, $headers = null, &$redirects = 0, $timeout = 0)
 	{
@@ -347,6 +351,7 @@ class Network
 	 *
 	 * @param string $url The URL to be validated
 	 * @return string|boolean The actual working URL, false else
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function isUrlValid($url)
 	{
@@ -378,6 +383,7 @@ class Network
 	 *
 	 * @param string $addr The email address
 	 * @return boolean True if it's a valid email address, false if it's not
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function isEmailDomainValid($addr)
 	{
@@ -409,6 +415,7 @@ class Network
 	 *
 	 * @param string $url URL which get tested
 	 * @return boolean True if url is allowed otherwise return false
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function isUrlAllowed($url)
 	{
@@ -454,6 +461,7 @@ class Network
 	 * @param string $url The url to check the domain from
 	 *
 	 * @return boolean
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function isUrlBlocked($url)
 	{
@@ -484,6 +492,7 @@ class Network
 	 * @param  string $email email address
 	 * @return boolean False if not allowed, true if allowed
 	 *                       or if allowed list is not configured
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function isEmailDomainAllowed($email)
 	{
@@ -605,6 +614,7 @@ class Network
 	 * @param int    $depth     The current redirection recursion level (internal)
 	 * @param bool   $fetchbody Wether to fetch the body or not after the HEAD requests
 	 * @return string A canonical URL
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function finalUrl($url, $depth = 1, $fetchbody = false)
 	{