Minor - flint fixes

main/auth/sso/sso.Drupal.class.php

@@ -91,7 +91,7 @@ class ssoDrupal
     /**
      * Validates the received active connection data with the database.
      *
-     * @return null|false Return the loginFailed variable value to local.inc.php
+     * @return false|null Return the loginFailed variable value to local.inc.php
      */
     public function check_user()
     {

main/dropbox/dropbox_functions.inc.php

@@ -862,7 +862,7 @@ function removeMoreIfMailing($file_id)
  * @param array            $file
  * @param Dropbox_SentWork $work
  *
- * @return array|null|string
+ * @return array|string|null
  */
 function store_add_dropbox($file = [], $work = null)
 {

main/exercise/MultipleAnswerTrueFalseDegreeCertainty.php

@@ -305,7 +305,7 @@ class MultipleAnswerTrueFalseDegreeCertainty extends Question
      * @param int      $counter
      * @param float    $score
      *
-     * @return null|string
+     * @return string|null
      */
     public function return_header($exercise, $counter = null, $score = null)
     {

main/exercise/TestCategory.php

@@ -648,7 +648,7 @@ class TestCategory
      * @param int $questionId
      * @param int $in_display_category_name
      *
-     * @return null|string
+     * @return string|null
      */
     public static function returnCategoryAndTitle($questionId, $in_display_category_name = 1)
     {

main/gradebook/lib/be/category.class.php

@@ -296,7 +296,7 @@ class Category implements GradebookItem
     }
 
     /**
-     * @return null|int
+     * @return int|null
      */
     public function get_grade_model_id()
     {
@@ -2674,7 +2674,7 @@ class Category implements GradebookItem
      * Internal function used by get_tree().
      *
      * @param int      $level
-     * @param null|int $visible
+     * @param int|null $visible
      *
      * @return array
      */

main/gradebook/lib/fe/gradebooktable.class.php

@@ -1164,7 +1164,7 @@ class GradebookTable extends SortableTable
     /**
      * @param AbstractLink $item
      *
-     * @return null|string
+     * @return string|null
      */
     private function build_edit_column($item)
     {

main/gradebook/lib/fe/linkform.class.php

@@ -140,9 +140,9 @@ class LinkForm extends FormValidator
 
     /**
      * @param int         $link
-     * @param null|string $courseCode
+     * @param string|null $courseCode
      *
-     * @return AttendanceLink|DropboxLink|ExerciseLink|ForumThreadLink|LearnpathLink|null|StudentPublicationLink|SurveyLink
+     * @return AttendanceLink|DropboxLink|ExerciseLink|ForumThreadLink|LearnpathLink|StudentPublicationLink|SurveyLink|null
      */
     private function createLink($link, $courseCode)
     {

main/gradebook/lib/fe/resulttable.class.php

@@ -22,7 +22,7 @@ class ResultTable extends SortableTable
      *
      * @param string      $evaluation
      * @param array       $results
-     * @param null|string $iscourse
+     * @param string|null $iscourse
      * @param array       $addparams
      * @param bool        $forprint
      */

main/gradebook/lib/gradebook_data_generator.class.php

@@ -448,7 +448,7 @@ class GradebookDataGenerator
      * @param GradebookItem $item
      * @param bool          $ignore_score_color
      *
-     * @return null|string
+     * @return string|null
      */
     private function build_result_column(
         $userId,

main/inc/lib/api.lib.php

@@ -4633,7 +4633,7 @@ function api_get_languages_combo($name = 'language')
  * @param  bool Hide form if only one language available (defaults to false = show the box anyway)
  * @param bool $showAsButton
  *
- * @return null|string Display the box directly
+ * @return string|null Display the box directly
  */
 function api_display_language_form($hide_if_no_choice = false, $showAsButton = false)
 {
@@ -8043,7 +8043,7 @@ function api_get_user_info_from_official_code($officialCode)
  * @param string $usernameInputId
  * @param string $passwordInputId
  *
- * @return null|string
+ * @return string|null
  */
 function api_get_password_checker_js($usernameInputId, $passwordInputId)
 {

main/inc/lib/blog.lib.php

@@ -3212,7 +3212,7 @@ class Blog
      * @param string $fullText
      * @param int    $length
      *
-     * @return null|string
+     * @return string|null
      */
     private static function getPostExtract($fullText, $length = BLOG_MAX_PREVIEW_CHARS)
     {

main/inc/lib/course.lib.php

@@ -6722,7 +6722,7 @@ class CourseManager
      * @param Course $course
      * @param bool   $fullSize
      *
-     * @return null|string
+     * @return string|null
      */
     public static function getPicturePath(Course $course, $fullSize = false)
     {

main/inc/lib/course_category.lib.php

@@ -408,7 +408,7 @@ class CourseCategory
     /**
      * @param string $categoryCode
      *
-     * @return null|string
+     * @return string|null
      */
     public static function getParentsToString($categoryCode)
     {

main/inc/lib/display.lib.php

@@ -1874,7 +1874,7 @@ class Display
     /**
      * @param array $list
      *
-     * @return null|string
+     * @return string|null
      */
     public static function description($list)
     {
@@ -1926,7 +1926,7 @@ class Display
      * @param string $count
      * @param string $type
      *
-     * @return null|string
+     * @return string|null
      */
     public static function badge($count, $type = "warning")
     {
@@ -2017,7 +2017,7 @@ class Display
      * @param array  $items
      * @param string $class
      *
-     * @return null|string
+     * @return string|null
      */
     public static function actions($items, $class = 'new_actions')
     {
@@ -2070,7 +2070,7 @@ class Display
      * @param string $type
      * @param null   $id
      *
-     * @return null|string
+     * @return string|null
      */
     public static function generate_accordion($items, $type = 'jquery', $id = null)
     {
@@ -2151,7 +2151,7 @@ class Display
      * @param string $file
      * @param array  $params
      *
-     * @return null|string
+     * @return string|null
      */
     public static function getMediaPlayer($file, $params = [])
     {
@@ -2628,7 +2628,7 @@ class Display
      * @param bool|true  $open
      * @param bool|false $fullClickable
      *
-     * @return null|string
+     * @return string|null
      *
      * @todo rework function to easy use
      */

main/inc/lib/document.lib.php

@@ -418,7 +418,7 @@ class DocumentManager
      * @param string $path
      * @param int    $sessionId
      *
-     * @return null|string
+     * @return string|null
      */
     public static function getSessionFolderFilters($path, $sessionId)
     {
@@ -6433,7 +6433,7 @@ class DocumentManager
      * @param string $target
      * @param string $overwrite_url
      *
-     * @return null|string
+     * @return string|null
      */
     private static function parseFile(
         $userInfo,
@@ -6533,7 +6533,7 @@ class DocumentManager
      * @param array $resource
      * @param int   $lp_id
      *
-     * @return null|string
+     * @return string|null
      */
     private static function parseFolder($folderId, $resource, $lp_id)
     {
@@ -6736,7 +6736,7 @@ class DocumentManager
      * @param bool  $isCertificateMode
      * @param int   $parentId
      *
-     * @return null|string
+     * @return string|null
      */
     private static function getButtonVisibility(
         $isReadOnly,

main/inc/lib/events.lib.php

@@ -2512,7 +2512,6 @@ class Event
         $logInfo['info'] = !empty($logInfo['info']) ? $logInfo['info'] : '';
         $logInfo['url'] = $_SERVER['REQUEST_URI'];
 
-
         $id = Database::insert('track_e_access_complete', $logInfo);
         if ($id) {
             Session::write('last_id', $id);

main/inc/lib/extra_field_option.lib.php

@@ -721,7 +721,7 @@ class ExtraFieldOption extends Model
     /**
      * @param $priority
      *
-     * @return null|string
+     * @return string|null
      */
     public function getPriorityMessageType($priority)
     {

main/inc/lib/plugin.lib.php

@@ -258,7 +258,7 @@ class AppPlugin
      * @param Template $template
      * @param bool     $forced
      *
-     * @return null|string
+     * @return string|null
      */
     public function load_region($region, $template, $forced = false)
     {

main/inc/lib/userportal.lib.php

@@ -103,7 +103,7 @@ class IndexManager
     /**
      * @param bool $show_slide
      *
-     * @return null|string
+     * @return string|null
      */
     public function return_announcements($show_slide = true)
     {

main/lp/learnpathItem.class.php

@@ -89,7 +89,7 @@ class learnpathItem
      * @param int        $id           Learning path item ID
      * @param int        $user_id      User ID
      * @param int        $course_id    Course int id
-     * @param null|array $item_content An array with the contents of the item
+     * @param array|null $item_content An array with the contents of the item
      */
     public function __construct(
         $id,
@@ -4326,7 +4326,7 @@ class learnpathItem
     /**
      * Adds an audio file attached to the current item (store on disk and in db).
      *
-     * @return bool|null|string
+     * @return bool|string|null
      */
     public function add_audio()
     {

main/lp/lp_ajax_save_item.php

@@ -38,7 +38,7 @@ require_once __DIR__.'/../inc/global.inc.php';
  * @param int    $userNavigatesAway    Whether the user is moving to another item
  * @param int    $statusSignalReceived Whether the SCO called SetValue(lesson_status)
  *
- * @return bool|null|string The resulting JS string
+ * @return bool|string|null The resulting JS string
  */
 function save_item(
     $lp_id,

main/mySpace/myStudents.php

@@ -2,7 +2,6 @@
 /* For licensing terms, see /license.txt */
 
 use Chamilo\CoreBundle\Entity\Message;
-use Chamilo\CourseBundle\Entity\CLp;
 use Chamilo\CourseBundle\Entity\CLpCategory;
 use ChamiloSession as Session;
 
@@ -1633,7 +1632,6 @@ if (empty($details)) {
             }
             echo '</tbody></table></div>';
         }
-
     }
 
     if ($user_info['status'] != INVITEE) {

main/webservices/lp.php

@@ -592,7 +592,7 @@ $server->register(
 /**
  * @param array $params
  *
- * @return null|soap_fault
+ * @return soap_fault|null
  */
 function WSCreateLp($params)
 {

main/webservices/registration.soap.php

@@ -19,7 +19,7 @@ define('DEFAULT_ADMIN_USER_ID', 1);
 /**
  * @param string $code
  *
- * @return null|soap_fault
+ * @return soap_fault|null
  */
 function returnError($code)
 {
@@ -1119,7 +1119,7 @@ $server->register(
  *
  * @param array $params - WSFunction parameters (include VerifyKey)
  *
- * @return bool|null|soap_fault A simple boolean (true if teacher successful subscribed, false otherwise)
+ * @return bool|soap_fault|null A simple boolean (true if teacher successful subscribed, false otherwise)
  */
 function WSSubscribeTeacherToSessionCourse($params)
 {
@@ -1178,7 +1178,7 @@ $server->register(
  *
  *  @param array $params - WSFunction parameters (include VerifyKey)
  *
- *  @return bool|null|soap_fault A simple boolean (true if teacher successful unsubscribed, false otherwise)
+ *  @return bool|soap_fault|null A simple boolean (true if teacher successful unsubscribed, false otherwise)
  */
 function WSUnsubscribeTeacherFromSessionCourse($params)
 {
@@ -1609,7 +1609,7 @@ $server->register(
  *
  * @throws \Doctrine\DBAL\DBALException
  *
- * @return bool|int|null|soap_fault
+ * @return bool|int|soap_fault|null
  */
 function WSEditUserCredentials($params)
 {
@@ -4720,7 +4720,7 @@ $server->register(
  *
  * @param array $params
  *
- * @return array|int|null|soap_fault|string
+ * @return array|int|soap_fault|string|null
  */
 function WSSubscribeUserToCourseSimple($params)
 {
@@ -5241,7 +5241,7 @@ $server->register(
 /**
  * @param array $params
  *
- * @return array|null|soap_fault
+ * @return array|soap_fault|null
  */
 function WSUnSubscribeUserFromCourseSimple($params)
 {
@@ -5540,7 +5540,7 @@ $server->register(
 /**
  * @param array $params
  *
- * @return int|null|soap_fault|string
+ * @return int|soap_fault|string|null
  */
 function WSSubscribeUserToSessionSimple($params)
 {
@@ -6298,7 +6298,7 @@ $server->register(
 /**
  * @param array $params
  *
- * @return int|null|soap_fault
+ * @return int|soap_fault|null
  */
 function WSUpdateUserApiKey($params)
 {
@@ -6481,7 +6481,7 @@ $server->register(
  *
  * @param array $params Array of parameters (course and user_id)
  *
- * @return bool|null|soap_fault A simple boolean (true if user is subscribed, false otherwise)
+ * @return bool|soap_fault|null A simple boolean (true if user is subscribed, false otherwise)
  */
 function WSUserSubscribedInCourse($params)
 {

main/work/work.lib.php

@@ -3819,7 +3819,7 @@ function checkExistingWorkFileName($filename, $workId)
  * @param bool  $checkDuplicated
  * @param bool  $showFlashMessage
  *
- * @return null|string
+ * @return string|null
  */
 function processWorkForm(
     $workInfo,

plugin/advanced_subscription/src/HookAdvancedSubscription.php

@@ -405,7 +405,7 @@ class HookAdvancedSubscription extends HookObserver implements HookAdminBlockObs
     /**
      * @param $params
      *
-     * @return null|soap_fault
+     * @return soap_fault|null
      */
     public static function WSSessionListInCategory($params)
     {
@@ -456,7 +456,7 @@ class HookAdvancedSubscription extends HookObserver implements HookAdminBlockObs
     /**
      * @param $params
      *
-     * @return null|soap_fault
+     * @return soap_fault|null
      */
     public static function WSSessionGetDetailsByUser($params)
     {

src/Chamilo/UserBundle/Repository/UserRepository.php

@@ -1330,7 +1330,7 @@ class UserRepository extends EntityRepository
      *
      * @throws \Exception
      *
-     * @return null|TrackELogin
+     * @return TrackELogin|null
      */
     public function getLastLogin(User $user)
     {