diff --git a/main/admin/access_url_add_courses_to_url.php b/main/admin/access_url_add_courses_to_url.php
index 32cfb3fd95..c8ab1f50e7 100755
--- a/main/admin/access_url_add_courses_to_url.php
+++ b/main/admin/access_url_add_courses_to_url.php
@@ -5,8 +5,6 @@
  * It displays a list of users and a list of courses;
  * you can select multiple users and courses and then click on.
  *
- * @package chamilo.admin
- *
  * @author Julio Montoya <gugli100@gmail.com>
  */
 $cidReset = true;
diff --git a/main/admin/access_url_add_usergroup_to_url.php b/main/admin/access_url_add_usergroup_to_url.php
index c992901d7d..3209289160 100755
--- a/main/admin/access_url_add_usergroup_to_url.php
+++ b/main/admin/access_url_add_usergroup_to_url.php
@@ -5,8 +5,6 @@
  *  It displays a list of users and a list of courses;
  *  you can select multiple users and courses and then click on.
  *
- *  @package chamilo.admin
- *
  *  @author Julio Montoya <gugli100@gmail.com>
  */
 $cidReset = true;
diff --git a/main/admin/access_url_add_users_to_url.php b/main/admin/access_url_add_users_to_url.php
index aee42f6f95..45bf76c714 100755
--- a/main/admin/access_url_add_users_to_url.php
+++ b/main/admin/access_url_add_users_to_url.php
@@ -5,8 +5,6 @@
  *    It displays a list of users and a list of courses;
  *    you can select multiple users and courses and then click on.
  *
- * @package chamilo.admin
- *
  * @author Julio Montoya <gugli100@gmail.com>
  */
 $cidReset = true;
diff --git a/main/admin/access_url_check_user_session.php b/main/admin/access_url_check_user_session.php
index a2027a4c1b..f03aaba3cd 100755
--- a/main/admin/access_url_check_user_session.php
+++ b/main/admin/access_url_check_user_session.php
@@ -1,9 +1,8 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 /**
  * @author Bart Mollet, Julio Montoya lot of fixes
- *
- * @package chamilo.admin
  */
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
diff --git a/main/admin/access_url_edit.php b/main/admin/access_url_edit.php
index a9671fc73a..1838275be7 100755
--- a/main/admin/access_url_edit.php
+++ b/main/admin/access_url_edit.php
@@ -1,9 +1,8 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
- * @package chamilo.admin
- *
  * @author Julio Montoya <gugli100@gmail.com>
  */
 $cidReset = true;
@@ -31,7 +30,7 @@ if ($form->validate()) {
         $url_to_go = 'access_urls.php';
         if (!empty($url_id)) {
             //we can't change the status of the url with id=1
-            if ($url_id == 1) {
+            if (1 == $url_id) {
                 $active = 1;
             }
 
diff --git a/main/admin/access_url_edit_course_category_to_url.php b/main/admin/access_url_edit_course_category_to_url.php
index e971f20457..16622b53c0 100755
--- a/main/admin/access_url_edit_course_category_to_url.php
+++ b/main/admin/access_url_edit_course_category_to_url.php
@@ -2,8 +2,6 @@
 /* For licensing terms, see /license.txt */
 
 /**
- * @package chamilo.admin
- *
  * @author Julio Montoya <gugli100@gmail.com>
  */
 
diff --git a/main/admin/access_url_edit_courses_to_url.php b/main/admin/access_url_edit_courses_to_url.php
index d564b6f253..9fb8b2b25f 100755
--- a/main/admin/access_url_edit_courses_to_url.php
+++ b/main/admin/access_url_edit_courses_to_url.php
@@ -2,8 +2,6 @@
 /* For licensing terms, see /license.txt */
 
 /**
- * @package chamilo.admin
- *
  * @author Julio Montoya <gugli100@gmail.com>
  */
 // resetting the course id
diff --git a/main/admin/access_url_edit_usergroup_to_url.php b/main/admin/access_url_edit_usergroup_to_url.php
index 02c2da9e3b..9dc550a248 100755
--- a/main/admin/access_url_edit_usergroup_to_url.php
+++ b/main/admin/access_url_edit_usergroup_to_url.php
@@ -2,8 +2,6 @@
 /* For licensing terms, see /license.txt */
 
 /**
- * @package chamilo.admin
- *
  * @author Julio Montoya <gugli100@gmail.com>
  */
 // resetting the course id
diff --git a/main/admin/access_url_edit_users_to_url.php b/main/admin/access_url_edit_users_to_url.php
index ab551619d5..6b41f3fb18 100755
--- a/main/admin/access_url_edit_users_to_url.php
+++ b/main/admin/access_url_edit_users_to_url.php
@@ -1,8 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * @package chamilo.admin
- *
  * @author Julio Montoya <gugli100@gmail.com>
  */
 // resetting the course id
diff --git a/main/admin/access_urls.php b/main/admin/access_urls.php
index 7a5b87e4e7..dfe0cd52ec 100755
--- a/main/admin/access_urls.php
+++ b/main/admin/access_urls.php
@@ -1,10 +1,9 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 /**
  * Frontend script for multiple access urls.
  *
- * @package chamilo.admin
- *
  * @author Julio Montoya <gugli100@gmail.com>
  * @author Yannick Warnier <yannick.warnier@beeznest.com>
  */
diff --git a/main/admin/add_courses_to_usergroup.php b/main/admin/add_courses_to_usergroup.php
index 6c4ece17f7..69908b0e33 100755
--- a/main/admin/add_courses_to_usergroup.php
+++ b/main/admin/add_courses_to_usergroup.php
@@ -1,8 +1,5 @@
 <?php
 /* For licensing terms, see /license.txt */
-/**
- *   @package chamilo.admin
- */
 
 // Resetting the course id.
 $cidReset = true;
diff --git a/main/admin/add_drh_to_user.php b/main/admin/add_drh_to_user.php
index 6a5177d4ce..ea3cae156e 100644
--- a/main/admin/add_drh_to_user.php
+++ b/main/admin/add_drh_to_user.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 use Chamilo\CoreBundle\Entity\UserRelUser;
diff --git a/main/admin/add_sessions_to_promotion.php b/main/admin/add_sessions_to_promotion.php
index f7b4855689..0f2aed3054 100755
--- a/main/admin/add_sessions_to_promotion.php
+++ b/main/admin/add_sessions_to_promotion.php
@@ -1,8 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
-/**
- *   @package chamilo.admin
- */
+
 // resetting the course id
 $cidReset = true;
 
diff --git a/main/admin/add_sessions_to_usergroup.php b/main/admin/add_sessions_to_usergroup.php
index 20bbc42068..7f8c35ccd6 100755
--- a/main/admin/add_sessions_to_usergroup.php
+++ b/main/admin/add_sessions_to_usergroup.php
@@ -1,8 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
-/**
- *   @package chamilo.admin
- */
+
 // resetting the course id
 $cidReset = true;
 
diff --git a/main/admin/add_users_to_usergroup.php b/main/admin/add_users_to_usergroup.php
index 12fd963e66..134a2a302b 100755
--- a/main/admin/add_users_to_usergroup.php
+++ b/main/admin/add_users_to_usergroup.php
@@ -1,10 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-/**
- *   @package chamilo.admin
- */
-
 // resetting the course id
 $cidReset = true;
 
diff --git a/main/admin/archive_cleanup.php b/main/admin/archive_cleanup.php
index 60195368c8..8d26b03d2f 100755
--- a/main/admin/archive_cleanup.php
+++ b/main/admin/archive_cleanup.php
@@ -4,7 +4,6 @@
 
 $cidReset = true;
 
-// including some necessary files
 require_once __DIR__.'/../inc/global.inc.php';
 
 ini_set('memory_limit', -1);
diff --git a/main/admin/career_dashboard.php b/main/admin/career_dashboard.php
index 63aff14b54..355000dfbc 100755
--- a/main/admin/career_dashboard.php
+++ b/main/admin/career_dashboard.php
@@ -1,10 +1,9 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
  * Careers dashboard.
- *
- * @package chamilo.admin.career
  */
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
diff --git a/main/admin/career_diagram.php b/main/admin/career_diagram.php
index 8684060680..34b2495c44 100644
--- a/main/admin/career_diagram.php
+++ b/main/admin/career_diagram.php
@@ -1,9 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-/**
- *  @package chamilo.admin
- */
 
 /*
  *
diff --git a/main/admin/careers.php b/main/admin/careers.php
index d6819d713b..c4b8251c44 100755
--- a/main/admin/careers.php
+++ b/main/admin/careers.php
@@ -3,9 +3,6 @@
 
 use ChamiloSession as Session;
 
-/**
- *  @package chamilo.admin
- */
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 
diff --git a/main/admin/course_edit.php b/main/admin/course_edit.php
index a3913c696b..1dd10f3f07 100755
--- a/main/admin/course_edit.php
+++ b/main/admin/course_edit.php
@@ -6,9 +6,6 @@ use Chamilo\CoreBundle\Entity\CourseCategory;
 use Chamilo\CoreBundle\Entity\Repository\CourseCategoryRepository;
 use Chamilo\UserBundle\Entity\User;
 
-/**
- * @package chamilo.admin
- */
 $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
diff --git a/main/admin/course_export.php b/main/admin/course_export.php
index 0ba41b333a..e252c0dc04 100755
--- a/main/admin/course_export.php
+++ b/main/admin/course_export.php
@@ -1,10 +1,9 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
  * This tool allows platform admins to export courses to CSV file.
- *
- * @package chamilo.admin
  */
 $cidReset = true;
 
@@ -32,10 +31,10 @@ $courses = $selected_courses = [];
 
 if (isset($_POST['formSent']) && $_POST['formSent']) {
     $formSent = $_POST['formSent'];
-    $select_type = intval($_POST['select_type']);
+    $select_type = (int) ($_POST['select_type']);
     $file_type = $_POST['file_type'];
 
-    if ($select_type == 2) {
+    if (2 == $select_type) {
         // Get selected courses from courses list in form sent
         $selected_courses = $_POST['course_code'];
         if (is_array($selected_courses)) {
diff --git a/main/admin/course_import.php b/main/admin/course_import.php
index cb5747cb19..1eb3dee28e 100755
--- a/main/admin/course_import.php
+++ b/main/admin/course_import.php
@@ -4,8 +4,6 @@
 /**
  * This tool allows platform admins to create courses by uploading a CSV file
  * Copyright (c) 2005 Bart Mollet <bart.mollet@hogent.be>.
- *
- * @package chamilo.admin
  */
 
 /**
@@ -13,7 +11,7 @@
  *
  * @param array $courses
  *
- * @return array $errors
+ * @return array
  */
 function validate_courses_data($courses)
 {
@@ -159,9 +157,7 @@ function save_courses_data($courses)
  */
 function parse_csv_courses_data($file)
 {
-    $courses = Import::csv_reader($file);
-
-    return $courses;
+    return Import::csv_reader($file);
 }
 
 $cidReset = true;
diff --git a/main/admin/course_information.php b/main/admin/course_information.php
index d820f008fb..dfdf9f4c6c 100755
--- a/main/admin/course_information.php
+++ b/main/admin/course_information.php
@@ -4,8 +4,6 @@
  * This script gives information about a course.
  *
  * @author Bart Mollet
- *
- * @package chamilo.admin
  */
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
diff --git a/main/admin/course_request_accepted.php b/main/admin/course_request_accepted.php
index 20cdce7d59..26416bcaf0 100755
--- a/main/admin/course_request_accepted.php
+++ b/main/admin/course_request_accepted.php
@@ -1,11 +1,10 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
  * A list containig the accepted course requests.
  *
- * @package chamilo.admin
- *
  * @author José Manuel Abuin Mosquera <chema@cesga.es>, 2010
  * @author Bruno Rubio Gayo <brubio@cesga.es>, 2010
  * Centro de Supercomputacion de Galicia (CESGA)
diff --git a/main/admin/course_request_edit.php b/main/admin/course_request_edit.php
index a0dddcaca3..ad5f31ab85 100755
--- a/main/admin/course_request_edit.php
+++ b/main/admin/course_request_edit.php
@@ -1,11 +1,10 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
  * A page for detailed preview or edition of a given course request.
  *
- * @package chamilo.admin
- *
  * @author Ivan Tcholakov <ivantcholakov@gmail.com>, 2010
  */
 $cidReset = true;
diff --git a/main/admin/course_request_rejected.php b/main/admin/course_request_rejected.php
index 2baf6a1af9..9c51db9580 100755
--- a/main/admin/course_request_rejected.php
+++ b/main/admin/course_request_rejected.php
@@ -1,11 +1,10 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
  * A list containing the rejected course requests.
  *
- * @package chamilo.admin
- *
  * @author José Manuel Abuin Mosquera <chema@cesga.es>, 2010
  * @author Bruno Rubio Gayo <brubio@cesga.es>, 2010
  * Centro de Supercomputacion de Galicia (CESGA)
@@ -114,9 +113,9 @@ function get_request_data($from, $number_of_items, $column, $direction)
     $keyword = isset($_GET['keyword']) ? Database::escape_string(trim($_GET['keyword'])) : '';
     $course_request_table = Database::get_main_table(TABLE_MAIN_COURSE_REQUEST);
 
-    $from = intval($from);
-    $number_of_items = intval($number_of_items);
-    $column = intval($column);
+    $from = (int) $from;
+    $number_of_items = (int) $number_of_items;
+    $column = (int) $column;
     $direction = !in_array(strtolower(trim($direction)), ['asc', 'desc']) ? 'asc' : $direction;
 
     $sql = "SELECT
diff --git a/main/admin/course_request_review.php b/main/admin/course_request_review.php
index 47d8d58a6b..6be31c1616 100755
--- a/main/admin/course_request_review.php
+++ b/main/admin/course_request_review.php
@@ -1,11 +1,10 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
  * A list containing the pending course requests.
  *
- * @package chamilo.admin
- *
  * @author José Manuel Abuin Mosquera <chema@cesga.es>, 2010
  * Centro de Supercomputacion de Galicia (CESGA)
  * @author Ivan Tcholakov <ivantcholakov@gmail.com> (technical adaptation for Chamilo 1.8.8), 2010
diff --git a/main/admin/course_user_import.php b/main/admin/course_user_import.php
index b1e0edbceb..4b216a7550 100755
--- a/main/admin/course_user_import.php
+++ b/main/admin/course_user_import.php
@@ -4,8 +4,6 @@
 /**
  * This tool allows platform admins to update course-user relations by uploading
  * a CSV file.
- *
- * @package chamilo.admin
  */
 
 /**
@@ -142,9 +140,7 @@ function save_data($users_courses)
  */
 function parse_csv_data($file)
 {
-    $courses = Import::csvToArray($file);
-
-    return $courses;
+    return Import::csvToArray($file);
 }
 
 $cidReset = true;
diff --git a/main/admin/course_user_import_by_email.php b/main/admin/course_user_import_by_email.php
index 9522c315d4..9f3ab7c5ac 100755
--- a/main/admin/course_user_import_by_email.php
+++ b/main/admin/course_user_import_by_email.php
@@ -4,8 +4,6 @@ exit;
 /**
  * This tool allows platform admins to update course-user relations by uploading
  * a CSV file.
- *
- * @package chamilo.admin
  */
 /**
  * Validates the imported data.
@@ -140,9 +138,7 @@ function save_data($users_courses)
  */
 function parse_csv_data($file)
 {
-    $courses = Import::csv_reader($file);
-
-    return $courses;
+    return Import::csv_reader($file);
 }
 
 $cidReset = true;
diff --git a/main/admin/dashboard_add_courses_to_user.php b/main/admin/dashboard_add_courses_to_user.php
index 8986b73a70..91cdbddafd 100755
--- a/main/admin/dashboard_add_courses_to_user.php
+++ b/main/admin/dashboard_add_courses_to_user.php
@@ -3,8 +3,6 @@
 
 /**
  * Interface for assigning courses to Human Resources Manager.
- *
- * @package chamilo.admin
  */
 // resetting the course id
 $cidReset = true;
@@ -30,7 +28,7 @@ $tbl_course_rel_user = Database::get_main_table(TABLE_MAIN_COURSE_USER);
 $tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
 
 // initializing variables
-$user_id = intval($_GET['user']);
+$user_id = (int) ($_GET['user']);
 $user_info = api_get_user_info($user_id);
 $user_anonymous = api_get_anonymous_id();
 $current_user_id = api_get_user_id();
diff --git a/main/admin/dashboard_add_sessions_to_user.php b/main/admin/dashboard_add_sessions_to_user.php
index 2c593fc3e6..7eb0ceaa5a 100755
--- a/main/admin/dashboard_add_sessions_to_user.php
+++ b/main/admin/dashboard_add_sessions_to_user.php
@@ -3,8 +3,6 @@
 
 /**
  *  Interface for assigning sessions to Human Resources Manager.
- *
- *  @package chamilo.admin
  */
 // resetting the course id
 $cidReset = true;
diff --git a/main/admin/dashboard_add_users_to_user.php b/main/admin/dashboard_add_users_to_user.php
index 5a4fc2291b..79365efdfc 100755
--- a/main/admin/dashboard_add_users_to_user.php
+++ b/main/admin/dashboard_add_users_to_user.php
@@ -3,8 +3,6 @@
 
 /**
  *  Interface for assigning users to Human Resources Manager.
- *
- *  @package chamilo.admin
  */
 
 // resetting the course id
diff --git a/main/admin/email_tester.php b/main/admin/email_tester.php
index 4ef85b562f..8a94f3f4a5 100644
--- a/main/admin/email_tester.php
+++ b/main/admin/email_tester.php
@@ -2,8 +2,6 @@
 /* For licensing terms, see /license.txt */
 /**
  * Index page of the admin tools.
- *
- * @package chamilo.admin
  */
 // Resetting the course id.
 $cidReset = true;
diff --git a/main/admin/export_certificates.php b/main/admin/export_certificates.php
index 34aeeba24d..6d37fdb605 100644
--- a/main/admin/export_certificates.php
+++ b/main/admin/export_certificates.php
@@ -1,9 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-/**
- *  @package chamilo.admin
- */
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 Display::display_header(null);
diff --git a/main/admin/extra_field_options.php b/main/admin/extra_field_options.php
index 83ecacee3e..5041fed1c1 100755
--- a/main/admin/extra_field_options.php
+++ b/main/admin/extra_field_options.php
@@ -1,9 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-/**
- *  @package chamilo.admin
- */
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 
diff --git a/main/admin/extra_field_workflow.php b/main/admin/extra_field_workflow.php
index 346ea3fc3a..4e2e2c245d 100755
--- a/main/admin/extra_field_workflow.php
+++ b/main/admin/extra_field_workflow.php
@@ -3,9 +3,6 @@
 
 use Chamilo\CoreBundle\Entity\ExtraFieldOptionRelFieldOption;
 
-/**
- *  @package chamilo.admin
- */
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 
diff --git a/main/admin/extra_fields.php b/main/admin/extra_fields.php
index d800ed92ca..0d4ad04905 100755
--- a/main/admin/extra_fields.php
+++ b/main/admin/extra_fields.php
@@ -1,9 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-/**
- *  @package chamilo.admin
- */
 $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
diff --git a/main/admin/filler.php b/main/admin/filler.php
index 580ee9a7c7..00b9f40241 100755
--- a/main/admin/filler.php
+++ b/main/admin/filler.php
@@ -3,8 +3,6 @@
 
 /**
  * Index of the admin tools.
- *
- * @package chamilo.admin
  */
 
 // resetting the course id
diff --git a/main/admin/grade_models.php b/main/admin/grade_models.php
index d2745e8b62..68e55bc8d1 100755
--- a/main/admin/grade_models.php
+++ b/main/admin/grade_models.php
@@ -1,9 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-/**
- *  @package chamilo.admin
- */
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 
diff --git a/main/admin/gradebook_dependency.php b/main/admin/gradebook_dependency.php
index 96d0051bef..968ac43efe 100644
--- a/main/admin/gradebook_dependency.php
+++ b/main/admin/gradebook_dependency.php
@@ -8,7 +8,7 @@ require_once __DIR__.'/../inc/global.inc.php';
 api_protect_admin_script();
 
 $allow = api_get_configuration_value('gradebook_dependency');
-if ($allow == false) {
+if (false == $allow) {
     api_not_allowed(true);
 }
 
diff --git a/main/admin/gradebook_list.php b/main/admin/gradebook_list.php
index 74196097aa..b1a2a185d0 100644
--- a/main/admin/gradebook_list.php
+++ b/main/admin/gradebook_list.php
@@ -10,7 +10,7 @@ require_once __DIR__.'/../inc/global.inc.php';
 api_protect_admin_script();
 
 $allow = api_get_configuration_value('gradebook_dependency');
-if ($allow == false) {
+if (false == $allow) {
     api_not_allowed(true);
 }
 
diff --git a/main/admin/languages.php b/main/admin/languages.php
index 325c509ad5..c1d11bcd9f 100755
--- a/main/admin/languages.php
+++ b/main/admin/languages.php
@@ -12,8 +12,6 @@
  * @author Roan EMbrechts, code cleaning
  *
  * @since Dokeos 1.6
- *
- * @package chamilo.admin
  */
 
 // we are in the admin area so we do not need a course id
diff --git a/main/admin/legal_add.php b/main/admin/legal_add.php
index 29ed44a018..9d86bae30b 100755
--- a/main/admin/legal_add.php
+++ b/main/admin/legal_add.php
@@ -3,8 +3,6 @@
 
 /**
  * Management of legal conditions.
- *
- * @package chamilo.admin
  */
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
@@ -12,7 +10,7 @@ $this_section = SECTION_PLATFORM_ADMIN;
 
 api_protect_admin_script();
 
-if (api_get_setting('allow_terms_conditions') !== 'true') {
+if ('true' !== api_get_setting('allow_terms_conditions')) {
     api_not_allowed(true);
 }
 
@@ -70,10 +68,10 @@ if ($form->validate()) {
 
         $default['content'] = $content;
         if (isset($values['language'])) {
-            if ($submit == 'back') {
+            if ('back' == $submit) {
                 header('Location: legal_add.php');
                 exit;
-            } elseif ($submit === 'save') {
+            } elseif ('save' === $submit) {
                 $id = LegalManager::add($lang, $content, $type, $changes, $values);
                 if (!empty($id)) {
                     Display::addFlash(Display::return_message(get_lang('TermAndConditionSaved'), 'success'));
diff --git a/main/admin/promotions.php b/main/admin/promotions.php
index fb7f84544f..0db2e9317f 100755
--- a/main/admin/promotions.php
+++ b/main/admin/promotions.php
@@ -1,9 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-/**
- *  @package chamilo.admin
- */
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 
diff --git a/main/admin/questions.php b/main/admin/questions.php
index 8d2ed8aabb..3772bc31d2 100644
--- a/main/admin/questions.php
+++ b/main/admin/questions.php
@@ -7,9 +7,6 @@ use ChamiloSession as Session;
 use Doctrine\Common\Collections\Criteria;
 use Knp\Component\Pager\Paginator;
 
-/**
- *  @package chamilo.admin
- */
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 
diff --git a/main/admin/settings.lib.php b/main/admin/settings.lib.php
index abc73f9e53..25ecf1e007 100755
--- a/main/admin/settings.lib.php
+++ b/main/admin/settings.lib.php
@@ -13,8 +13,6 @@ use Symfony\Component\Filesystem\Filesystem;
  * @author Guillaume Viguier <guillaume@viguierjust.com>
  *
  * @since Chamilo 1.8.7
- *
- * @package chamilo.admin
  */
 define('CSS_UPLOAD_PATH', api_get_path(SYS_APP_PATH).'Resources/public/css/themes/');
 
diff --git a/main/admin/settings.php b/main/admin/settings.php
index 098051c2e0..5e564e81cd 100755
--- a/main/admin/settings.php
+++ b/main/admin/settings.php
@@ -9,8 +9,6 @@ use ChamiloSession as Session;
  *
  * @author Patrick Cool
  * @author Julio Montoya - Multiple URL site
- *
- * @package chamilo.admin
  */
 
 // Resetting the course id.
diff --git a/main/admin/skill.php b/main/admin/skill.php
index eaaca79c54..dfb4fd5b8a 100644
--- a/main/admin/skill.php
+++ b/main/admin/skill.php
@@ -5,8 +5,6 @@ use Chamilo\CoreBundle\Entity\Skill;
 
 /**
  * This script manages the skills, levels and profiles assignments.
- *
- * @package chamilo.skill
  */
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
diff --git a/main/admin/skill_badge.php b/main/admin/skill_badge.php
index 3e73e4b696..e12f337f8b 100644
--- a/main/admin/skill_badge.php
+++ b/main/admin/skill_badge.php
@@ -4,8 +4,6 @@
  * Show information about Mozilla OpenBadges.
  *
  * @author Angel Fernando Quiroz Campos <angel.quiroz@beeznest.com>
- *
- * @package chamilo.admin.openbadges
  */
 $cidReset = true;
 
diff --git a/main/admin/skill_badge_create.php b/main/admin/skill_badge_create.php
index 2aef0dafef..aab0c76766 100644
--- a/main/admin/skill_badge_create.php
+++ b/main/admin/skill_badge_create.php
@@ -5,8 +5,6 @@
  * Show information about Mozilla OpenBadges.
  *
  * @author Angel Fernando Quiroz Campos <angel.quiroz@beeznest.com>
- *
- * @package chamilo.admin.openbadges
  */
 $cidReset = true;
 
diff --git a/main/admin/skill_level.php b/main/admin/skill_level.php
index 8bfad072db..e7b06c3640 100644
--- a/main/admin/skill_level.php
+++ b/main/admin/skill_level.php
@@ -5,8 +5,6 @@ use Chamilo\SkillBundle\Entity\Level;
 
 /**
  * Add a skill Level.
- *
- * @package chamilo.skill
  */
 $cidReset = true;
 
diff --git a/main/admin/skill_list.php b/main/admin/skill_list.php
index 0569e05ce8..1f9a0de9af 100644
--- a/main/admin/skill_list.php
+++ b/main/admin/skill_list.php
@@ -5,8 +5,6 @@
  * Skill list for management.
  *
  * @author Angel Fernando Quiroz Campos <angel.quiroz@beeznest.com>
- *
- * @package chamilo.admin
  */
 $cidReset = true;
 
diff --git a/main/admin/skills.php b/main/admin/skills.php
index 0d8db2379a..e1e0c945d3 100755
--- a/main/admin/skills.php
+++ b/main/admin/skills.php
@@ -1,9 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-/**
- *  @package chamilo.admin
- */
 $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
diff --git a/main/admin/skills_gradebook.php b/main/admin/skills_gradebook.php
index ddd55198f8..6b93afdcb5 100755
--- a/main/admin/skills_gradebook.php
+++ b/main/admin/skills_gradebook.php
@@ -1,9 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-/**
- *  @package chamilo.admin
- */
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 
diff --git a/main/admin/skills_import.php b/main/admin/skills_import.php
index 2b338cad4d..af8bfaa0b9 100755
--- a/main/admin/skills_import.php
+++ b/main/admin/skills_import.php
@@ -3,7 +3,6 @@
 /**
  * This tool allows platform admins to add skills by uploading a CSV or XML file.
  *
- * @package chamilo.admin
  * @documentation Some interesting basic skills can be found in the "Skills"
  * section here: http://en.wikipedia.org/wiki/Personal_knowledge_management
  */
diff --git a/main/admin/skills_profile.php b/main/admin/skills_profile.php
index b1e544d8a5..c19b728796 100755
--- a/main/admin/skills_profile.php
+++ b/main/admin/skills_profile.php
@@ -3,9 +3,6 @@
 
 use ChamiloSession as Session;
 
-/**
- *  @package chamilo.admin
- */
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 $this_section = SECTION_PLATFORM_ADMIN;
diff --git a/main/admin/skills_wheel.php b/main/admin/skills_wheel.php
index df1b9fe674..69e6022506 100755
--- a/main/admin/skills_wheel.php
+++ b/main/admin/skills_wheel.php
@@ -1,9 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-/**
- *  @package chamilo.admin
- */
 $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
diff --git a/main/admin/specific_fields_add.php b/main/admin/specific_fields_add.php
index e1d8cd1a7a..7274b806a4 100755
--- a/main/admin/specific_fields_add.php
+++ b/main/admin/specific_fields_add.php
@@ -3,8 +3,6 @@
 
 /**
  * Add form.
- *
- * @package chamilo.admin
  */
 
 // Resetting the course id.
diff --git a/main/admin/statistics.php b/main/admin/statistics.php
index 723f7fd7d4..cc01837b2a 100755
--- a/main/admin/statistics.php
+++ b/main/admin/statistics.php
@@ -1,9 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-/**
- *   @package chamilo.admin
- */
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 $this_section = SECTION_PLATFORM_ADMIN;
diff --git a/main/admin/system_status.php b/main/admin/system_status.php
index d407e31950..4810357b15 100755
--- a/main/admin/system_status.php
+++ b/main/admin/system_status.php
@@ -1,7 +1,6 @@
 <?php
 
 /* For licensing terms, see /license.txt */
-
 /**
  * @author Julio Montoya <gugli100@gmail.com>
  */
diff --git a/main/admin/user_export.php b/main/admin/user_export.php
index 015c173dfa..281673a360 100755
--- a/main/admin/user_export.php
+++ b/main/admin/user_export.php
@@ -1,9 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-/**
- * @package chamilo.admin
- */
 $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
diff --git a/main/admin/user_import.php b/main/admin/user_import.php
index debec28452..c4d20d150b 100644
--- a/main/admin/user_import.php
+++ b/main/admin/user_import.php
@@ -6,8 +6,6 @@ use ChamiloSession as Session;
 
 /**
  * This tool allows platform admins to add users by uploading a CSV or XML file.
- *
- * @package chamilo.admin
  */
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
diff --git a/main/admin/user_information.php b/main/admin/user_information.php
index 42080f0937..089418dd97 100755
--- a/main/admin/user_information.php
+++ b/main/admin/user_information.php
@@ -653,7 +653,7 @@ if ($hrmList) {
     echo '</div>';
 }
 
-if ($user['status'] == DRH) {
+if (DRH == $user['status']) {
     $usersAssigned = UserManager::get_users_followed_by_drh($userId);
 
     if ($usersAssigned) {
@@ -700,7 +700,6 @@ echo Tracking::displayUserSkills(
 );
 if (api_get_configuration_value('allow_career_users')) {
     $careers = UserManager::getUserCareers($userId);
-
     if (!empty($careers)) {
         echo Display::page_subheader(get_lang('Careers'), null, 'h3', ['class' => 'section-title']);
         $table = new HTML_Table(['class' => 'data_table']);
diff --git a/main/admin/user_list.php b/main/admin/user_list.php
index 1d112fe462..c3ee566711 100755
--- a/main/admin/user_list.php
+++ b/main/admin/user_list.php
@@ -485,7 +485,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
             alt="'.api_get_person_name($user[2], $user[3]).'"
             title="'.api_get_person_name($user[2], $user[3]).'" />';
 
-        if ($user[7] == 1 && !empty($user['exp'])) {
+        if (1 == $user[7] && !empty($user['exp'])) {
             // check expiration date
             $expiration_time = convert_sql_date($user['exp']);
             // if expiration date is passed, store a special value for active field
@@ -820,20 +820,20 @@ function active_filter($active, $params, $row)
 {
     $_user = api_get_user_info();
 
-    if ($active == '1') {
+    if ('1' == $active) {
         $action = 'Lock';
         $image = 'accept';
-    } elseif ($active == '-1') {
+    } elseif ('-1' == $active) {
         $action = 'edit';
         $image = 'warning';
-    } elseif ($active == '0') {
+    } elseif ('0' == $active) {
         $action = 'Unlock';
         $image = 'error';
     }
 
     $result = '';
 
-    if ($action === 'edit') {
+    if ('edit' === $action) {
         $result = Display::return_icon(
             $image.'.png',
             get_lang('AccountExpired'),
@@ -1170,7 +1170,7 @@ $table_result = $table->return_table();
 $extra_search_options = '';
 
 // Try to search the user everywhere
-if ($table->get_total_number_of_items() == 0) {
+if (0 == $table->get_total_number_of_items()) {
     if (api_get_multiple_access_url() && isset($_REQUEST['keyword'])) {
         $keyword = Database::escape_string($_REQUEST['keyword']);
         $conditions = ['username' => $keyword];
diff --git a/main/admin/user_list_consent.php b/main/admin/user_list_consent.php
index 9fbcf3ae92..5fb7bf441b 100644
--- a/main/admin/user_list_consent.php
+++ b/main/admin/user_list_consent.php
@@ -6,8 +6,6 @@ use ChamiloSession as Session;
 /**
  * @author Bart Mollet
  * @author Julio Montoya <gugli100@gmail.com> BeezNest 2011
- *
- * @package chamilo.admin
  */
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
@@ -100,7 +98,7 @@ function prepare_user_sql_query($getCount)
         }
     }
 
-    if ($atLeastOne == false) {
+    if (false == $atLeastOne) {
         $keywordListValues = [];
     }
 
@@ -225,7 +223,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
             alt="'.api_get_person_name($user[2], $user[3]).'" 
             title="'.api_get_person_name($user[2], $user[3]).'" />';
 
-        if ($user[7] == 1 && !empty($user[10])) {
+        if (1 == $user[7] && !empty($user[10])) {
             // check expiration date
             $expiration_time = convert_sql_date($user[10]);
             // if expiration date is passed, store a special value for active field
diff --git a/main/admin/user_move_stats.php b/main/admin/user_move_stats.php
index c2ad282728..4bf6ba8ed1 100755
--- a/main/admin/user_move_stats.php
+++ b/main/admin/user_move_stats.php
@@ -3,8 +3,6 @@
 
 /**
  * User move script (to move between courses and sessions).
- *
- * @package chamilo.admin
  */
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
diff --git a/main/admin/user_update_import.php b/main/admin/user_update_import.php
index d6952a33b0..f75bfb7736 100644
--- a/main/admin/user_update_import.php
+++ b/main/admin/user_update_import.php
@@ -3,8 +3,6 @@
 
 /**
  * This tool allows platform admins to add users by uploading a CSV or XML file.
- *
- * @package chamilo.admin
  */
 
 use Ddeboer\DataImport\Reader\CsvReader;
diff --git a/main/admin/usergroup_export.php b/main/admin/usergroup_export.php
index 8cdc7ed534..09b149469e 100755
--- a/main/admin/usergroup_export.php
+++ b/main/admin/usergroup_export.php
@@ -1,9 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-/**
- *	@package chamilo.admin
- */
 $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
diff --git a/main/admin/usergroup_import.php b/main/admin/usergroup_import.php
index b33e35873a..8053ed1f63 100755
--- a/main/admin/usergroup_import.php
+++ b/main/admin/usergroup_import.php
@@ -5,8 +5,6 @@
  *  This tool allows platform admins to add classes by uploading a CSV file.
  *
  * @todo Add some langvars to DLTT
- *
- * @package chamilo.admin
  */
 
 /**
diff --git a/main/admin/usergroup_user_import.php b/main/admin/usergroup_user_import.php
index bab66afeda..f2a2fac502 100755
--- a/main/admin/usergroup_user_import.php
+++ b/main/admin/usergroup_user_import.php
@@ -1,8 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
-/**
- * @package chamilo.admin
- */
+
 /**
  * Code
  * This tool allows platform admins to update class-user relations by uploading
diff --git a/main/admin/usergroup_users.php b/main/admin/usergroup_users.php
index ebb7a6cf68..2bbeabdfb5 100644
--- a/main/admin/usergroup_users.php
+++ b/main/admin/usergroup_users.php
@@ -1,9 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-/**
- *  @package chamilo.admin
- */
 require_once __DIR__.'/../inc/global.inc.php';
 
 $this_section = SECTION_PLATFORM_ADMIN;
diff --git a/main/admin/usergroups.php b/main/admin/usergroups.php
index d699a0f356..72b29eb367 100755
--- a/main/admin/usergroups.php
+++ b/main/admin/usergroups.php
@@ -1,9 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-/**
- *  @package chamilo.admin
- */
 $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index 928ed3b072..863e4a9361 100755
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -11,8 +11,6 @@
  *             Announcements tool and also add the resource linker here. The database also needed refactoring
  *             as there was no title field (the title was merged into the content field) multiple functions
  */
-
-// use anonymous mode when accessing this course tool
 $use_anonymous = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
@@ -97,13 +95,13 @@ switch ($action) {
 
         /* Move announcement up/down */
         if (!empty($_GET['down'])) {
-            $thisAnnouncementId = intval($_GET['down']);
-            $sortDirection = "DESC";
+            $thisAnnouncementId = (int) ($_GET['down']);
+            $sortDirection = 'DESC';
         }
 
         if (!empty($_GET['up'])) {
-            $thisAnnouncementId = intval($_GET['up']);
-            $sortDirection = "ASC";
+            $thisAnnouncementId = (int) ($_GET['up']);
+            $sortDirection = 'ASC';
         }
 
         if (!empty($sortDirection)) {
@@ -327,7 +325,7 @@ switch ($action) {
     case 'delete_all':
         if (api_is_allowed_to_edit()) {
             $allow = api_get_configuration_value('disable_delete_all_announcements');
-            if ($allow === false) {
+            if (false === $allow) {
                 AnnouncementManager::delete_all_announcements($_course);
                 Display::addFlash(Display::return_message(get_lang('AnnouncementDeletedAll')));
             }
@@ -614,7 +612,7 @@ switch ($action) {
 
         $config = api_get_configuration_value('announcements_hide_send_to_hrm_users');
 
-        if ($config === false) {
+        if (false === $config) {
             $form->addCheckBox(
                 'send_to_hrm_users',
                 null,
diff --git a/main/announcements/download.php b/main/announcements/download.php
index bf9db69bd5..a4a222ebec 100755
--- a/main/announcements/download.php
+++ b/main/announcements/download.php
@@ -41,7 +41,7 @@ if (is_dir($full_file_name)) {
     //remove last slash if present
     //$doc_url = ($doc_url{strlen($doc_url)-1}=='/')?substr($doc_url,0,strlen($doc_url)-1):$doc_url;
     //mod_rewrite can change /some/path/ to /some/path// in some cases, so clean them all off (René)
-    while ($doc_url[$dul = strlen($doc_url) - 1] == '/') {
+    while ('/' == $doc_url[$dul = strlen($doc_url) - 1]) {
         $doc_url = substr($doc_url, 0, $dul);
     }
     //create the path
@@ -71,7 +71,7 @@ if (Database::num_rows($result) > 0) {
     )
     ) {
         $result = DocumentManager::file_send_for_download($full_file_name, true, $title);
-        if ($result === false) {
+        if (false === $result) {
             api_not_allowed(true);
         }
     }
diff --git a/main/badge/assertion.php b/main/badge/assertion.php
index 132e0f4464..7fe0786fdb 100644
--- a/main/badge/assertion.php
+++ b/main/badge/assertion.php
@@ -5,8 +5,6 @@
  * Show information about a new assertion.
  *
  * @author Angel Fernando Quiroz Campos <angel.quiroz@beeznest.com>
- *
- * @package chamilo.badge
  */
 require_once __DIR__.'/../inc/global.inc.php';
 
@@ -15,7 +13,7 @@ $skillId = isset($_GET['skill']) ? (int) $_GET['skill'] : 0;
 $courseId = isset($_GET['course']) ? (int) $_GET['course'] : 0;
 $sessionId = isset($_GET['session']) ? (int) $_GET['session'] : 0;
 
-if ($userId === 0 || $skillId === 0) {
+if (0 === $userId || 0 === $skillId) {
     exit;
 }
 
@@ -32,7 +30,7 @@ $userSkill = $objSkillRelUser->getByUserAndSkill(
     $sessionId
 );
 
-if ($userSkill == false) {
+if (false == $userSkill) {
     exit;
 }
 
diff --git a/main/badge/assign.php b/main/badge/assign.php
index eabac0c27b..c2da385c29 100644
--- a/main/badge/assign.php
+++ b/main/badge/assign.php
@@ -8,8 +8,6 @@ use Skill as SkillManager;
  * Page for assign skills to a user.
  *
  * @author: Jose Loguercio <jose.loguercio@beeznest.com>
- *
- * @package chamilo.badge
  */
 require_once __DIR__.'/../inc/global.inc.php';
 
diff --git a/main/badge/class.php b/main/badge/class.php
index a880b85e92..2c23e93ff3 100644
--- a/main/badge/class.php
+++ b/main/badge/class.php
@@ -5,8 +5,6 @@
  * Show information about the OpenBadge class.
  *
  * @author Angel Fernando Quiroz Campos <angel.quiroz@beeznest.com>
- *
- * @package chamilo.badge
  */
 require_once __DIR__.'/../inc/global.inc.php';
 
diff --git a/main/badge/criteria.php b/main/badge/criteria.php
index 13e9ceb28c..def38c499f 100644
--- a/main/badge/criteria.php
+++ b/main/badge/criteria.php
@@ -5,8 +5,6 @@
  * Show information about OpenBadge criteria.
  *
  * @author Angel Fernando Quiroz Campos <angel.quiroz@beeznest.com>
- *
- * @package chamilo.badge
  */
 require_once __DIR__.'/../inc/global.inc.php';
 
diff --git a/main/badge/issued.php b/main/badge/issued.php
index 211c8fd7ce..112abd2903 100644
--- a/main/badge/issued.php
+++ b/main/badge/issued.php
@@ -10,8 +10,6 @@ use SkillRelUser as SkillRelUserManager;
  *
  * @author Angel Fernando Quiroz Campos <angel.quiroz@beeznest.com>
  * @author José Loguercio Silva <jose.loguercio@beeznest.com>
- *
- * @package chamilo.badge
  */
 require_once __DIR__.'/../inc/global.inc.php';
 
@@ -233,7 +231,7 @@ if ($allowExport) {
     $backpack = 'https://backpack.openbadges.org/';
     $configBackpack = api_get_setting('openbadges_backpack');
 
-    if (strcmp($backpack, $configBackpack) !== 0) {
+    if (0 !== strcmp($backpack, $configBackpack)) {
         $backpack = $configBackpack;
         if (substr($backpack, -1) !== '/') {
             $backpack .= '/';
diff --git a/main/badge/issued_all.php b/main/badge/issued_all.php
index 409859921e..2f59d99c0e 100644
--- a/main/badge/issued_all.php
+++ b/main/badge/issued_all.php
@@ -9,8 +9,6 @@ use SkillRelUser as SkillRelUserManager;
  * Show information about all issued badges with same skill by user.
  *
  * @author José Loguercio Silva <jose.loguercio@beeznest.com>
- *
- * @package chamilo.badge
  */
 require_once __DIR__.'/../inc/global.inc.php';
 
@@ -220,7 +218,7 @@ foreach ($userSkills as $index => $skillIssue) {
         $backpack = 'https://backpack.openbadges.org/';
         $configBackpack = api_get_setting('openbadges_backpack');
 
-        if (strcmp($backpack, $configBackpack) !== 0) {
+        if (0 !== strcmp($backpack, $configBackpack)) {
             $backpack = $configBackpack;
             if (substr($backpack, -1) !== '/') {
                 $backpack .= '/';
diff --git a/main/badge/issuer.php b/main/badge/issuer.php
index 1bfb97e834..9302200dd6 100644
--- a/main/badge/issuer.php
+++ b/main/badge/issuer.php
@@ -5,8 +5,6 @@
  * Show information about the OpenBadge issuer.
  *
  * @author Angel Fernando Quiroz Campos <angel.quiroz@beeznest.com>
- *
- * @package chamilo.badge
  */
 require_once __DIR__.'/../inc/global.inc.php';
 
diff --git a/main/blog/blog.php b/main/blog/blog.php
index 8b275ae983..2364b1faf6 100755
--- a/main/blog/blog.php
+++ b/main/blog/blog.php
@@ -3,8 +3,6 @@
 /**
  * BLOG HOMEPAGE
  * This file takes care of all blog navigation and displaying.
- *
- * @package chamilo.blogs
  */
 require_once __DIR__.'/../inc/global.inc.php';
 
diff --git a/main/blog/blog_admin.php b/main/blog/blog_admin.php
index 5fa076f16c..069433821a 100755
--- a/main/blog/blog_admin.php
+++ b/main/blog/blog_admin.php
@@ -4,8 +4,6 @@
 /**
  * BLOG HOMEPAGE
  * This file takes care of all blog navigation and displaying.
- *
- * @package chamilo.blogs
  */
 require_once __DIR__.'/../inc/global.inc.php';
 $current_course_tool = TOOL_BLOGS;
diff --git a/main/blog/download.php b/main/blog/download.php
index 62e7beb114..d5b5c53fa7 100755
--- a/main/blog/download.php
+++ b/main/blog/download.php
@@ -5,8 +5,6 @@
  * Html files are parsed to fix a few problems with URLs,
  * but this code will hopefully be replaced soon by an Apache URL
  * rewrite mechanism.
- *
- * @package chamilo.blogs
  */
 session_cache_limiter('public');
 
@@ -36,7 +34,7 @@ $full_file_name = api_get_path(SYS_COURSE_PATH).api_get_course_path().'/upload/b
 //if the rewrite rule asks for a directory, we redirect to the course view
 if (is_dir($full_file_name)) {
     //remove last slash if present
-    while ($doc_url[$dul = strlen($doc_url) - 1] == '/') {
+    while ('/' == $doc_url[$dul = strlen($doc_url) - 1]) {
         $doc_url = substr($doc_url, 0, $dul);
     }
     //create the path
diff --git a/main/calendar/agenda.php b/main/calendar/agenda.php
index 307c01ff47..76e796fcae 100755
--- a/main/calendar/agenda.php
+++ b/main/calendar/agenda.php
@@ -1,10 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-/**
- * @package chamilo.calendar
- */
-
 // use anonymous mode when accessing this course tool
 $use_anonymous = true;
 require_once __DIR__.'/../inc/global.inc.php';
@@ -31,10 +27,7 @@ if (empty($action)) {
 
 $logInfo = [
     'tool' => TOOL_CALENDAR_EVENT,
-    'tool_id' => 0,
-    'tool_id_detail' => 0,
     'action' => $action,
-    'info' => '',
 ];
 Event::registerLog($logInfo);
 
diff --git a/main/calendar/agenda_js.php b/main/calendar/agenda_js.php
index 118ea248e2..ef1580d466 100755
--- a/main/calendar/agenda_js.php
+++ b/main/calendar/agenda_js.php
@@ -1,9 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-/**
- * @package chamilo.calendar
- */
 
 // use anonymous mode when accessing this course tool
 $use_anonymous = true;
@@ -274,7 +271,7 @@ $form->addHtmlEditor(
     ]
 );
 
-if ($agenda->type === 'course') {
+if ('course' === $agenda->type) {
     $form->addHtml('<div id="add_as_announcement_div" style="display: none">');
     $form->addElement('checkbox', 'add_as_annonuncement', null, get_lang('AddAsAnnouncement'));
     $form->addHtml('</div>');
diff --git a/main/calendar/agenda_list.php b/main/calendar/agenda_list.php
index cad5594c9a..9ff9479ee7 100755
--- a/main/calendar/agenda_list.php
+++ b/main/calendar/agenda_list.php
@@ -1,17 +1,13 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
-/**
- * @package chamilo.calendar
- */
 require_once __DIR__.'/../inc/global.inc.php';
 
 $action = isset($_GET['action']) ? Security::remove_XSS($_GET['action']) : 'calendar_list';
 
 $logInfo = [
     'tool' => TOOL_CALENDAR_EVENT,
-    'tool_id' => 0,
-    'tool_id_detail' => 0,
     'action' => $action,
 ];
 Event::registerLog($logInfo);
diff --git a/main/course_description/add.php b/main/course_description/add.php
index 122733b0dc..fa05437217 100755
--- a/main/course_description/add.php
+++ b/main/course_description/add.php
@@ -5,8 +5,6 @@
  * View (MVC patter) for adding a course description.
  *
  * @author Christian Fasanando <christian1827@gmail.com>
- *
- * @package chamilo.course_description
  */
 
 // protect a course script
diff --git a/main/course_description/course_description_controller.php b/main/course_description/course_description_controller.php
index 597e0239a5..ed0e242868 100644
--- a/main/course_description/course_description_controller.php
+++ b/main/course_description/course_description_controller.php
@@ -7,8 +7,6 @@
  * it should be included inside a dispatcher file (e.g: index.php).
  *
  * @author Christian Fasanando <christian1827@gmail.com>
- *
- * @package chamilo.course_description
  */
 class CourseDescriptionController
 {
diff --git a/main/course_description/edit.php b/main/course_description/edit.php
index 82e16b7f75..eafcb26f5d 100755
--- a/main/course_description/edit.php
+++ b/main/course_description/edit.php
@@ -5,8 +5,6 @@
  * View (MVC patter) for editing a course description.
  *
  * @author Christian Fasanando <christian1827@gmail.com>
- *
- * @package chamilo.course_description
  */
 
 // protect a course script
diff --git a/main/course_description/layout.php b/main/course_description/layout.php
index 997b971d6c..acd6b76898 100755
--- a/main/course_description/layout.php
+++ b/main/course_description/layout.php
@@ -5,8 +5,6 @@
  * Layout (principal view) used for structuring other views.
  *
  * @author Christian Fasanando <christian1827@gmail.com>
- *
- * @package chamilo.course_description
  */
 
 // protect a course script
diff --git a/main/course_info/download.php b/main/course_info/download.php
index 737d07ac0e..fa6f5a7c58 100755
--- a/main/course_info/download.php
+++ b/main/course_info/download.php
@@ -5,8 +5,6 @@ use Chamilo\CourseBundle\Component\CourseCopy\CourseArchiver;
 
 /**
  * Download script for course info.
- *
- * @package chamilo.course_info
  */
 require_once __DIR__.'/../inc/global.inc.php';
 $this_section = SECTION_COURSES;
@@ -32,7 +30,7 @@ if (in_array($extension, ['xml', 'csv']) &&
     (api_is_platform_admin(true) || api_is_drh())
 ) {
     $content_type = 'application/force-download';
-} elseif ($extension === 'zip' && $_cid && (api_is_platform_admin(true) || api_is_course_admin())) {
+} elseif ('zip' === $extension && $_cid && (api_is_platform_admin(true) || api_is_course_admin())) {
     $content_type = 'application/force-download';
 }
 
diff --git a/main/course_info/legal.php b/main/course_info/legal.php
index 70473776e6..7de0f0465d 100755
--- a/main/course_info/legal.php
+++ b/main/course_info/legal.php
@@ -23,7 +23,7 @@ $enabled = api_get_plugin_setting('courselegal', 'tool_enable');
 $pluginExtra = null;
 $pluginLegal = false;
 
-if ($enabled == 'true') {
+if ('true' == $enabled) {
     $pluginLegal = true;
     require_once api_get_path(SYS_PLUGIN_PATH).'courselegal/config.php';
     $plugin = CourseLegalPlugin::create();
diff --git a/main/dropbox/dropbox_init.inc.php b/main/dropbox/dropbox_init.inc.php
index befd6b75b5..cbd3ce963b 100755
--- a/main/dropbox/dropbox_init.inc.php
+++ b/main/dropbox/dropbox_init.inc.php
@@ -15,8 +15,6 @@ use ChamiloSession as Session;
  * @author Roan Embrechts, virtual course support
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University (see history version 1.3)
  *
- * @package chamilo.dropbox
- *
  * @todo complete refactoring. Currently there are about at least 3 sql queries needed for every individual dropbox document.
  *  first we find all the documents that were sent (resp. received) by the user
  *   then for every individual document the user(s)information who received (resp. sent) the document is searched
@@ -108,8 +106,6 @@ Version 1.1
  * download file / folder (download icon)
  * same action on multiple documents
  * extended feedback
- *
- * @package chamilo.dropbox
  */
 require_once __DIR__.'/../inc/global.inc.php';
 $is_allowed_in_course = api_is_allowed_in_course();
@@ -156,7 +152,7 @@ if (empty($session_id)) {
 // off all the documents that have already been sent.
 // @todo consider moving the javascripts in a function that displays the javascripts
 // only when it is needed.
-if ($action == 'add') {
+if ('add' == $action) {
     $dropbox_person = new Dropbox_Person(
         $user_id,
         $is_courseAdmin,
diff --git a/main/dropbox/update.php b/main/dropbox/update.php
index 532e632fd7..c9db38c65d 100644
--- a/main/dropbox/update.php
+++ b/main/dropbox/update.php
@@ -6,7 +6,7 @@ require_once 'dropbox_init.inc.php';
 
 api_protect_course_script();
 
-if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+if (0 != api_get_session_id() && !api_is_allowed_to_session_edit(false, true)) {
     api_not_allowed(true);
 }
 
diff --git a/main/exercise/Draggable.php b/main/exercise/Draggable.php
index 94e1792295..af901aa9b6 100644
--- a/main/exercise/Draggable.php
+++ b/main/exercise/Draggable.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
@@ -158,7 +159,7 @@ class Draggable extends Question
         } else {
             $form->setDefaults(['orientation' => 'h']);
 
-            if ($this->isContent == 1) {
+            if (1 == $this->isContent) {
                 $form->setDefaults($defaults);
             }
         }
diff --git a/main/exercise/HotSpotDelineation.php b/main/exercise/HotSpotDelineation.php
index dea533c926..8d327ba11b 100644
--- a/main/exercise/HotSpotDelineation.php
+++ b/main/exercise/HotSpotDelineation.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
diff --git a/main/exercise/Hpdownload.php b/main/exercise/Hpdownload.php
index 4fcea25412..bc97aba20f 100755
--- a/main/exercise/Hpdownload.php
+++ b/main/exercise/Hpdownload.php
@@ -1,10 +1,9 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 /**
  * This script shows the list of exercises for administrators and students.
  *
- * @package chamilo.exercise
- *
  * @author Istvan Mandak
  *
  * @version $Id: Hpdownload.php 22201 2009-07-17 19:57:03Z cfasanando $
@@ -41,7 +40,7 @@ if (!Security::check_abs_path($full_file_name, $course_path.'/')) {
 }
 
 $extension = explode('.', $filename);
-$extension = strtolower($extension[sizeof($extension) - 1]);
+$extension = strtolower($extension[count($extension) - 1]);
 
 switch ($extension) {
     case 'gz':
diff --git a/main/exercise/MultipleAnswerTrueFalseDegreeCertainty.php b/main/exercise/MultipleAnswerTrueFalseDegreeCertainty.php
index 37a1853125..fdb97575e1 100644
--- a/main/exercise/MultipleAnswerTrueFalseDegreeCertainty.php
+++ b/main/exercise/MultipleAnswerTrueFalseDegreeCertainty.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 use ChamiloSession as Session;
@@ -7,8 +8,6 @@ use ChamiloSession as Session;
  * Class MultipleAnswerTrueFalseDegreeCertainty
  * This class allows to instantiate an object of type MULTIPLE_ANSWER
  * (MULTIPLE CHOICE, MULTIPLE ANSWER), extending the class question.
- *
- * @package chamilo.exercise
  */
 class MultipleAnswerTrueFalseDegreeCertainty extends Question
 {
diff --git a/main/exercise/ReadingComprehension.php b/main/exercise/ReadingComprehension.php
index ca77fa911f..0ee13776b4 100755
--- a/main/exercise/ReadingComprehension.php
+++ b/main/exercise/ReadingComprehension.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
@@ -6,8 +7,6 @@
  *
  * This class allows to instantiate an object of type READING_COMPREHENSION
  * extending the class question
- *
- * @package chamilo.exercise
  */
 class ReadingComprehension extends UniqueAnswer
 {
diff --git a/main/exercise/UniqueAnswerImage.php b/main/exercise/UniqueAnswerImage.php
index bfd3ee02fc..4817f2e5cb 100644
--- a/main/exercise/UniqueAnswerImage.php
+++ b/main/exercise/UniqueAnswerImage.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 use ChamiloSession as Session;
@@ -146,12 +147,12 @@ class UniqueAnswerImage extends UniqueAnswer
                 $url = $itemList[3];
 
                 $tryResult = 0;
-                if ($try != 0) {
+                if (0 != $try) {
                     $tryResult = 1;
                 }
 
                 $urlResult = '';
-                if ($url != 0) {
+                if (0 != $url) {
                     $urlResult = $url;
                 }
 
@@ -230,7 +231,7 @@ class UniqueAnswerImage extends UniqueAnswer
         }
 
         // We check the first radio button to be sure a radio button will be check
-        if ($correct == 0) {
+        if (0 == $correct) {
             $correct = 1;
         }
 
@@ -239,7 +240,7 @@ class UniqueAnswerImage extends UniqueAnswer
         if (!empty($this->id)) {
             $form->setDefaults($defaults);
         } else {
-            if ($this->isContent == 1) {
+            if (1 == $this->isContent) {
                 // Default sample content.
                 $form->setDefaults($defaults);
             } else {
diff --git a/main/exercise/admin.php b/main/exercise/admin.php
index 14c8a93b5a..86a5e2b89f 100755
--- a/main/exercise/admin.php
+++ b/main/exercise/admin.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 use ChamiloSession as Session;
@@ -41,8 +42,6 @@ use ChamiloSession as Session;
  * - $cancelAnswers : ask to cancel answer modifications
  * - $buttonBack : ask to go back to the previous page in answers of type "Fill in blanks"
  *
- * @package chamilo.exercise
- *
  * @author Olivier Brouckaert
  * Modified by Hubert Borderiou 21-10-2011 Question by category
  */
diff --git a/main/exercise/aiken.php b/main/exercise/aiken.php
index 306ac4c707..374f4619e4 100755
--- a/main/exercise/aiken.php
+++ b/main/exercise/aiken.php
@@ -1,11 +1,10 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
  * Code for Aiken import integration.
  *
- * @package chamilo.exercise
- *
  * @author Ronny Velasquez <ronny.velasquez@beeznest.com>
  * @author César Perales <cesar.perales@gmail.com> Updated function names and import files for Aiken format support
  */
diff --git a/main/exercise/answer.class.php b/main/exercise/answer.class.php
index e31c6772ba..0b58e29e0c 100755
--- a/main/exercise/answer.class.php
+++ b/main/exercise/answer.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 use Chamilo\CourseBundle\Entity\CQuizAnswer;
@@ -8,8 +9,6 @@ use Chamilo\CourseBundle\Entity\CQuizAnswer;
  * Allows to instantiate an object of type Answer
  * 5 arrays are created to receive the attributes of each answer belonging to a specified question.
  *
- * @package chamilo.exercise
- *
  * @author Olivier Brouckaert
  */
 class Answer
@@ -189,13 +188,11 @@ class Answer
     {
         foreach ($this->autoId as $key => $autoId) {
             if ($autoId == $id) {
-                $result = [
+                return [
                     'answer' => $this->answer[$key],
                     'correct' => $this->correct[$key],
                     'comment' => $this->comment[$key],
                 ];
-
-                return $result;
             }
         }
 
@@ -247,7 +244,7 @@ class Answer
             $field = 'position';
         }
 
-        if ($order != 'ASC' && $order != 'DESC') {
+        if ('ASC' != $order && 'DESC' != $order) {
             $order = 'ASC';
         }
 
@@ -260,7 +257,7 @@ class Answer
         $result_question = Database::query($sql);
         $questionType = Database::fetch_array($result_question);
 
-        if ($questionType['type'] == DRAGGABLE) {
+        if (DRAGGABLE == $questionType['type']) {
             // Random is done by submit.js.tpl
             $this->read();
 
@@ -404,9 +401,7 @@ class Answer
         $rs = Database::query($sql);
 
         if (Database::num_rows($rs) > 0) {
-            $row = Database::fetch_array($rs, 'ASSOC');
-
-            return $row;
+            return Database::fetch_array($rs, 'ASSOC');
         }
 
         return false;
@@ -417,7 +412,7 @@ class Answer
      *
      * @author Yannick Warnier
      *
-     * @param - integer $id - answer ID
+     * @param - integer $pos - answer ID
      *
      * @return bool - answer title
      */
@@ -1070,7 +1065,7 @@ class Answer
     /**
      * Check if a answer is correct by an answer auto id.
      *
-     * @param $needle int The answer auto id
+     * @param int $needle The answer auto id
      *
      * @return bool
      */
diff --git a/main/exercise/calculated_answer.class.php b/main/exercise/calculated_answer.class.php
index f7ef9f8e72..72629dc7c7 100644
--- a/main/exercise/calculated_answer.class.php
+++ b/main/exercise/calculated_answer.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 use Webit\Util\EvalMath\EvalMath;
@@ -8,8 +9,6 @@ use Webit\Util\EvalMath\EvalMath;
  *  This class contains calculated answer form and answer processing functions.
  *
  *  @author Imanol Losada
- *
- *  @package chamilo.exercise
  */
 class CalculatedAnswer extends Question
 {
diff --git a/main/exercise/category.php b/main/exercise/category.php
index a2c812d7fe..510c63d564 100644
--- a/main/exercise/category.php
+++ b/main/exercise/category.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 require_once __DIR__.'/../inc/global.inc.php';
diff --git a/main/exercise/exercise.class.php b/main/exercise/exercise.class.php
index 8a37beb104..7378cc1891 100755
--- a/main/exercise/exercise.class.php
+++ b/main/exercise/exercise.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 use Chamilo\CoreBundle\Entity\GradebookLink;
@@ -12,8 +13,6 @@ use Doctrine\DBAL\Types\Type;
  *
  * Allows to instantiate an object of type Exercise
  *
- * @package chamilo.exercise
- *
  * @todo use getters and setters correctly
  *
  * @author Olivier Brouckaert
@@ -662,7 +661,7 @@ class Exercise
             $orderCondition = ' ORDER BY question_order ';
 
             if (!empty($sidx) && !empty($sord)) {
-                if ($sidx === 'question') {
+                if ('question' === $sidx) {
                     if (in_array(strtolower($sord), ['desc', 'asc'])) {
                         $orderCondition = " ORDER BY q.$sidx $sord";
                     }
@@ -972,6 +971,7 @@ class Exercise
         if (!empty($questions_by_category)) {
             $newCategoryList = [];
             $em = Database::getManager();
+            $repo = $em->getRepository('ChamiloCoreBundle:CQuizCategory');
 
             foreach ($questions_by_category as $categoryId => $questionList) {
                 $cat = new TestCategory();
@@ -991,7 +991,6 @@ class Exercise
                     } else {
                         $categoryEntity = $parentsLoaded[$cat['parent_id']];
                     }
-                    $repo = $em->getRepository('ChamiloCoreBundle:CQuizCategory');
                     $path = $repo->getPath($categoryEntity);
 
                     $index = 0;
@@ -1002,7 +1001,7 @@ class Exercise
                     /** @var \Chamilo\CourseBundle\Entity\CQuizCategory $categoryParent */
                     foreach ($path as $categoryParent) {
                         $visibility = $categoryParent->getVisibility();
-                        if ($visibility == 0) {
+                        if (0 == $visibility) {
                             $categoryParentId = $categoryId;
                             $categoryTitle = $cat['title'];
                             if (count($path) > 1) {
@@ -1131,12 +1130,12 @@ class Exercise
         $randomLimit = " ORDER BY RAND() LIMIT $random";
 
         // Random with no limit
-        if ($random == -1) {
+        if (-1 == $random) {
             $randomLimit = ' ORDER BY RAND() ';
         }
 
         // Admin see the list in default order
-        if ($adminView === true) {
+        if (true === $adminView) {
             // If viewing it as admin for edition, don't show it randomly, use title + id
             $randomLimit = 'ORDER BY e.question_order';
         }
@@ -1269,7 +1268,7 @@ class Exercise
     }
 
     /**
-     * @param $value int
+     * @param int $value
      */
     public function updateSaveCorrectAnswers($value)
     {
@@ -1681,7 +1680,7 @@ class Exercise
             ];
 
             $allow = api_get_configuration_value('allow_exercise_categories');
-            if ($allow === true) {
+            if (true === $allow) {
                 if (!empty($this->getExerciseCategoryId())) {
                     $params['exercise_category_id'] = $this->getExerciseCategoryId();
                 }
@@ -1692,12 +1691,12 @@ class Exercise
             }
 
             $allow = api_get_configuration_value('allow_quiz_show_previous_button_setting');
-            if ($allow === true) {
+            if (true === $allow) {
                 $params['show_previous_button'] = $this->showPreviousButton();
             }
 
             $allow = api_get_configuration_value('allow_notification_setting_per_exercise');
-            if ($allow === true) {
+            if (true === $allow) {
                 $notifications = $this->getNotifications();
                 $params['notifications'] = '';
                 if (!empty($notifications)) {
@@ -1828,12 +1827,12 @@ class Exercise
         // searches the position of the question ID in the list
         $pos = array_search($questionId, $this->questionList);
         // question not found
-        if ($pos === false) {
+        if (false === $pos) {
             return false;
         } else {
             // dont reduce the number of random question if we use random by category option, or if
             // random all questions
-            if ($this->isRandom() && $this->isRandomByCat() == 0) {
+            if ($this->isRandom() && 0 == $this->isRandomByCat()) {
                 if (count($this->questionList) >= $this->random && $this->random > 0) {
                     $this->random--;
                     $this->save();
@@ -2820,7 +2819,7 @@ class Exercise
                 ];
                 $ic_slide->xapian_data = serialize($xapian_data);
                 $exercise_description = $all_specific_terms.' '.$this->description;
-                $ic_slide->addValue("content", $exercise_description);
+                $ic_slide->addValue('content', $exercise_description);
 
                 $di = new ChamiloIndexer();
                 isset($_POST['language']) ? $lang = Database::escape_string($_POST['language']) : $lang = 'english';
@@ -2849,7 +2848,7 @@ class Exercise
     public function search_engine_delete()
     {
         // remove from search engine if enabled
-        if (api_get_setting('search_enabled') == 'true' && extension_loaded('xapian')) {
+        if ('true' == api_get_setting('search_enabled') && extension_loaded('xapian')) {
             $course_id = api_get_course_id();
             $tbl_se_ref = Database::get_main_table(TABLE_MAIN_SEARCH_ENGINE_REF);
             $sql = 'SELECT * FROM %s
@@ -3130,9 +3129,7 @@ class Exercise
             'questions_to_check' => '',
         ];
 
-        $id = Database::insert($track_exercises, $params);
-
-        return $id;
+        return Database::insert($track_exercises, $params);
     }
 
     /**
@@ -3381,7 +3378,7 @@ class Exercise
     {
         $timeLeft = (int) $timeLeft;
         $script = 'redirectExerciseToResult();';
-        if ($this->type == ALL_ON_ONE_PAGE) {
+        if (ALL_ON_ONE_PAGE == $this->type) {
             $script = "save_now_all('validate');";
         }
 
@@ -3532,7 +3529,7 @@ class Exercise
         $course_id = $this->course_id;
         $objQuestionTmp = Question::read($questionId, $this->course);
 
-        if ($objQuestionTmp === false) {
+        if (false === $objQuestionTmp) {
             return false;
         }
 
@@ -3673,7 +3670,7 @@ class Exercise
                         $result = Database::query($sql);
                         $choice = Database::result($result, 0, 'answer');
 
-                        if ($userAnsweredQuestion === false) {
+                        if (false === $userAnsweredQuestion) {
                             $userAnsweredQuestion = !empty($choice);
                         }
                         $studentChoice = $choice == $answerAutoId ? 1 : 0;
@@ -3871,7 +3868,7 @@ class Exercise
                         }
 
                         $studentChoice = isset($choice[$answerAutoId]) ? $choice[$answerAutoId] : null;
-                        if ($answerCorrect == 1) {
+                        if (1 == $answerCorrect) {
                             $real_answers[$answerId] = false;
                             if ($studentChoice) {
                                 $real_answers[$answerId] = true;
@@ -3884,7 +3881,7 @@ class Exercise
                         }
                     } else {
                         $studentChoice = isset($choice[$answerAutoId]) ? $choice[$answerAutoId] : null;
-                        if ($answerCorrect == 1) {
+                        if (1 == $answerCorrect) {
                             $real_answers[$answerId] = false;
                             if ($studentChoice) {
                                 $real_answers[$answerId] = true;
@@ -3924,7 +3921,7 @@ class Exercise
                         $last = count($pre_array) - 1;
                         $is_set_switchable = explode('@', $pre_array[$last]);
                         $switchable_answer_set = false;
-                        if (isset($is_set_switchable[1]) && $is_set_switchable[1] == 1) {
+                        if (isset($is_set_switchable[1]) && 1 == $is_set_switchable[1]) {
                             $switchable_answer_set = true;
                         }
                         $answer = '';
@@ -3991,7 +3988,7 @@ class Exercise
                         $chosen_list = [];
 
                         for ($i = 0; $i < count($real_correct_tags); $i++) {
-                            if ($i == 0) {
+                            if (0 == $i) {
                                 $answer .= $real_text[0];
                             }
                             if (!$switchable_answer_set) {
@@ -4077,7 +4074,7 @@ class Exercise
                                 if (!$from_database) {
                                     $studentAnswer = FillBlanks::clearStudentAnswer($studentAnswer);
                                     if ($debug) {
-                                        error_log("Student answer cleaned:");
+                                        error_log('Student answer cleaned:');
                                         error_log($studentAnswer);
                                     }
                                 }
@@ -4209,7 +4206,7 @@ class Exercise
                             // take the string remaining (after the last "[" we found)
                             $temp = api_substr($temp, $pos + 1);
                             // quit the loop if there are no more blanks, and update $pos to the position of next ']'
-                            if (($pos = api_strpos($temp, ']')) === false) {
+                            if (false === ($pos = api_strpos($temp, ']'))) {
                                 // adds the end of the text
                                 $answer .= $temp;
                                 break;
@@ -4256,7 +4253,7 @@ class Exercise
                         $calculatedChoice = '';
 
                         for ($i = 0; $i < count($realCorrectTags); $i++) {
-                            if ($i == 0) {
+                            if (0 == $i) {
                                 $answer .= $realText[0];
                             }
                             // Needed to parse ' and " characters
@@ -4280,7 +4277,7 @@ class Exercise
                                 $answer .= ''; // remove &nbsp; that causes issue
                             }
                             // adds the correct word, followed by ] to close the blank
-                            if ($this->results_disabled != EXERCISE_FEEDBACK_TYPE_EXAM) {
+                            if (EXERCISE_FEEDBACK_TYPE_EXAM != $this->results_disabled) {
                                 $answer .= ' / <font color="green"><b>'.$realCorrectTags[$i].'</b></font>';
                                 $calculatedStatus = Display::label(get_lang('Correct'), 'success');
                                 $expectedAnswer = $realCorrectTags[$i];
@@ -4318,12 +4315,12 @@ class Exercise
                         $choice = stripslashes($choice);
                         $questionScore = $data['marks'];
 
-                        if ($questionScore == -1) {
+                        if (-1 == $questionScore) {
                             $totalScore += 0;
                         } else {
                             $totalScore += $questionScore;
                         }
-                        if ($questionScore == '') {
+                        if ('' == $questionScore) {
                             $questionScore = 0;
                         }
                         $arrques = $questionName;
@@ -4422,7 +4419,7 @@ class Exercise
                             $status = Display::label(get_lang('Incorrect'), 'danger');
 
                             if (!empty($s_user_answer)) {
-                                if ($answerType == DRAGGABLE) {
+                                if (DRAGGABLE == $answerType) {
                                     if ($s_user_answer == $i_answer_correct_answer) {
                                         $questionScore += $i_answerWeighting;
                                         $totalScore += $i_answerWeighting;
@@ -4480,7 +4477,7 @@ class Exercise
                                         }
                                     }
                                 }
-                            } elseif ($answerType == DRAGGABLE) {
+                            } elseif (DRAGGABLE == $answerType) {
                                 $user_answer = Display::label(get_lang('Incorrect'), 'danger');
                                 if ($this->showExpectedChoice()) {
                                     $user_answer = '';
@@ -4496,8 +4493,8 @@ class Exercise
                             }
 
                             if ($show_result) {
-                                if ($this->showExpectedChoice() === false &&
-                                    $showTotalScoreAndUserChoicesInLastAttempt === false
+                                if (false === $this->showExpectedChoice() &&
+                                    false === $showTotalScoreAndUserChoicesInLastAttempt
                                 ) {
                                     $user_answer = '';
                                 }
@@ -4553,7 +4550,7 @@ class Exercise
                                         echo '</tr>';
                                         break;
                                     case DRAGGABLE:
-                                        if ($showTotalScoreAndUserChoicesInLastAttempt == false) {
+                                        if (false == $showTotalScoreAndUserChoicesInLastAttempt) {
                                             $s_answer_label = '';
                                         }
                                         echo '<tr>';
@@ -4770,7 +4767,7 @@ class Exercise
                             $newquestionList[] = $questionId;
                         }
 
-                        if ($answerId === 1) {
+                        if (1 === $answerId) {
                             $studentChoice = $choice[$answerId];
                             $questionScore += $answerWeighting;
                         }
@@ -4803,7 +4800,7 @@ class Exercise
             }
 
             if ($show_result) {
-                if ($from === 'exercise_result') {
+                if ('exercise_result' === $from) {
                     // Display answers (if not matching type, or if the answer is correct)
                     if (!in_array($answerType, [MATCHING, DRAGGABLE, MATCHING_DRAGGABLE]) ||
                         $answerCorrect
@@ -6188,9 +6185,8 @@ class Exercise
         $tpl = new Template(null, false, false, false, false, false, false);
         $tpl->assign('data', $data);
         $layoutTemplate = $tpl->get_template('exercise/partials/result_exercise.tpl');
-        $content = $tpl->fetch($layoutTemplate);
 
-        return $content;
+        return $tpl->fetch($layoutTemplate);
     }
 
     /**
@@ -7607,7 +7603,7 @@ class Exercise
         $questionList = $this->selectQuestionList(true);
 
         // test is randomQuestions - see field random of test
-        if ($this->random > 0 && $this->randomByCat == 0) {
+        if ($this->random > 0 && 0 == $this->randomByCat) {
             $numberRandomQuestions = $this->random;
             $questionScoreList = [];
             foreach ($questionList as $questionId) {
@@ -7745,7 +7741,7 @@ class Exercise
         $ids = array_map('intval', $ids);
         $ids = implode(',', $ids);
         $track_exercises = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
-        if ($sessionId != 0) {
+        if (0 != $sessionId) {
             $sql = "SELECT * FROM $track_exercises te
               INNER JOIN c_quiz cq ON cq.id = te.exe_exo_id AND te.c_id = cq.c_id
               WHERE
@@ -7803,7 +7799,7 @@ class Exercise
             return null;
         }
 
-        $currentQuestion = $currentQuestion - 1;
+        $currentQuestion--;
 
         if (!empty($result['question_list'])) {
             $answeredQuestions = [];
@@ -7941,7 +7937,7 @@ class Exercise
                 }
             }
 
-            if ($onlyCorrect === false) {
+            if (false === $onlyCorrect) {
                 // Only take latest attempt
                 break;
             }
@@ -7969,7 +7965,7 @@ class Exercise
     public function showPreviousButton()
     {
         $allow = api_get_configuration_value('allow_quiz_show_previous_button_setting');
-        if ($allow === false) {
+        if (false === $allow) {
             return true;
         }
 
@@ -7979,7 +7975,7 @@ class Exercise
     public function getPreventBackwards()
     {
         $allow = api_get_configuration_value('quiz_prevent_backwards_move');
-        if ($allow === false) {
+        if (false === $allow) {
             return 0;
         }
 
@@ -8053,9 +8049,8 @@ class Exercise
             ];*/
             $type = Type::getType('array');
             $platform = Database::getManager()->getConnection()->getDatabasePlatform();
-            $result = $type->convertToPHPValue($this->pageResultConfiguration, $platform);
 
-            return $result;
+            return $type->convertToPHPValue($this->pageResultConfiguration, $platform);
         }
 
         return [];
@@ -8071,9 +8066,7 @@ class Exercise
         $result = $this->getPageResultConfiguration();
 
         if (!empty($result)) {
-            $value = isset($result[$attribute]) ? $result[$attribute] : null;
-
-            return $value;
+            return isset($result[$attribute]) ? $result[$attribute] : null;
         }
 
         return null;
@@ -8125,7 +8118,7 @@ class Exercise
         ])
         ) {
             $hide = (int) $this->getPageConfigurationAttribute('hide_expected_answer');
-            if ($hide === 1) {
+            if (1 === $hide) {
                 return false;
             }
 
@@ -8146,7 +8139,7 @@ class Exercise
     public function getQuestionRibbon($class, $scoreLabel, $result, $array)
     {
         $hide = (int) $this->getPageConfigurationAttribute('hide_question_score');
-        if ($hide === 1) {
+        if (1 === $hide) {
             return '';
         }
 
@@ -8159,7 +8152,7 @@ class Exercise
             if (!empty($result)) {
                 $label .= '<h4>'.get_lang('Score').': '.$result.'</h4>';
             }
-            if ($hideLabel === true) {
+            if (true === $hideLabel) {
                 $answerUsed = (int) $array['used'];
                 $answerMissing = (int) $array['missing'] - $answerUsed;
                 for ($i = 1; $i <= $answerUsed; $i++) {
@@ -8326,7 +8319,7 @@ class Exercise
             $studentIdList = array_column($studentList, 'user_id');
         }
 
-        if ($this->exercise_was_added_in_lp == false) {
+        if (false == $this->exercise_was_added_in_lp) {
             $sql = "SELECT * FROM $tblStats
                         WHERE
                             exe_exo_id = $exerciseId AND
@@ -9574,7 +9567,7 @@ class Exercise
     public function hasResultsAccess($exerciseResultInfo)
     {
         $diff = $this->getResultAccessTimeDiff($exerciseResultInfo);
-        if ($diff === 0) {
+        if (0 === $diff) {
             return false;
         }
 
@@ -10094,7 +10087,7 @@ class Exercise
                     $count = $category_info['count_questions'];
                     // -1 means all questions
                     $categoryCountArray[$category_id] = $count;
-                    if ($count == -1) {
+                    if (-1 == $count) {
                         $categoryCountArray[$category_id] = 999;
                     }
                 }
@@ -10282,7 +10275,7 @@ class Exercise
             $question = $item['question'];
             $file = $item['generated_oral_file'];
             $answer = $item['answer'];
-            if ($answer == 0) {
+            if (0 == $answer) {
                 $answer = '';
             }
             $answer_type = $item['answer_type'];
diff --git a/main/exercise/exercise.php b/main/exercise/exercise.php
index ef83262e3d..8b21b3837e 100644
--- a/main/exercise/exercise.php
+++ b/main/exercise/exercise.php
@@ -388,7 +388,7 @@ if ($is_allowedToEdit) {
                         }
 
                         // Clean student results
-                        if ($exercise_action_locked == false) {
+                        if (false == $exercise_action_locked) {
                             $quantity_results_deleted = $objExerciseTmp->cleanResults(true);
                             $title = $objExerciseTmp->selectTitle();
 
@@ -639,7 +639,7 @@ if (api_get_configuration_value('allow_exercise_categories') === false) {
             $down = '';
             if ($is_allowedToEdit) {
                 $up = Display::url($upIcon, $modifyUrl.'&action=up_category&category_id_edit='.$categoryIdItem);
-                if ($counter === 0) {
+                if (0 === $counter) {
                     $up = Display::url(Display::return_icon('up_na.png'), '#');
                 }
                 $down = Display::url($downIcon, $modifyUrl.'&action=down_category&category_id_edit='.$categoryIdItem);
@@ -660,7 +660,7 @@ if (api_get_configuration_value('allow_exercise_categories') === false) {
     }
 }
 
-if ($origin !== 'learnpath') {
+if ('learnpath' !== $origin) {
     // We are not in learnpath tool
     Display::display_footer();
 }
diff --git a/main/exercise/exercise_admin.php b/main/exercise/exercise_admin.php
index 3538bce6db..9d729172ea 100755
--- a/main/exercise/exercise_admin.php
+++ b/main/exercise/exercise_admin.php
@@ -49,8 +49,7 @@ $htmlHeadXtra[] = '<script>
     }
 
     function option_time_expired() {
-        if(document.getElementById(\'timercontrol\').style.display == \'none\')
-        {
+        if(document.getElementById(\'timercontrol\').style.display == \'none\') {
           document.getElementById(\'timercontrol\').style.display = \'block\';
         } else {
           document.getElementById(\'timercontrol\').style.display = \'none\';
diff --git a/main/exercise/exercise_history.php b/main/exercise/exercise_history.php
index 2098413685..c1520ea885 100755
--- a/main/exercise/exercise_history.php
+++ b/main/exercise/exercise_history.php
@@ -4,8 +4,6 @@
 /**
  * Exercise list: This script shows the list of exercises for administrators and students.
  *
- * @package chamilo.exercise
- *
  * @author Olivier Brouckaert, original author
  * @author Denes Nagy, HotPotatoes integration
  * @author Wolfgang Schneider, code/html cleanup
diff --git a/main/exercise/exercise_reminder.php b/main/exercise/exercise_reminder.php
index 0e04f7481a..f8cea0c314 100755
--- a/main/exercise/exercise_reminder.php
+++ b/main/exercise/exercise_reminder.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 use ChamiloSession as Session;
@@ -7,8 +8,6 @@ use ChamiloSession as Session;
  * Exercise reminder overview
  * Then it shows the results on the screen.
  *
- * @package chamilo.exercise
- *
  * @author Julio Montoya switchable fill in blank option added
  */
 require_once __DIR__.'/../inc/global.inc.php';
@@ -22,7 +21,6 @@ $learnpath_id = isset($_REQUEST['learnpath_id']) ? (int) $_REQUEST['learnpath_id
 $learnpath_item_id = isset($_REQUEST['learnpath_item_id']) ? (int) $_REQUEST['learnpath_item_id'] : 0;
 $learnpath_item_view_id = isset($_REQUEST['learnpath_item_view_id']) ? (int) $_REQUEST['learnpath_item_view_id'] : 0;
 $exerciseId = isset($_REQUEST['exerciseId']) ? (int) $_REQUEST['exerciseId'] : 0;
-
 /** @var Exercise $objExercise */
 $objExercise = null;
 $exerciseInSession = Session::read('objExercise');
diff --git a/main/exercise/exercise_result.class.php b/main/exercise/exercise_result.class.php
index df7a0ff17f..168a7f0d6e 100755
--- a/main/exercise/exercise_result.class.php
+++ b/main/exercise/exercise_result.class.php
@@ -1,12 +1,11 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
  * Class ExerciseResult
  * which allows you to export exercises results in multiple presentation forms.
  *
- * @package chamilo.exercise
- *
  * @author Yannick Warnier
  */
 class ExerciseResult
diff --git a/main/exercise/exercise_show.php b/main/exercise/exercise_show.php
index bc24988aa1..0809aa6af5 100755
--- a/main/exercise/exercise_show.php
+++ b/main/exercise/exercise_show.php
@@ -10,8 +10,6 @@ use ChamiloSession as Session;
  *
  * @version $Id: exercise_show.php 22256 2009-07-20 17:40:20Z ivantcholakov $
  *
- * @package chamilo.exercise
- *
  * @todo remove the debug code and use the general debug library
  * @todo small letters for table variables
  */
@@ -19,7 +17,7 @@ require_once __DIR__.'/../inc/global.inc.php';
 
 $origin = api_get_origin();
 $currentUserId = api_get_user_id();
-$printHeaders = $origin === 'learnpath';
+$printHeaders = 'learnpath' === $origin;
 $id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0; //exe id
 
 if (empty($id)) {
@@ -112,7 +110,7 @@ if (!empty($sessionId) && !$is_allowedToEdit) {
     }
 }
 
-$allowCoachFeedbackExercises = api_get_setting('allow_coach_feedback_exercises') === 'true';
+$allowCoachFeedbackExercises = 'true' === api_get_setting('allow_coach_feedback_exercises');
 $maxEditors = (int) api_get_setting('exercise_max_ckeditors_in_page');
 $isCoachAllowedToEdit = api_is_allowed_to_edit(false, true);
 $isFeedbackAllowed = false;
@@ -136,8 +134,8 @@ if (!$is_allowedToEdit) {
     }
 }
 
-$allowRecordAudio = api_get_setting('enable_record_audio') === 'true';
-$allowTeacherCommentAudio = api_get_configuration_value('allow_teacher_comment_audio') === true;
+$allowRecordAudio = 'true' === api_get_setting('enable_record_audio');
+$allowTeacherCommentAudio = true === api_get_configuration_value('allow_teacher_comment_audio');
 
 $js = '<script>'.api_get_language_translate_html().'</script>';
 $htmlHeadXtra[] = $js;
@@ -939,7 +937,7 @@ if ($show_results) {
     echo $totalScoreText;
 }
 
-if ($action === 'export') {
+if ('export' === $action) {
     $content = ob_get_clean();
     // needed in order to mpdf to work
     ob_clean();
diff --git a/main/exercise/exercise_submit.php b/main/exercise/exercise_submit.php
index 9aecba820f..cfd73603a6 100755
--- a/main/exercise/exercise_submit.php
+++ b/main/exercise/exercise_submit.php
@@ -42,7 +42,7 @@ $sessionId = api_get_session_id();
 $glossaryExtraTools = api_get_setting('show_glossary_in_extra_tools');
 
 $showGlossary = in_array($glossaryExtraTools, ['true', 'exercise', 'exercise_and_lp']);
-if ($origin === 'learnpath') {
+if ('learnpath' == $origin) {
     $showGlossary = in_array($glossaryExtraTools, ['true', 'lp', 'exercise_and_lp']);
 }
 if ($showGlossary) {
@@ -70,7 +70,7 @@ if (api_get_configuration_value('quiz_prevent_copy_paste')) {
     $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_JS_PATH).'jquery.nocopypaste.js"></script>';
 }
 
-if (api_get_setting('enable_record_audio') === 'true') {
+if ('true' === api_get_setting('enable_record_audio')) {
     $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_JS_PATH).'rtc/RecordRTC.js"></script>';
     $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'wami-recorder/recorder.js"></script>';
     $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'wami-recorder/gui.js"></script>';
@@ -174,7 +174,7 @@ $exercise_sound = $objExercise->selectSound();
 
 // If reminder ends we jump to the exercise_reminder
 if ($objExercise->review_answers) {
-    if ($remind_question_id == -1) {
+    if (-1 == $remind_question_id) {
         header('Location: '.api_get_path(WEB_CODE_PATH).
             'exercise/exercise_reminder.php?exerciseId='.$exerciseId.'&'.api_get_cidreq());
         exit;
@@ -189,7 +189,7 @@ $current_timestamp = time();
 $myRemindList = [];
 
 $time_control = false;
-if ($objExercise->expired_time != 0) {
+if (0 != $objExercise->expired_time) {
     $time_control = true;
 }
 
@@ -419,7 +419,7 @@ if (empty($exercise_stat_info)) {
     // Remember last question id position.
     $isFirstTime = Session::read('firstTime');
 
-    if ($isFirstTime && $objExercise->type == ONE_PER_PAGE) {
+    if ($isFirstTime && ONE_PER_PAGE == $objExercise->type) {
         $resolvedQuestions = Event::getAllExerciseEventByExeId($exe_id);
         if (!empty($resolvedQuestions) &&
             !empty($exercise_stat_info['data_tracking'])
@@ -493,9 +493,9 @@ if ($debug) {
     error_log("6.1 params: ->  $params");
 }
 
-if ($reminder == 2 && empty($myRemindList)) {
+if (2 == $reminder && empty($myRemindList)) {
     if ($debug) {
-        error_log("6.2 calling the exercise_reminder.php ");
+        error_log('6.2 calling the exercise_reminder.php ');
     }
     header('Location: exercise_reminder.php?'.$params);
     exit;
@@ -610,7 +610,7 @@ if (!empty($questionList)) {
 if ($current_question > $question_count) {
     // If time control then don't change the current question, otherwise there will be a loop.
     // @todo
-    if ($time_control == false) {
+    if (false == $time_control) {
         $current_question = 0;
     }
 }
@@ -644,7 +644,7 @@ if ($formSent && isset($_POST)) {
                 error_log('9.2. $_POST[hotspot] data '.print_r($exerciseResultCoordinates, 1));
             }
         }
-        if ($objExercise->type == ALL_ON_ONE_PAGE) {
+        if (ALL_ON_ONE_PAGE == $objExercise->type) {
             // $exerciseResult receives the content of the form.
             // Each choice of the student is stored into the array $choice
             $exerciseResult = $choice;
@@ -1387,7 +1387,7 @@ if (!empty($error)) {
 
     foreach ($questionList as $questionId) {
         // for sequential exercises
-        if ($objExercise->type == ONE_PER_PAGE) {
+        if (ONE_PER_PAGE == $objExercise->type) {
             // if it is not the right question, goes to the next loop iteration
             if ($current_question != $i) {
                 $i++;
diff --git a/main/exercise/exercise_submit_modal.php b/main/exercise/exercise_submit_modal.php
index ea34ed49d9..c64b2d65e2 100755
--- a/main/exercise/exercise_submit_modal.php
+++ b/main/exercise/exercise_submit_modal.php
@@ -93,7 +93,7 @@ if (empty($choiceValue) && empty($hotSpot) && $loaded) {
     $links = '<a onclick="tryAgain();" href="#">'.get_lang('TryAgain').'</a>&nbsp;'.$icon.'&nbsp;';
 
     // the link to finish the test
-    if ($destinationId == -1) {
+    if (-1 == $destinationId) {
         $links .= Display::return_icon(
                 'finish.gif',
                 '',
@@ -195,7 +195,7 @@ $answerType = $objQuestionTmp->selectType();
 $showResult = false;
 
 $objAnswerTmp = new Answer($questionId, api_get_course_int_id());
-if ($objExercise->getFeedbackType() === EXERCISE_FEEDBACK_TYPE_DIRECT) {
+if (EXERCISE_FEEDBACK_TYPE_DIRECT === $objExercise->getFeedbackType()) {
     $showResult = true;
 }
 
@@ -334,9 +334,9 @@ if ($answerType === HOT_SPOT_DELINEATION) {
     $contents = $manageAnswerHtmlContent;
 }
 $links = '';
-if ($objExercise->getFeedbackType() === EXERCISE_FEEDBACK_TYPE_DIRECT) {
-    if (isset($choiceValue) && $choiceValue == -1) {
-        if ($answerType != HOT_SPOT_DELINEATION) {
+if (EXERCISE_FEEDBACK_TYPE_DIRECT === $objExercise->getFeedbackType()) {
+    if (isset($choiceValue) && -1 == $choiceValue) {
+        if (HOT_SPOT_DELINEATION != $answerType) {
             $links .= '<a href="#" onclick="tb_remove();">'.get_lang('ChooseAnAnswer').'</a><br />';
         }
     }
@@ -352,7 +352,7 @@ if (isset($result['answer_destination'])) {
 }
 
 // the link to retry the question
-if (isset($try) && $try == 1) {
+if (isset($try) && 1 == $try) {
     $num_value_array = array_keys($questionList, $questionId);
     $links .= Display:: return_icon(
         'reload.gif',
@@ -386,7 +386,7 @@ $nextQuestion = $questionNum + 1;
 $destinationId = isset($questionList[$nextQuestion]) ? $questionList[$nextQuestion] : -1;
 
 // the link to finish the test
-if ($destinationId == -1) {
+if (-1 == $destinationId) {
     $links .= Display:: return_icon(
         'finish.gif',
         '',
diff --git a/main/exercise/export/aiken/aiken_classes.php b/main/exercise/export/aiken/aiken_classes.php
index 8d8447eb49..4070ce5387 100755
--- a/main/exercise/export/aiken/aiken_classes.php
+++ b/main/exercise/export/aiken/aiken_classes.php
@@ -1,12 +1,11 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
  * @author Claro Team <cvs@claroline.net>
  * @author Yannick Warnier <yannick.warnier@beeznest.com> - updated ImsAnswerHotspot to match QTI norms
  * @author César Perales <cesar.perales@gmail.com> Updated function names and import files for Aiken format support
- *
- * @package chamilo.exercise
  */
 
 /**
@@ -37,9 +36,6 @@ class Aiken2Question extends Question
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function processAnswersCreation($form, $exercise)
     {
         return true;
@@ -48,8 +44,6 @@ class Aiken2Question extends Question
 
 /**
  * Class.
- *
- * @package chamilo.exercise
  */
 class AikenAnswerMultipleChoice extends Answer
 {
diff --git a/main/exercise/export/aiken/aiken_import.inc.php b/main/exercise/export/aiken/aiken_import.inc.php
index db783ddf49..303adb3d7b 100755
--- a/main/exercise/export/aiken/aiken_import.inc.php
+++ b/main/exercise/export/aiken/aiken_import.inc.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 /**
  * Library for the import of Aiken format.
@@ -6,8 +7,6 @@
  * @author claro team <cvs@claroline.net>
  * @author Guillaume Lederer <guillaume@claroline.net>
  * @author César Perales <cesar.perales@gmail.com> Parse function for Aiken format
- *
- * @package chamilo.exercise
  */
 
 /**
@@ -170,7 +169,7 @@ function aiken_import_exercise($file)
         $result = 'NoTxtFileFoundInTheZip';
     }
 
-    if ($result !== true) {
+    if (true !== $result) {
         return $result;
     }
 
@@ -371,7 +370,7 @@ function aiken_parse_file(&$exercise_info, $exercisePath, $file, $questionFile)
         }
     }
     $total_questions = count($exercise_info['question']);
-    $total_weight = (!empty($_POST['total_weight'])) ? intval($_POST['total_weight']) : 20;
+    $total_weight = !empty($_POST['total_weight']) ? (int) ($_POST['total_weight']) : 20;
     foreach ($exercise_info['question'] as $key => $question) {
         $exercise_info['question'][$key]['weighting'][current(array_keys($exercise_info['question'][$key]['weighting']))] = $total_weight / $total_questions;
     }
diff --git a/main/exercise/export/exercise_import.inc.php b/main/exercise/export/exercise_import.inc.php
index 8dbed79599..95bea987c5 100755
--- a/main/exercise/export/exercise_import.inc.php
+++ b/main/exercise/export/exercise_import.inc.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 use Chamilo\CoreBundle\Component\Utils\ChamiloApi;
@@ -6,9 +7,6 @@ use Symfony\Component\DomCrawler\Crawler;
 
 /**
  * @copyright (c) 2001-2006 Universite catholique de Louvain (UCL)
- *
- * @package chamilo.exercise
- *
  * @author claro team <cvs@claroline.net>
  * @author Guillaume Lederer <guillaume@claroline.net>
  * @author Yannick Warnier <yannick.warnier@beeznest.com>
@@ -34,7 +32,7 @@ function get_and_unzip_uploaded_exercise($baseWorkDir, $uploadPath)
     }
 
     if (preg_match('/.zip$/i', $_FILES['userFile']['name'])) {
-        $result = handle_uploaded_document(
+        return handle_uploaded_document(
             $_course,
             $_FILES['userFile'],
             $baseWorkDir,
@@ -50,8 +48,6 @@ function get_and_unzip_uploaded_exercise($baseWorkDir, $uploadPath)
             null,
             false
         );
-
-        return $result;
     }
 
     return false;
@@ -683,7 +679,6 @@ function isQtiManifest($filePath)
  * to be able to transform them into the questions text.
  *
  * @param string $filePath The absolute filepath
- * @param array  $links    List of filepaths changes
  *
  * @return bool
  */
@@ -708,8 +703,8 @@ function qtiProcessManifest($filePath)
         $file = $xml->resources->resource->file[$i];
         $href = '';
         foreach ($file->attributes() as $key => $value) {
-            if ($key == 'href') {
-                if (substr($value, -3, 3) != 'xml') {
+            if ('href' == $key) {
+                if ('xml' != substr($value, -3, 3)) {
                     $href = $value;
                 }
             }
diff --git a/main/exercise/export/index.php b/main/exercise/export/index.php
index a83bbe0669..248be214c4 100755
--- a/main/exercise/export/index.php
+++ b/main/exercise/export/index.php
@@ -1,12 +1,11 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 /**
- * @package chamilo.exercise
- *
  * @author Claro Team <cvs@claroline.net>
  */
 /**
  * Redirection.
  */
-header("Location: ../../../");
+header('Location: ../../../');
 exit();
diff --git a/main/exercise/export/qti2/qti2_classes.php b/main/exercise/export/qti2/qti2_classes.php
index 0b03a0505c..7f7e180d42 100755
--- a/main/exercise/export/qti2/qti2_classes.php
+++ b/main/exercise/export/qti2/qti2_classes.php
@@ -28,8 +28,6 @@ interface ImsAnswerInterface
  * @author Claro Team <cvs@claroline.net>
  * @author Yannick Warnier <yannick.warnier@beeznest.com> -
  * updated ImsAnswerHotspot to match QTI norms
- *
- * @package chamilo.exercise
  */
 class Ims2Question extends Question
 {
@@ -83,9 +81,6 @@ class Ims2Question extends Question
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function processAnswersCreation($form, $exercise)
     {
         return true;
@@ -94,8 +89,6 @@ class Ims2Question extends Question
 
 /**
  * Class.
- *
- * @package chamilo.exercise
  */
 class ImsAnswerMultipleChoice extends Answer implements ImsAnswerInterface
 {
diff --git a/main/exercise/export/qti2/qti2_export.php b/main/exercise/export/qti2/qti2_export.php
index 79597e279d..e7559a1dd9 100755
--- a/main/exercise/export/qti2/qti2_export.php
+++ b/main/exercise/export/qti2/qti2_export.php
@@ -1,11 +1,10 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
  * @author Claro Team <cvs@claroline.net>
  * @author Yannick Warnier <yannick.warnier@beeznest.com>
- *
- * @package chamilo.exercise
  */
 require __DIR__.'/qti2_classes.php';
 
@@ -17,8 +16,6 @@ require __DIR__.'/qti2_classes.php';
  * Every start_*() and corresponding end_*(), as well as export_*() methods return a string.
  *
  * note: Attached files are NOT exported.
- *
- * @package chamilo.exercise
  */
 class ImsAssessmentItem
 {
@@ -44,7 +41,7 @@ class ImsAssessmentItem
     {
         $this->question = $question;
         $this->answer = $this->question->setAnswer();
-        $this->questionIdent = "QST_".$question->id;
+        $this->questionIdent = 'QST_'.$question->id;
     }
 
     /**
@@ -111,8 +108,6 @@ class ImsAssessmentItem
      *
      * This is a default behaviour, some classes may want to override this.
      *
-     * @param $standalone: Boolean stating if it should be exported as a stand-alone question
-     *
      * @return string string, the XML flow for an Item
      */
     public function export($standalone = false)
@@ -127,7 +122,7 @@ class ImsAssessmentItem
             return $head;
         }
 
-        $res = $head
+        return $head
             .$this->start_item()
             .$this->answer->imsExportResponsesDeclaration($this->questionIdent, $this->question)
             .$this->start_item_body()
@@ -141,8 +136,6 @@ class ImsAssessmentItem
             .$this->add_response_processing()
             .$this->end_item()
             .$foot;
-
-        return $res;
     }
 }
 
@@ -158,8 +151,6 @@ class ImsAssessmentItem
  *   - anonymous_attempts
  *
  * @author Amand Tihon <amand@alrj.org>
- *
- * @package chamilo.exercise
  */
 class ImsSection
 {
@@ -179,12 +170,10 @@ class ImsSection
 
     public function start_section()
     {
-        $out = '<section
+        return '<section 
             ident = "EXO_'.$this->exercise->selectId().'"
             title = "'.cleanAttribute(formatExerciseQtiDescription($this->exercise->selectTitle())).'"
         >'."\n";
-
-        return $out;
     }
 
     public function end_section()
@@ -212,11 +201,9 @@ class ImsSection
      */
     public function export_presentation()
     {
-        $out = "<presentation_material><flow_mat><material>\n"
-             ."  <mattext><![CDATA[".formatExerciseQtiDescription($this->exercise->selectDescription())."]]></mattext>\n"
+        return "<presentation_material><flow_mat><material>\n"
+             .'  <mattext><![CDATA['.formatExerciseQtiDescription($this->exercise->selectDescription())."]]></mattext>\n"
              ."</material></flow_mat></presentation_material>\n";
-
-        return $out;
     }
 
     /**
@@ -315,8 +302,6 @@ class ImsSection
  * warning: Attached files are NOT exported.
  *
  * @author Amand Tihon <amand@alrj.org>
- *
- * @package chamilo.exercise
  */
 class ImsItem
 {
@@ -335,7 +320,7 @@ class ImsItem
     {
         $this->question = $question;
         $this->answer = $question->answer;
-        $this->questionIdent = "QST_".$question->selectId();
+        $this->questionIdent = 'QST_'.$question->selectId();
     }
 
     /**
@@ -418,7 +403,7 @@ class ImsItem
     public function export($standalone = false)
     {
         global $charset;
-        $head = $foot = "";
+        $head = $foot = '';
 
         if ($standalone) {
             $head = '<?xml version = "1.0" encoding = "'.$charset.'" standalone = "no"?>'."\n"
@@ -456,9 +441,8 @@ function export_exercise_to_qti($exerciseId, $standalone = true)
         return '';
     }
     $ims = new ImsSection($exercise);
-    $xml = $ims->export($standalone);
 
-    return $xml;
+    return $ims->export($standalone);
 }
 
 /**
diff --git a/main/exercise/export/scorm/ScormAnswerFillInBlanks.php b/main/exercise/export/scorm/ScormAnswerFillInBlanks.php
index 7cb9a04d26..616e1860ce 100644
--- a/main/exercise/export/scorm/ScormAnswerFillInBlanks.php
+++ b/main/exercise/export/scorm/ScormAnswerFillInBlanks.php
@@ -1,10 +1,9 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
  * This class handles the SCORM export of fill-in-the-blanks questions.
- *
- * @package chamilo.exercise.scorm
  */
 class ScormAnswerFillInBlanks extends Answer
 {
diff --git a/main/exercise/export/scorm/ScormAnswerMatching.php b/main/exercise/export/scorm/ScormAnswerMatching.php
index 2d39e36e9d..e1572a5819 100644
--- a/main/exercise/export/scorm/ScormAnswerMatching.php
+++ b/main/exercise/export/scorm/ScormAnswerMatching.php
@@ -1,10 +1,9 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
  * This class handles the SCORM export of matching questions.
- *
- * @package chamilo.exercise.scorm
  */
 class ScormAnswerMatching extends Answer
 {
@@ -56,7 +55,7 @@ class ScormAnswerMatching extends Answer
 
             if ($answerCorrect) {
                 $html[] = '<tr class="option_row">';
-                $html[] = '<td width="40%" valign="top">&nbsp;'.$answer."</td>";
+                $html[] = '<td width="40%" valign="top">&nbsp;'.$answer.'</td>';
                 $html[] = '<td width="20%" align="center">&nbsp;&nbsp;';
                 $html[] = '<select name="'.$identifier.$counter.'" id="'.$identifier.$counter.'">';
                 $html[] = ' <option value="0">--</option>';
@@ -75,7 +74,7 @@ class ScormAnswerMatching extends Answer
                 $jstmpc .= '['.$answerCorrect.','.$counter.'],';
 
                 $myWeight = explode('@', $weight);
-                if (count($myWeight) == 2) {
+                if (2 == count($myWeight)) {
                     $weight = $myWeight[0];
                 } else {
                     $weight = $myWeight[0];
diff --git a/main/exercise/export/scorm/ScormAnswerMultipleChoice.php b/main/exercise/export/scorm/ScormAnswerMultipleChoice.php
index adba70cfaa..96e2b0b49b 100644
--- a/main/exercise/export/scorm/ScormAnswerMultipleChoice.php
+++ b/main/exercise/export/scorm/ScormAnswerMultipleChoice.php
@@ -1,11 +1,10 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
  * This class handles the export to SCORM of a multiple choice question
  * (be it single answer or multiple answers).
- *
- * @package chamilo.exercise.scorm
  */
 class ScormAnswerMultipleChoice extends Answer
 {
@@ -24,7 +23,7 @@ class ScormAnswerMultipleChoice extends Answer
 
         //not sure if we are going to export also the MULTIPLE_ANSWER_COMBINATION to SCORM
         //if ($type == MCMA  || $type == MULTIPLE_ANSWER_COMBINATION ) {
-        if ($type == MCMA) {
+        if (MCMA == $type) {
             $id = 1;
             $jstmp = '';
             $jstmpc = '';
@@ -51,7 +50,7 @@ class ScormAnswerMultipleChoice extends Answer
             $js[] = 'questions_answers['.$questionId.'] = new Array('.substr($jstmp, 0, -1).');'."\n";
             $js[] = 'questions_types['.$questionId.'] = \'mcma\';'."\n";
             $js[] = $jstmpw;
-        } elseif ($type == MULTIPLE_ANSWER_COMBINATION) {
+        } elseif (MULTIPLE_ANSWER_COMBINATION == $type) {
             $js = '';
             $id = 1;
             $jstmp = '';
diff --git a/main/exercise/export/scorm/ScormAnswerTrueFalse.php b/main/exercise/export/scorm/ScormAnswerTrueFalse.php
index fb7244337f..e14961607d 100644
--- a/main/exercise/export/scorm/ScormAnswerTrueFalse.php
+++ b/main/exercise/export/scorm/ScormAnswerTrueFalse.php
@@ -1,10 +1,9 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
  * This class handles the SCORM export of true/false questions.
- *
- * @package chamilo.exercise.scorm
  */
 class ScormAnswerTrueFalse extends Answer
 {
@@ -41,7 +40,7 @@ class ScormAnswerTrueFalse extends Answer
             </tr></table></td></tr>';
         $js .= 'questions_answers['.$this->questionJSId.'] = new Array(\'true\',\'false\');'."\n";
         $js .= 'questions_types['.$this->questionJSId.'] = \'tf\';'."\n";
-        if ($this->response === 'TRUE') {
+        if ('TRUE' === $this->response) {
             $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'true\');'."\n";
         } else {
             $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'false\');'."\n";
diff --git a/main/exercise/export/scorm/ScormAssessmentItem.php b/main/exercise/export/scorm/ScormAssessmentItem.php
index 6ad67ac0f5..4e1d0529e0 100644
--- a/main/exercise/export/scorm/ScormAssessmentItem.php
+++ b/main/exercise/export/scorm/ScormAssessmentItem.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
@@ -9,8 +10,6 @@
  * Every start_*() and corresponding end_*(), as well as export_*() methods return a string.
  *
  * Attached files are NOT exported.
- *
- * @package chamilo.exercise.scorm
  */
 class ScormAssessmentItem
 {
diff --git a/main/exercise/export/scorm/ScormExercise.php b/main/exercise/export/scorm/ScormExercise.php
index e3411bfdb8..00781565e3 100644
--- a/main/exercise/export/scorm/ScormExercise.php
+++ b/main/exercise/export/scorm/ScormExercise.php
@@ -19,8 +19,6 @@ use Symfony\Component\Serializer\Serializer;
  *
  * @author Julio Montoya
  * @author Amand Tihon <amand@alrj.org>
- *
- * @package chamilo.exercise.scorm
  */
 class ScormExercise
 {
@@ -47,9 +45,8 @@ class ScormExercise
     public function startPage()
     {
         $charset = 'UTF-8';
-        $head = '<?xml version="1.0" encoding="'.$charset.'" standalone="no"?><html>';
 
-        return $head;
+        return '<?xml version="1.0" encoding="'.$charset.'" standalone="no"?><html>';
     }
 
     /**
@@ -117,8 +114,6 @@ class ScormExercise
      *
      * This is a default behaviour, some classes may want to override this.
      *
-     * @param $standalone: Boolean stating if it should be exported as a stand-alone question
-     *
      * @return string string, the XML flow for an Item
      */
     public function export()
@@ -132,7 +127,8 @@ class ScormExercise
         }*/
 
         list($js, $html) = $this->exportQuestions();
-        $res = $this->startPage()
+
+        return $this->startPage()
             .$this->start_header()
             .$this->css()
             .$this->globalAssets()
@@ -145,8 +141,6 @@ class ScormExercise
             .$html
             .$this->end_body()
             .$this->end_page();
-
-        return $res;
     }
 
     /**
diff --git a/main/exercise/export/scorm/ScormQuestion.php b/main/exercise/export/scorm/ScormQuestion.php
index b2dcfc69f7..aeff2d51c9 100644
--- a/main/exercise/export/scorm/ScormQuestion.php
+++ b/main/exercise/export/scorm/ScormQuestion.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
@@ -12,8 +13,6 @@
  *
  * @author Claro Team <cvs@claroline.net>
  * @author Yannick Warnier <yannick.warnier@beeznest.com>
- *
- * @package chamilo.exercise.scorm
  */
 class ScormQuestion extends Question
 {
@@ -32,7 +31,6 @@ class ScormQuestion extends Question
      * Returns the HTML + JS flow corresponding to one question.
      *
      * @param int  $questionId The question ID
-     * @param bool $standalone (ie including XML tag, DTD declaration, etc)
      * @param int  $jsId       The JavaScript ID for this question.
      *                         Due to the nature of interactions, we must have a natural sequence for
      *                         questions in the generated JavaScript.
diff --git a/main/exercise/export/scorm/scorm_classes.php b/main/exercise/export/scorm/scorm_classes.php
index abc78b4638..96ea067959 100755
--- a/main/exercise/export/scorm/scorm_classes.php
+++ b/main/exercise/export/scorm/scorm_classes.php
@@ -1,10 +1,9 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
  * This class handles the SCORM export of free-answer questions.
- *
- * @package chamilo.exercise.scorm
  */
 class ScormAnswerFree extends Answer
 {
@@ -22,7 +21,7 @@ class ScormAnswerFree extends Answer
         $html = '<tr><td colspan="2">';
         $type = $this->getQuestionType();
 
-        if ($type == ORAL_EXPRESSION) {
+        if (ORAL_EXPRESSION == $type) {
             /*
             $template = new Template('');
             $template->assign('directory', '/tmp/');
@@ -50,8 +49,6 @@ class ScormAnswerFree extends Answer
 
 /**
  * This class handles the SCORM export of hotpot questions.
- *
- * @package chamilo.exercise.scorm
  */
 class ScormAnswerHotspot extends Answer
 {
diff --git a/main/exercise/fill_blanks.class.php b/main/exercise/fill_blanks.class.php
index 9e7e039dbf..da1bc1fe37 100755
--- a/main/exercise/fill_blanks.class.php
+++ b/main/exercise/fill_blanks.class.php
@@ -1,13 +1,12 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
  *  Class FillBlanks.
  *
  * @author Eric Marguin
- * @author Julio Montoya multiple fill in blank option added
- *
- * @package chamilo.exercise
+ * @author Julio Montoya multiple fill in blank option added.
  */
 class FillBlanks extends Question
 {
@@ -447,7 +446,7 @@ class FillBlanks extends Question
             }
 
             // input width
-            $answer .= ":";
+            $answer .= ':';
             for ($i = 0; $i < $nb; $i++) {
                 // enter the width of input for word $i
                 $answer .= $form->getSubmitValue('sizeofinput['.$i.']');
@@ -637,9 +636,7 @@ class FillBlanks extends Question
     public static function getFillTheBlankSeveralAnswers($correctAnswer)
     {
         // is answer||Answer||response||Response , mean answer or Answer ...
-        $listSeveral = api_preg_split("/\|\|/", $correctAnswer);
-
-        return $listSeveral;
+        return api_preg_split("/\|\|/", $correctAnswer);
     }
 
     /**
@@ -810,7 +807,7 @@ class FillBlanks extends Question
         // Get all common words
         $commonWords = api_preg_replace(
             '/'.$blankCharStartForRegexp.'[^'.$blankCharEndForRegexp.']*'.$blankCharEndForRegexp.'/',
-            "::",
+            '::',
             $listDoubleColon[0]
         );
 
@@ -1208,7 +1205,7 @@ class FillBlanks extends Question
                 $hideUserSelection = true;
                 break;
             case RESULT_DISABLE_SHOW_SCORE_ONLY:
-                if ($feedbackType == 0) {
+                if (0 == $feedbackType) {
                     $hideExpectedAnswer = true;
                 }
                 break;
@@ -1378,8 +1375,7 @@ class FillBlanks extends Question
     private static function trimOption($text)
     {
         $text = trim($text);
-        $text = preg_replace("/\s+/", ' ', $text);
 
-        return $text;
+        return preg_replace("/\s+/", ' ', $text);
     }
 }
diff --git a/main/exercise/freeanswer.class.php b/main/exercise/freeanswer.class.php
index 567564920a..29850bc491 100755
--- a/main/exercise/freeanswer.class.php
+++ b/main/exercise/freeanswer.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
@@ -6,8 +7,6 @@
  * This class allows to instantiate an object of type FREE_ANSWER,
  * extending the class question.
  *
- * @package chamilo.exercise
- *
  * @author Eric Marguin
  */
 class FreeAnswer extends Question
diff --git a/main/exercise/global_multiple_answer.class.php b/main/exercise/global_multiple_answer.class.php
index cfb8df0bd9..32ec89422b 100755
--- a/main/exercise/global_multiple_answer.class.php
+++ b/main/exercise/global_multiple_answer.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 use ChamiloSession as Session;
diff --git a/main/exercise/hotspot.class.php b/main/exercise/hotspot.class.php
index 40bd53045b..52b049fe2a 100755
--- a/main/exercise/hotspot.class.php
+++ b/main/exercise/hotspot.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
@@ -9,8 +10,6 @@
  * extending the class question
  *
  * @author Eric Marguin
- *
- * @package chamilo.exercise
  */
 class HotSpot extends Question
 {
diff --git a/main/exercise/live_stats.php b/main/exercise/live_stats.php
index 44674215f2..e3c1611ad9 100755
--- a/main/exercise/live_stats.php
+++ b/main/exercise/live_stats.php
@@ -4,8 +4,7 @@
 require_once __DIR__.'/../inc/global.inc.php';
 
 $this_section = SECTION_COURSES;
-$exercise_id = (isset($_GET['exerciseId']) && !empty($_GET['exerciseId'])) ? intval($_GET['exerciseId']) : 0;
-
+$exercise_id = isset($_GET['exerciseId']) && !empty($_GET['exerciseId']) ? (int) ($_GET['exerciseId']) : 0;
 // Access control
 api_protect_course_script(true);
 
@@ -25,8 +24,8 @@ $interbreadcrumb[] = [
     "name" => get_lang('Exercises'),
 ];
 $interbreadcrumb[] = [
-    "url" => "admin.php?exerciseId=$exercise_id&".api_get_cidreq(),
-    "name" => $objExercise->selectTitle(true),
+    'url' => "admin.php?exerciseId=$exercise_id&".api_get_cidreq(),
+    'name' => $objExercise->selectTitle(true),
 ];
 
 //Add the JS needed to use the jqgrid
diff --git a/main/exercise/matching.class.php b/main/exercise/matching.class.php
index 8156cdc303..e3293af215 100755
--- a/main/exercise/matching.class.php
+++ b/main/exercise/matching.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
@@ -10,8 +11,6 @@
  * extending the class question
  *
  * @author Eric Marguin
- *
- * @package chamilo.exercise
  */
 class Matching extends Question
 {
diff --git a/main/exercise/multiple_answer.class.php b/main/exercise/multiple_answer.class.php
index fe034ed3d7..9adcbcd74b 100755
--- a/main/exercise/multiple_answer.class.php
+++ b/main/exercise/multiple_answer.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 use ChamiloSession as Session;
@@ -10,8 +11,6 @@ use ChamiloSession as Session;
  * extending the class question
  *
  * @author Eric Marguin
- *
- * @package chamilo.exercise
  */
 class MultipleAnswer extends Question
 {
diff --git a/main/exercise/multiple_answer_combination.class.php b/main/exercise/multiple_answer_combination.class.php
index ff476fb572..5727222c11 100755
--- a/main/exercise/multiple_answer_combination.class.php
+++ b/main/exercise/multiple_answer_combination.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 use ChamiloSession as Session;
@@ -11,8 +12,6 @@ use ChamiloSession as Session;
  *	extending the class question
  *
  *	@author Eric Marguin
- *
- *	@package chamilo.exercise
  */
 class MultipleAnswerCombination extends Question
 {
diff --git a/main/exercise/multiple_answer_combination_true_false.class.php b/main/exercise/multiple_answer_combination_true_false.class.php
index 8afaa439ee..160b5cc680 100755
--- a/main/exercise/multiple_answer_combination_true_false.class.php
+++ b/main/exercise/multiple_answer_combination_true_false.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
@@ -8,8 +9,6 @@
  *  extending the class question
  *
  * @author Eric Marguin
- *
- * @package chamilo.exercise
  */
 class MultipleAnswerCombinationTrueFalse extends MultipleAnswerCombination
 {
diff --git a/main/exercise/multiple_answer_true_false.class.php b/main/exercise/multiple_answer_true_false.class.php
index 28fea63f5e..a807a5a932 100755
--- a/main/exercise/multiple_answer_true_false.class.php
+++ b/main/exercise/multiple_answer_true_false.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 use ChamiloSession as Session;
@@ -9,8 +10,6 @@ use ChamiloSession as Session;
  * (MULTIPLE CHOICE, MULTIPLE ANSWER), extending the class question.
  *
  * @author Julio Montoya
- *
- * @package chamilo.exercise
  */
 class MultipleAnswerTrueFalse extends Question
 {
diff --git a/main/exercise/oral_expression.class.php b/main/exercise/oral_expression.class.php
index 9d433bca44..2df07d0c95 100755
--- a/main/exercise/oral_expression.class.php
+++ b/main/exercise/oral_expression.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
@@ -7,8 +8,6 @@
  * extending the class question.
  *
  * @author Eric Marguin
- *
- * @package chamilo.exercise
  */
 class OralExpression extends Question
 {
@@ -82,19 +81,19 @@ class OralExpression extends Question
     /**
      * initialize the attributes to generate the file path.
      *
-     * @param $sessionId integer
-     * @param $userId integer
-     * @param $exerciseId integer
-     * @param $exeId integer
+     * @param int $sessionId
+     * @param int $userId
+     * @param int $exerciseId
+     * @param int $exeId
      */
     public function initFile($sessionId, $userId, $exerciseId, $exeId)
     {
-        $this->sessionId = intval($sessionId);
-        $this->userId = intval($userId);
+        $this->sessionId = (int) $sessionId;
+        $this->userId = (int) $userId;
         $this->exerciseId = 0;
-        $this->exeId = intval($exeId);
+        $this->exeId = (int) $exeId;
         if (!empty($exerciseId)) {
-            $this->exerciseId = intval($exerciseId);
+            $this->exerciseId = (int) $exerciseId;
         }
         $this->storePath = $this->generateDirectory();
         $this->fileName = $this->generateFileName();
@@ -177,7 +176,7 @@ class OralExpression extends Question
             }
 
             // Function handle_uploaded_document() adds the session and group id by default.
-            $file = "$audioFile"."__".$this->sessionId."__0.$extension";
+            $file = "$audioFile".'__'.$this->sessionId."__0.$extension";
 
             if (is_file($file)) {
                 return $file;
@@ -214,7 +213,7 @@ class OralExpression extends Question
     /**
      * Tricky stuff to deal with the feedback = 0 in exercises (all question per page).
      *
-     * @param $exe_id integer
+     * @param int $exe_id
      */
     public function replaceWithRealExe($exe_id)
     {
diff --git a/main/exercise/overview.php b/main/exercise/overview.php
index b15f710a0d..1b9f3a2690 100755
--- a/main/exercise/overview.php
+++ b/main/exercise/overview.php
@@ -6,8 +6,6 @@ use ChamiloSession as Session;
 /**
  * Exercise preview.
  *
- * @package chamilo.exercise
- *
  * @author Julio Montoya <gugli100@gmail.com>
  */
 require_once __DIR__.'/../inc/global.inc.php';
diff --git a/main/exercise/qti2.php b/main/exercise/qti2.php
index a2f20109df..558bfd9498 100755
--- a/main/exercise/qti2.php
+++ b/main/exercise/qti2.php
@@ -1,11 +1,10 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
  * Code for Qti2 import integration.
  *
- * @package chamilo.exercise
- *
  * @author Ronny Velasquez
  *
  * @version $Id: qti2.php  2010-03-12 12:14:25Z $
diff --git a/main/exercise/question.class.php b/main/exercise/question.class.php
index 254488c798..cb56f01101 100755
--- a/main/exercise/question.class.php
+++ b/main/exercise/question.class.php
@@ -12,8 +12,6 @@ use Chamilo\CourseBundle\Entity\CQuizAnswer;
  * @author Patrick Cool, LaTeX support
  * @author Julio Montoya <gugli100@gmail.com> lot of bug fixes
  * @author hubert.borderiou@grenet.fr - add question categories
- *
- * @package chamilo.exercise
  */
 abstract class Question
 {
@@ -113,7 +111,7 @@ abstract class Question
     {
         $isContent = null;
         if (isset($_REQUEST['isContent'])) {
-            $isContent = intval($_REQUEST['isContent']);
+            $isContent = (int) $_REQUEST['isContent'];
         }
 
         return $this->isContent = $isContent;
@@ -138,7 +136,7 @@ abstract class Question
         }
         $course_id = $course_info['real_id'];
 
-        if (empty($course_id) || $course_id == -1) {
+        if (empty($course_id) || -1 == $course_id) {
             return false;
         }
 
@@ -1166,7 +1164,7 @@ abstract class Question
 
                 // build the chunk to index
                 $ic_slide = new IndexableChunk();
-                $ic_slide->addValue("title", $this->question);
+                $ic_slide->addValue('title', $this->question);
                 $ic_slide->addCourseId($course_id);
                 $ic_slide->addToolId(TOOL_QUIZ);
                 $xapian_data = [
@@ -1180,7 +1178,7 @@ abstract class Question
                     SE_USER => (int) api_get_user_id(),
                 ];
                 $ic_slide->xapian_data = serialize($xapian_data);
-                $ic_slide->addValue("content", $this->description);
+                $ic_slide->addValue('content', $this->description);
 
                 //TODO: index answers, see also form validation on question_admin.inc.php
 
@@ -1297,7 +1295,7 @@ abstract class Question
         $courseId = empty($courseId) ? api_get_course_int_id() : (int) $courseId;
 
         // exercise not found
-        if ($pos === false) {
+        if (false === $pos) {
             return false;
         } else {
             // deletes the position in the array containing the wanted exercise ID
@@ -1559,11 +1557,11 @@ abstract class Question
      */
     public static function getQuestionTypeList()
     {
-        if (api_get_setting('enable_record_audio') !== 'true') {
+        if ('true' !== api_get_setting('enable_record_audio')) {
             self::$questionTypes[ORAL_EXPRESSION] = null;
             unset(self::$questionTypes[ORAL_EXPRESSION]);
         }
-        if (api_get_setting('enable_quiz_scenario') !== 'true') {
+        if ('true' !== api_get_setting('enable_quiz_scenario')) {
             self::$questionTypes[HOT_SPOT_DELINEATION] = null;
             unset(self::$questionTypes[HOT_SPOT_DELINEATION]);
         }
@@ -1793,7 +1791,7 @@ abstract class Question
         $this->setFeedback($form->getSubmitValue('feedback'));
 
         //Save normal question if NOT media
-        if ($this->type != MEDIA_QUESTION) {
+        if (MEDIA_QUESTION != $this->type) {
             $this->save($exercise);
             // modify the exercise
             $exercise->addToList($this->id);
@@ -1967,13 +1965,12 @@ abstract class Question
     public static function updateQuestionOption($id, $params, $course_id)
     {
         $table = Database::get_course_table(TABLE_QUIZ_QUESTION_OPTION);
-        $result = Database::update(
+
+        return Database::update(
             $table,
             $params,
             ['c_id = ? AND id = ?' => [$course_id, $id]]
         );
-
-        return $result;
     }
 
     /**
@@ -1985,7 +1982,8 @@ abstract class Question
     public static function readQuestionOption($question_id, $course_id)
     {
         $table = Database::get_course_table(TABLE_QUIZ_QUESTION_OPTION);
-        $result = Database::select(
+
+        return Database::select(
             '*',
             $table,
             [
@@ -1998,8 +1996,6 @@ abstract class Question
                 'order' => 'id ASC',
             ]
         );
-
-        return $result;
     }
 
     /**
@@ -2062,7 +2058,7 @@ abstract class Question
                     }
 
                     $hide = api_get_configuration_value('hide_free_question_score');
-                    if ($hide === true) {
+                    if (true === $hide) {
                         $score['result'] = '-';
                     }
                 }
@@ -2249,8 +2245,8 @@ abstract class Question
         $course_id,
         $start = 0,
         $limit = 100,
-        $sidx = "question",
-        $sord = "ASC",
+        $sidx = 'question',
+        $sord = 'ASC',
         $where_condition = []
     ) {
         $table_question = Database::get_course_table(TABLE_QUIZ_QUESTION);
@@ -2260,7 +2256,8 @@ abstract class Question
                 MEDIA_QUESTION,
             ],
         ];
-        $result = Database::select(
+
+        return Database::select(
             '*',
             $table_question,
             [
@@ -2269,14 +2266,12 @@ abstract class Question
                 'order' => "$sidx $sord",
             ]
         );
-
-        return $result;
     }
 
     /**
      * Get count course medias.
      *
-     * @param int course id
+     * @param int $course_id course id
      *
      * @return int
      */
@@ -2329,15 +2324,13 @@ abstract class Question
      */
     public static function get_default_levels()
     {
-        $levels = [
+        return [
             1 => 1,
             2 => 2,
             3 => 3,
             4 => 4,
             5 => 5,
         ];
-
-        return $levels;
     }
 
     /**
@@ -2346,7 +2339,7 @@ abstract class Question
     public function show_media_content()
     {
         $html = '';
-        if ($this->parent_id != 0) {
+        if (0 != $this->parent_id) {
             $parent_question = self::read($this->parent_id);
             $html = $parent_question->show_media_content();
         } else {
@@ -2476,7 +2469,7 @@ abstract class Question
     {
         $em = Database::getManager();
 
-        $result = $em
+        return $em
             ->createQuery('
                 SELECT e
                 FROM ChamiloCourseBundle:CQuizRelQuestion qq
@@ -2485,8 +2478,6 @@ abstract class Question
             ')
             ->setParameters(['id' => (int) $this->id])
             ->getResult();
-
-        return $result;
     }
 
     /**
diff --git a/main/exercise/question_admin.inc.php b/main/exercise/question_admin.inc.php
index 37368bc64a..d21bd070a1 100755
--- a/main/exercise/question_admin.inc.php
+++ b/main/exercise/question_admin.inc.php
@@ -1,15 +1,12 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
  * This script allows to manage the statements of questions.
  * It is included from the script admin.php.
  *
- * @package chamilo.exercise
- *
  * @author Olivier Brouckaert
- *
- * @version $Id: question_admin.inc.php 22126 2009-07-15 22:38:39Z juliomontoya $
  */
 if (isset($_GET['editQuestion'])) {
     $objQuestion = Question::read($_GET['editQuestion']);
diff --git a/main/exercise/question_create.php b/main/exercise/question_create.php
index 71e8c3f747..1e6c150cbc 100755
--- a/main/exercise/question_create.php
+++ b/main/exercise/question_create.php
@@ -1,11 +1,7 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
-/**
- * Exercise.
- *
- * @package chamilo.exercise
- */
 require_once __DIR__.'/../inc/global.inc.php';
 
 // the section (tabs)
diff --git a/main/exercise/question_list_admin.inc.php b/main/exercise/question_list_admin.inc.php
index b70030df73..8487f668ee 100755
--- a/main/exercise/question_list_admin.inc.php
+++ b/main/exercise/question_list_admin.inc.php
@@ -1,13 +1,10 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 use ChamiloSession as Session;
 
 /**
- *    Code library for HotPotatoes integration.
- *
- * @package chamilo.exercise
- *
  * @author Olivier Brouckaert & Julio Montoya & Hubert Borderiou 21-10-2011 (Question by category)
  *    QUESTION LIST ADMINISTRATION
  *
@@ -177,7 +174,6 @@ if (!$inATest) {
             $questionList = $objExercise->getQuestionForTeacher($start, $length);
             $paginator = new Knp\Component\Pager\Paginator();
             $pagination = $paginator->paginate([]);
-
             $pagination->setTotalItemCount($nbrQuestions);
             $pagination->setItemNumberPerPage($length);
             $pagination->setCurrentPageNumber($page);
diff --git a/main/exercise/question_pool.php b/main/exercise/question_pool.php
index c939eae7fc..6fe3b752e1 100755
--- a/main/exercise/question_pool.php
+++ b/main/exercise/question_pool.php
@@ -237,7 +237,7 @@ if (isset($_REQUEST['action'])) {
                         $objQuestionTmp = Question::read($questionId);
                         // if the question exists
                         if ($objQuestionTmp) {
-                            if ($objExercise->hasQuestion($questionId) === false) {
+                            if (false === $objExercise->hasQuestion($questionId)) {
                                 $objExercise->addToList($questionId);
                                 $objQuestionTmp->addToList($fromExercise);
                             }
@@ -308,7 +308,7 @@ if (isset($fromExercise) && $fromExercise > 0) {
 }
 echo '</div>';
 
-if ($displayMessage != '') {
+if ('' != $displayMessage) {
     echo Display::return_message($displayMessage, 'confirm');
 }
 
@@ -357,7 +357,7 @@ foreach ($course_list as $item) {
     $courseInfo = api_get_course_info_by_id($courseItemId);
     $course_select_list[$courseItemId] = '';
     if ($courseItemId == api_get_course_int_id()) {
-        $course_select_list[$courseItemId] = ">&nbsp;&nbsp;&nbsp;&nbsp;";
+        $course_select_list[$courseItemId] = '>&nbsp;&nbsp;&nbsp;&nbsp;';
     }
     $course_select_list[$courseItemId] .= $courseInfo['title'];
 }
@@ -385,7 +385,7 @@ $exercise_list = ExerciseLib::get_all_exercises_for_course_id(
     false
 );
 
-if ($exercise_id_changed == 1) {
+if (1 == $exercise_id_changed) {
     reset_menu_lvl_type();
 }
 
@@ -436,7 +436,7 @@ if (!empty($_course)) {
             }
             $new_question_list[$key] = get_lang($item[1]);
         } else {
-            if ($key == HOT_SPOT_DELINEATION) {
+            if (HOT_SPOT_DELINEATION == $key) {
                 continue;
             }
             $new_question_list[$key] = get_lang($item[1]);
@@ -642,7 +642,7 @@ function getQuestions(
                     crc.question_id = qu.id AND
                     crc.category_id = $courseCategoryId";
         }
-        if (isset($exerciseLevel) && $exerciseLevel != -1) {
+        if (isset($exerciseLevel) && -1 != $exerciseLevel) {
             $where .= ' AND level='.$exerciseLevel;
         }
         if (isset($answerType) && $answerType > 0) {
@@ -694,7 +694,7 @@ function getQuestions(
                     crc.c_id = $selected_course AND
                     crc.category_id = $courseCategoryId";
         }
-        if (isset($exerciseLevel) && $exerciseLevel != -1) {
+        if (isset($exerciseLevel) && -1 != $exerciseLevel) {
             $level_where = ' AND level='.$exerciseLevel;
         }
         $answer_where = '';
@@ -779,7 +779,7 @@ function getQuestions(
                         crc.question_id = qu.id AND
                         crc.category_id = $courseCategoryId";
         }
-        if (isset($exerciseLevel) && $exerciseLevel != -1) {
+        if (isset($exerciseLevel) && -1 != $exerciseLevel) {
             $filter .= ' AND level='.$exerciseLevel.' ';
         }
         if (isset($answerType) && $answerType > 0) {
@@ -794,7 +794,7 @@ function getQuestions(
             $filter .= " AND qu.description LIKE '%$description%'";
         }
 
-        if ($session_id == -1 || empty($session_id)) {
+        if (-1 == $session_id || empty($session_id)) {
             $session_id = 0;
         }
         $sessionCondition = api_get_session_condition($session_id, true, 'q.session_id');
@@ -1165,7 +1165,7 @@ function getLinkForQuestion(
     $result = $questionName;
     if ($in_addA) {
         $sessionIcon = '';
-        if (!empty($sessionId) && $sessionId != -1) {
+        if (!empty($sessionId) && -1 != $sessionId) {
             $sessionIcon = ' '.Display::return_icon('star.png', get_lang('Session'));
         }
         $exerciseId = (int) $exerciseId;
@@ -1244,7 +1244,7 @@ function get_action_icon_for_question(
         case 'add':
             $res = '-';
             if (!$myObjEx->hasQuestion($in_questionid)) {
-                $res = "<a href='".api_get_self()."?".
+                $res = "<a href='".api_get_self().'?'.
                     api_get_cidreq().$getParams."&recup=$in_questionid&fromExercise=$from_exercise'>";
                 $res .= Display::return_icon('view_more_stats.gif', get_lang('InsertALinkToThisQuestionInTheExercise'));
                 $res .= '</a>';
diff --git a/main/exercise/recalculate.php b/main/exercise/recalculate.php
index 201630996b..f924b62668 100644
--- a/main/exercise/recalculate.php
+++ b/main/exercise/recalculate.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 use Chamilo\CoreBundle\Entity\TrackEExercises;
diff --git a/main/exercise/stats.php b/main/exercise/stats.php
index 86084cd749..18e214ee4f 100755
--- a/main/exercise/stats.php
+++ b/main/exercise/stats.php
@@ -1,4 +1,5 @@
 <?php
+
 /* See license terms in /license.txt */
 
 require_once __DIR__.'/../inc/global.inc.php';
@@ -155,7 +156,7 @@ if (!empty($question_list)) {
                     $answers = $objExercise->fill_in_blank_answer_to_array($answer_info);
                     $counter = 0;
                     foreach ($answers as $answer_item) {
-                        if ($counter == 0) {
+                        if (0 == $counter) {
                             $data[$id]['name'] = cut($questionObj->question, 100);
                         } else {
                             $data[$id]['name'] = '-';
@@ -305,8 +306,8 @@ $interbreadcrumb[] = [
     "name" => get_lang('Exercises'),
 ];
 $interbreadcrumb[] = [
-    "url" => "admin.php?exerciseId=$exerciseId&".api_get_cidreq(),
-    "name" => $objExercise->selectTitle(true),
+    'url' => "admin.php?exerciseId=$exerciseId&".api_get_cidreq(),
+    'name' => $objExercise->selectTitle(true),
 ];
 
 $tpl = new Template(get_lang('ReportByQuestion'));
diff --git a/main/exercise/tests_category.php b/main/exercise/tests_category.php
index f7e7595904..785a8b68a0 100755
--- a/main/exercise/tests_category.php
+++ b/main/exercise/tests_category.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
diff --git a/main/exercise/unique_answer.class.php b/main/exercise/unique_answer.class.php
index 50660bcd9d..a374e6cc49 100755
--- a/main/exercise/unique_answer.class.php
+++ b/main/exercise/unique_answer.class.php
@@ -13,8 +13,6 @@ use ChamiloSession as Session;
  *
  * @author Eric Marguin
  * @author Julio Montoya
- *
- * @package chamilo.exercise
  */
 class UniqueAnswer extends Question
 {
diff --git a/main/exercise/unique_answer_no_option.class.php b/main/exercise/unique_answer_no_option.class.php
index 2681782034..aa2eb4f250 100755
--- a/main/exercise/unique_answer_no_option.class.php
+++ b/main/exercise/unique_answer_no_option.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 use ChamiloSession as Session;
@@ -10,8 +11,6 @@ use ChamiloSession as Session;
  *
  * @author Eric Marguin
  * @author Julio Montoya
- *
- * @package chamilo.exercise
  */
 class UniqueAnswerNoOption extends Question
 {
@@ -301,10 +300,6 @@ class UniqueAnswerNoOption extends Question
             $comment = trim($form->getSubmitValue('comment['.$i.']'));
             $weighting = trim($form->getSubmitValue('weighting['.$i.']'));
             $scenario = $form->getSubmitValue('scenario');
-
-            //$list_destination = $form -> getSubmitValue('destination'.$i);
-            //$destination_str = $form -> getSubmitValue('destination'.$i);
-
             $try = $scenario['try'.$i];
             $lp = $scenario['lp'.$i];
             $destination = $scenario['destination'.$i];
@@ -351,7 +346,7 @@ class UniqueAnswerNoOption extends Question
                 $destination = 0;
             }
 
-            if ($url == '') {
+            if ('' == $url) {
                 $url = 0;
             }
 
diff --git a/main/exercise/upload_exercise.php b/main/exercise/upload_exercise.php
index 71ae937b9b..8498763622 100755
--- a/main/exercise/upload_exercise.php
+++ b/main/exercise/upload_exercise.php
@@ -5,8 +5,6 @@ use ChamiloSession as Session;
 
 /**
  * Upload quiz: This script shows the upload quiz feature.
- *
- * @package chamilo.exercise
  */
 
 // setting the help