diff --git a/main/inc/lib/TicketManager.php b/main/inc/lib/TicketManager.php
index 1f84c8ae6e..6afa4d964d 100644
--- a/main/inc/lib/TicketManager.php
+++ b/main/inc/lib/TicketManager.php
@@ -1541,7 +1541,6 @@ class TicketManager
     }
 
     /**
-     * @throws \Doctrine\DBAL\DBALException
      */
     public static function close_old_tickets()
     {
diff --git a/main/inc/lib/document.lib.php b/main/inc/lib/document.lib.php
index c4e651a34d..b93059dc15 100644
--- a/main/inc/lib/document.lib.php
+++ b/main/inc/lib/document.lib.php
@@ -442,8 +442,6 @@ class DocumentManager
      * @param bool   $search
      * @param int    $sessionId
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return array with all document data
      */
     public static function getAllDocumentData(
diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php
index 31c6c5fb31..4b275a8079 100755
--- a/main/inc/lib/message.lib.php
+++ b/main/inc/lib/message.lib.php
@@ -2304,8 +2304,6 @@ class MessageManager
     /**
      * @param int $userId
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return array
      */
     public static function getUsersThatHadConversationWithUser($userId)
@@ -2339,8 +2337,6 @@ class MessageManager
      * @param int $userId
      * @param int $otherUserId
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return array
      */
     public static function getAllMessagesBetweenStudents($userId, $otherUserId)
diff --git a/main/lp/learnpath.class.php b/main/lp/learnpath.class.php
index e768265d30..6eb9d1d075 100755
--- a/main/lp/learnpath.class.php
+++ b/main/lp/learnpath.class.php
@@ -101,7 +101,6 @@ class learnpath
      * @param int    $lp_id
      * @param int    $user_id
      *
-     * @throws \Doctrine\DBAL\DBALException
      */
     public function __construct($course, $lp_id, $user_id)
     {
@@ -485,8 +484,6 @@ class learnpath
      * @param int    $max_time_allowed
      * @param int    $userId
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return int
      */
     public function add_item(
@@ -741,8 +738,6 @@ class learnpath
      * @param int    $categoryId
      * @param int    $userId
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return int The new learnpath ID on success, 0 on failure
      */
     public static function add_lp(
@@ -1043,8 +1038,6 @@ class learnpath
      * @param int    $id         Learnpath ID
      * @param string $delete     Whether to delete data or keep it (default: 'keep', others: 'remove')
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool True on success, false on failure (might change that to return number of elements deleted)
      */
     public function delete($courseInfo = null, $id = null, $delete = 'keep')
@@ -1165,8 +1158,6 @@ class learnpath
      *
      * @param int $id Element ID of which children have to be removed
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return int Total number of children removed
      */
     public function delete_children_items($id)
@@ -1201,8 +1192,6 @@ class learnpath
      * @param string $remove Whether to remove the resource/data from the system
      *                       or leave it (default: 'keep', others 'remove')
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return int Number of elements moved
      *
      * @todo implement resource removal
@@ -1296,8 +1285,6 @@ class learnpath
      * @param int    $max_time_allowed
      * @param string $url
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool True on success, false on error
      */
     public function edit_item(
@@ -1548,8 +1535,6 @@ class learnpath
      * @param int    $mastery_score   Prerequisite min score
      * @param int    $max_score       Prerequisite max score
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool True on success, false on error
      */
     public function edit_item_prereq(
@@ -1606,8 +1591,6 @@ class learnpath
      *
      * @param int $id Item ID
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return array A list of all the "brother items" (or an empty array on failure)
      */
     public function getSiblingDirectories($id)
@@ -1653,8 +1636,6 @@ class learnpath
      *
      * @param int $id Item ID
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return array A list of all the "brother items" (or an empty array on failure)
      */
     public function get_brother_items($id)
@@ -2282,8 +2263,6 @@ class learnpath
      * @param int    $lpItemId
      * @param string $autostart
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return string The mediaplayer HTML
      */
     public function get_mediaplayer($lpItemId, $autostart = 'true')
@@ -2365,8 +2344,6 @@ class learnpath
      * @param array $courseInfo
      * @param int   $sessionId
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool
      */
     public static function isBlockedByPrerequisite(
@@ -2409,8 +2386,6 @@ class learnpath
      * @param null $courseCode
      * @param int  $sessionId
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool
      */
     public static function is_lp_visible_for_student(
@@ -2544,8 +2519,6 @@ class learnpath
      * @param int $courseId
      * @param int $sessionId
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return int
      */
     public static function getProgress($lpId, $userId, $courseId, $sessionId = 0)
@@ -2935,8 +2908,6 @@ class learnpath
      * @param int $lp_iv_id  Item View ID
      * @param int $course_id course id
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return int
      */
     public static function get_interactions_count_from_db($lp_iv_id, $course_id)
@@ -2963,8 +2934,6 @@ class learnpath
      *
      * @param int $lp_iv_id Learnpath Item View ID
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return array
      *
      * @todo    Transcode labels instead of switching to HTML (which requires to know the encoding of the LP)
@@ -3020,8 +2989,6 @@ class learnpath
      * @param int $lp_iv_id  Item View ID
      * @param int $course_id Course ID
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return int Number of objectives
      */
     public static function get_objectives_count_from_db($lp_iv_id, $course_id)
@@ -3048,8 +3015,6 @@ class learnpath
      *
      * @param int $lpItemViewId Learnpath Item View ID
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return array
      *
      * @todo    Translate labels
@@ -3177,8 +3142,6 @@ class learnpath
      *
      * @param int $lp_id
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return mixed Type ID or name, depending on the parameter
      */
     public static function get_type_static($lp_id = 0)
@@ -3207,8 +3170,6 @@ class learnpath
      * @param int $parent    Parent ID of the items to look for
      * @param int $course_id
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return array Ordered list of item IDs (empty array on error)
      */
     public static function get_flat_ordered_items_list($lp = 1, $parent = 0, $course_id = 0)
@@ -3263,8 +3224,6 @@ class learnpath
      *
      * @param $tree
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return array HTML TOC ready to display
      */
     public function getParentToc($tree)
@@ -3343,8 +3302,6 @@ class learnpath
      * @param int   $id
      * @param bool  $parent
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return array HTML TOC ready to display
      */
     public function getChildrenToc($tree, $id, $parent = true)
@@ -3415,8 +3372,6 @@ class learnpath
      *
      * @param array $toc_list
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return array HTML TOC ready to display
      */
     public function getListArrayToc($toc_list = [])
@@ -3570,8 +3525,6 @@ class learnpath
      * @param int    $item_id      Learnpath item ID
      * @param bool   $provided_toc
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return string $provided_toc Link to the lp_item resource
      */
     public function get_link($type = 'http', $item_id = null, $provided_toc = false)
@@ -3900,8 +3853,6 @@ class learnpath
      *
      * @param int $attempt_num Optional attempt number. If none given, takes the highest from the lp_view table
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return int DB lp_view id
      */
     public function get_view($attempt_num = 0)
@@ -4022,8 +3973,6 @@ class learnpath
      * @param int    $id        Item to move up and down
      * @param string $direction Direction 'up' or 'down'
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool|int
      */
     public function move_item($id, $direction)
@@ -4187,8 +4136,6 @@ class learnpath
      * @param int $lp_id      Learnpath ID
      * @param int $categoryId Category ID
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool
      */
     public static function move_up($lp_id, $categoryId = 0)
@@ -4250,8 +4197,6 @@ class learnpath
      * @param int $lp_id      Learnpath ID
      * @param int $categoryId Category ID
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool
      */
     public static function move_down($lp_id, $categoryId = 0)
@@ -4462,8 +4407,6 @@ class learnpath
      * @param int $lp_id          Learnpath ID
      * @param int $set_visibility New visibility
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool
      */
     public static function toggle_visibility($lp_id, $set_visibility = 1)
@@ -4490,7 +4433,6 @@ class learnpath
      * @param int $id
      * @param int $visibility
      *
-     * @throws \Doctrine\DBAL\DBALException
      * @throws \Doctrine\ORM\NonUniqueResultException
      * @throws \Doctrine\ORM\ORMException
      * @throws \Doctrine\ORM\OptimisticLockException
@@ -4538,8 +4480,6 @@ class learnpath
      * @param int    $lp_id          Learnpath id
      * @param string $set_visibility New visibility (v/i - visible/invisible)
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool
      */
     public static function toggle_publish($lp_id, $set_visibility = 'v')
@@ -4839,8 +4779,6 @@ class learnpath
      * Make sure the results are saved with anoter method. This method should probably be redefined in children classes.
      * To use a similar method  statically, use the create_new_attempt() method.
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool
      */
     public function restart()
@@ -5083,8 +5021,6 @@ class learnpath
      *
      * @param string $enc New encoding
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool
      *
      * @todo (as of Chamilo 1.8.8): Check in the future whether this method is needed.
@@ -5120,8 +5056,6 @@ class learnpath
      *
      * @param string $lib Proximity setting
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool True on update success. False otherwise.
      */
     public function set_jslib($lib = '')
@@ -5149,8 +5083,6 @@ class learnpath
      *
      * @param string $name Optional string giving the new content_maker of this learnpath
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool True
      */
     public function set_maker($name = '')
@@ -5180,8 +5112,6 @@ class learnpath
      *
      * @param string $name Optional string giving the new name of this learnpath
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool True/False
      */
     public function set_name($name = null)
@@ -5227,8 +5157,6 @@ class learnpath
      * @param string $terms_string Comma-separated list of terms
      * @param string $prefix       Xapian term prefix
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool False on error, true otherwise
      */
     public function set_terms_by_prefix($terms_string, $prefix)
@@ -5306,8 +5234,6 @@ class learnpath
      *
      * @param string $name Optional string giving the new theme of this learnpath
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool Returns true if theme name is not empty
      */
     public function set_theme($name = '')
@@ -5334,8 +5260,6 @@ class learnpath
      *
      * @param string $name Optional string giving the new image of this learnpath
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool Returns true if theme name is not empty
      */
     public function set_preview_image($name = '')
@@ -5363,8 +5287,6 @@ class learnpath
      *
      * @param string $name Optional string giving the new author of this learnpath
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool Returns true if author's name is not empty
      */
     public function set_author($name = '')
@@ -5390,8 +5312,6 @@ class learnpath
      *
      * @param int $hide 1 if frame is hidden 0 then else
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool Returns true if author's name is not empty
      */
     public function set_hide_toc_frame($hide)
@@ -5422,8 +5342,6 @@ class learnpath
      *
      * @param int $prerequisite integer giving the new prerequisite of this learnpath
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool returns true if prerequisite is not empty
      */
     public function set_prerequisite($prerequisite)
@@ -5449,8 +5367,6 @@ class learnpath
      *
      * @param string $name Optional string giving the new location of this learnpath
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool True on success / False on error
      */
     public function set_proximity($name = '')
@@ -5494,8 +5410,6 @@ class learnpath
      *
      * @param int $use_max_score Optional string giving the new location of this learnpath
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool True on success / False on error
      */
     public function set_use_max_score($use_max_score = 1)
@@ -5605,8 +5519,6 @@ class learnpath
     /**
      * Sets and saves the expired_on date.
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool Returns true if author's name is not empty
      */
     public function set_modified_on()
@@ -5757,8 +5669,6 @@ class learnpath
     /**
      * Updates the default view mode from fullscreen to embedded and inversely.
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return string The current default view mode ('fullscreen' or 'embedded')
      */
     public function update_default_view_mode()
@@ -5806,8 +5716,6 @@ class learnpath
     /**
      * Updates the default behaviour about auto-commiting SCORM updates.
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool True if auto-commit has been set to 'on', false otherwise
      */
     public function update_default_scorm_commit()
@@ -5847,8 +5755,6 @@ class learnpath
     /**
      * Updates the order of learning paths (goes through all of them by order and fills the gaps).
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool True on success, false on failure
      */
     public function update_display_order()
@@ -5884,8 +5790,6 @@ class learnpath
     /**
      * Updates the "prevent_reinit" value that enables control on reinitialising items on second view.
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool True if prevent_reinit has been set to 'on', false otherwise (or 1 or 0 in this case)
      */
     public function update_reinit()
@@ -5956,8 +5860,6 @@ class learnpath
      *
      * @param string 'seriousgame', 'single' or 'multiple'
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool
      *
      * @author ndiechburg <noel@cblue.be>
@@ -6029,8 +5931,6 @@ class learnpath
      * Switch the lp in ktm mode. This is a special scorm mode with unique attempt
      * but possibility to do again a completed item.
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool true if seriousgame_mode has been set to 1, false otherwise
      *
      * @author ndiechburg <noel@cblue.be>
@@ -6070,8 +5970,6 @@ class learnpath
     /**
      * Updates the "scorm_debug" value that shows or hide the debug window.
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool True if scorm_debug has been set to 'on', false otherwise (or 1 or 0 in this case)
      */
     public function update_scorm_debug()
@@ -6207,8 +6105,6 @@ class learnpath
      *
      * @author Kevin Van Den Haute
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return string
      */
     public function overview()
@@ -6271,8 +6167,6 @@ class learnpath
      * @param string $update_audio
      * @param bool   $drop_element_here
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return string
      */
     public function return_new_tree($update_audio = 'false', $drop_element_here = false)
@@ -6982,8 +6876,6 @@ class learnpath
      * @param int    $parentId
      * @param int    $creatorId  creator id
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return int
      */
     public function create_document(
@@ -7165,8 +7057,6 @@ class learnpath
      * Edit a document based on $_POST and $_GET parameters 'dir' and 'path'.
      *
      * @param array $_course array
-     *
-     * @throws \Doctrine\DBAL\DBALException
      */
     public function edit_document($_course)
     {
@@ -7246,8 +7136,6 @@ class learnpath
      * @param string $msg
      * @param bool   $show_actions
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return string
      */
     public function display_item($item_id, $msg = null, $show_actions = true)
@@ -7356,7 +7244,6 @@ class learnpath
      *
      * @throws Exception
      * @throws HTML_QuickForm_Error
-     * @throws \Doctrine\DBAL\DBALException
      *
      * @return string
      */
@@ -7484,7 +7371,6 @@ class learnpath
      *
      * @throws Exception
      * @throws HTML_QuickForm_Error
-     * @throws \Doctrine\DBAL\DBALException
      *
      * @return bool
      */
@@ -7561,8 +7447,6 @@ class learnpath
      * @param bool $iframe
      * @param bool $edit_link
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return string
      */
     public function display_document($id, $show_title = false, $iframe = true, $edit_link = false)
@@ -7595,7 +7479,6 @@ class learnpath
      * @param mixed  $extra_info Extra information (quiz ID if integer)
      *
      * @throws Exception
-     * @throws \Doctrine\DBAL\DBALException
      *
      * @return string HTML form
      */
@@ -7816,8 +7699,6 @@ class learnpath
      * @param int    $id         Internal ID of the item
      * @param string $extra_info
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return string HTML structure to display the hotpotatoes addition formular
      */
     public function display_hotpotatoes_form($action = 'add', $id = 0, $extra_info = '')
@@ -8014,7 +7895,6 @@ class learnpath
      * @param string $extra_info
      *
      * @throws Exception
-     * @throws \Doctrine\DBAL\DBALException
      *
      * @return string HTML form
      */
@@ -8233,7 +8113,6 @@ class learnpath
      * @param string $extra_info
      *
      * @throws Exception
-     * @throws \Doctrine\DBAL\DBALException
      *
      * @return string HTML form
      */
@@ -8466,7 +8345,6 @@ class learnpath
      *
      * @throws Exception
      * @throws HTML_QuickForm_Error
-     * @throws \Doctrine\DBAL\DBALException
      *
      * @return string HTML form
      */
@@ -8667,10 +8545,12 @@ class learnpath
                 );
             }
             $renderer = $form->defaultRenderer();
-            $renderer->setElementTemplate('<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{label}<br />{element}', 'content_lp');
+            $renderer->setElementTemplate(
+                '<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{label}<br />{element}',
+                'content_lp'
+            );
 
             $relative_prefix = '';
-
             $editor_config = [
                 'ToolbarSet' => 'LearningPathDocuments',
                 'Width' => '100%',
@@ -8717,7 +8597,6 @@ class learnpath
      *
      * @throws Exception
      * @throws HTML_QuickForm_Error
-     * @throws \Doctrine\DBAL\DBALException
      *
      * @return string HTML form
      */
@@ -9143,7 +9022,6 @@ class learnpath
      *
      * @throws Exception
      * @throws HTML_QuickForm_Error
-     * @throws \Doctrine\DBAL\DBALException
      *
      * @return string HTML form
      */
@@ -9364,7 +9242,6 @@ class learnpath
      * @param string $extra_info
      *
      * @throws Exception
-     * @throws \Doctrine\DBAL\DBALException
      *
      * @return string HTML form
      */
@@ -9575,8 +9452,6 @@ class learnpath
      * @param id     $item_id
      * @param string $item_type
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return string
      */
     public function display_manipulate($item_id, $item_type = TOOL_DOCUMENT)
@@ -9699,8 +9574,6 @@ class learnpath
     /**
      * Creates the javascript needed for filling up the checkboxes without page reload.
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return string
      */
     public function get_js_dropdown_array()
@@ -9763,7 +9636,6 @@ class learnpath
      *
      * @throws Exception
      * @throws HTML_QuickForm_Error
-     * @throws \Doctrine\DBAL\DBALException
      *
      * @return string HTML form
      */
@@ -9858,8 +9730,6 @@ class learnpath
      *
      * @param int Item ID
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return string HTML form
      */
     public function display_item_prerequisites_form($item_id = 0)
@@ -10007,8 +9877,6 @@ class learnpath
     /**
      * Return HTML list to allow prerequisites selection for lp.
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return string HTML form
      */
     public function display_lp_prerequisites_list()
@@ -10154,8 +10022,6 @@ class learnpath
     /**
      * Creates a list with all the exercises (quiz) in it.
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return string
      */
     public function get_exercises()
@@ -10267,8 +10133,6 @@ class learnpath
     /**
      * Creates a list with all the links in it.
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return string
      */
     public function get_links()
@@ -10567,8 +10431,6 @@ class learnpath
      * creating a SCORM structure if there is one already. However, if the initial SCORM
      * path has been modified, it should use the generic method here below.
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return string Returns the zip package string, or null if error
      */
     public function scorm_export()
@@ -11493,8 +11355,6 @@ EOD;
     /**
      * @param int $lp_id
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool
      */
     public function scorm_export_to_pdf($lp_id)
@@ -11590,8 +11450,6 @@ EOD;
     /**
      * Delete the image relative to this learning path. No parameter. Only works on instanciated object.
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool The results of the unlink function, or false if there was no image to start with
      */
     public function delete_lp_image()
@@ -11618,8 +11476,6 @@ EOD;
      *
      * @param array    The image array, coming from the $_FILES superglobal
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool True on success, false on error
      */
     public function upload_image($image_array)
@@ -11703,8 +11559,6 @@ EOD;
      *
      * @author Isaac flores paz
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return int Previous item ID
      */
     public function select_previous_item_id()
@@ -11820,7 +11674,6 @@ EOD;
     }
 
     /**
-     * @throws \Doctrine\DBAL\DBALException
      */
     public function set_previous_step_as_prerequisite_for_all_items()
     {
@@ -12029,7 +11882,6 @@ EOD;
     /**
      * @param int $id
      *
-     * @throws \Doctrine\DBAL\DBALException
      * @throws \Doctrine\ORM\ORMException
      * @throws \Doctrine\ORM\OptimisticLockException
      * @throws \Doctrine\ORM\TransactionRequiredException
@@ -12156,8 +12008,6 @@ EOD;
     /**
      * @param int $categoryId
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool
      */
     public function setCategoryId($categoryId)
@@ -12189,8 +12039,6 @@ EOD;
      *
      * @param int $value (0 = false, 1 = true)
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool
      */
     public function setSubscribeUsers($value)
@@ -12218,8 +12066,6 @@ EOD;
      *
      * @param int $sessionId Optional. The session ID
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return int The count of stars
      */
     public function getCalculateStars($sessionId = 0)
@@ -12740,8 +12586,6 @@ EOD;
      *
      * @param int $value (0 = false, 1 = true)
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return bool Always returns true
      */
     public function setAccumulateScormTime($value)
@@ -12776,8 +12620,6 @@ EOD;
      * @param int $id_in_path     the unique index in the items table
      * @param int $lpViewId
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return string
      */
     public static function rl_get_resource_link_for_learnpath(
@@ -12951,8 +12793,6 @@ EOD;
      * @param string $learningPathId The tool type (using constants declared in main_api.lib.php)
      * @param int    $id_in_path     The resource ID
      *
-     * @throws \Doctrine\DBAL\DBALException
-     *
      * @return string
      */
     public static function rl_get_resource_name($course_code, $learningPathId, $id_in_path)
diff --git a/plugin/dictionary/DictionaryPlugin.php b/plugin/dictionary/DictionaryPlugin.php
index a26e0f6ca0..6f8116571e 100644
--- a/plugin/dictionary/DictionaryPlugin.php
+++ b/plugin/dictionary/DictionaryPlugin.php
@@ -31,7 +31,6 @@ class DictionaryPlugin extends Plugin
     }
 
     /**
-     * @throws \Doctrine\DBAL\DBALException
      */
     public function install()
     {
@@ -45,7 +44,6 @@ class DictionaryPlugin extends Plugin
     }
 
     /**
-     * @throws \Doctrine\DBAL\DBALException
      */
     public function uninstall()
     {
diff --git a/plugin/ims_lti/ImsLtiPlugin.php b/plugin/ims_lti/ImsLtiPlugin.php
index 4094ffc799..d5e6dc03d0 100644
--- a/plugin/ims_lti/ImsLtiPlugin.php
+++ b/plugin/ims_lti/ImsLtiPlugin.php
@@ -99,8 +99,8 @@ class ImsLtiPlugin extends Plugin
 
     /**
      * Creates the plugin tables on database
+     *
      * @return boolean
-     * @throws \Doctrine\DBAL\DBALException
      */
     private function createPluginTables()
     {
@@ -137,8 +137,8 @@ class ImsLtiPlugin extends Plugin
 
     /**
      * Drops the plugin tables on database
+     *
      * @return boolean
-     * @throws \Doctrine\DBAL\DBALException
      */
     private function dropPluginTables()
     {
@@ -157,7 +157,7 @@ class ImsLtiPlugin extends Plugin
     }
 
     /**
-     * @throws \Doctrine\DBAL\DBALException
+     *
      */
     private function removeTools()
     {
diff --git a/plugin/redirection/RedirectionPlugin.php b/plugin/redirection/RedirectionPlugin.php
index 3209f7f9bd..bf78ddc105 100644
--- a/plugin/redirection/RedirectionPlugin.php
+++ b/plugin/redirection/RedirectionPlugin.php
@@ -70,9 +70,7 @@ class RedirectionPlugin extends Plugin
     /**
      * Get the current redirection for a given user (if any).
      *
-     * @param $userId
-     *
-     * @throws \Doctrine\DBAL\DBALException
+     * @param int $userId
      *
      * @return array
      */
diff --git a/plugin/sepe/src/sepe_plugin.class.php b/plugin/sepe/src/sepe_plugin.class.php
index aa5fbd05ec..8708abcbd6 100644
--- a/plugin/sepe/src/sepe_plugin.class.php
+++ b/plugin/sepe/src/sepe_plugin.class.php
@@ -34,9 +34,9 @@ class SepePlugin extends Plugin
     {
         parent::__construct(
             '2.0',
-            '
-                Jose Angel Ruiz - NoSoloRed (original author) <br>
-                Julio Montoya (SOAP integration)
+            '
+                Jose Angel Ruiz - NoSoloRed (original author) <br>
+                Julio Montoya (SOAP integration)
             ',
             ['sepe_enable' => 'boolean']
         );
@@ -120,7 +120,6 @@ class SepePlugin extends Plugin
     }
 
     /**
-     * @throws \Doctrine\DBAL\DBALException
      */
     public function update()
     {