Minor - flint fixes

main/exercise/question_pool.php

@@ -1048,7 +1048,7 @@ $table = new HTML_Table(['class' => 'table table-bordered data_table'], false);
 $row = 0;
 $column = 0;
 foreach ($headers as $header) {
-    $table->setHeaderContents($row,$column , $header);
+    $table->setHeaderContents($row, $column, $header);
 
     $column++;
 }

main/inc/lib/display.lib.php

@@ -892,7 +892,7 @@ class Display
         // When moving this to production, the return_icon() calls should
         // ask for the SVG version directly
         $svgIcons = api_get_setting('icons_mode_svg');
-        if ($svgIcons == 'true' && $return_only_path == false) {
+        if ($svgIcons === 'true' && $return_only_path == false) {
             $svgImage = substr($image, 0, -3).'svg';
             if (is_file($code_path.$theme.'svg/'.$svgImage)) {
                 $icon = $w_code_path.$theme.'svg/'.$svgImage;

main/inc/lib/groupmanager.lib.php

@@ -2239,8 +2239,8 @@ class GroupManager
     /**
      * Get all groups where a specific user is subscribed.
      *
-     * @param int $user_id
-     * @param int $courseId
+     * @param int      $user_id
+     * @param int      $courseId
      * @param int|null $sessionId
      *
      * @return array

main/inc/lib/message.lib.php

@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 use Chamilo\CoreBundle\Entity\Message;
@@ -10,8 +11,6 @@ use ChamiloSession as Session;
  *
  * This class provides methods for messages management.
  * Include/require it in your code to use its features.
- *
- * @package chamilo.library
  */
 class MessageManager
 {
@@ -64,7 +63,7 @@ class MessageManager
 
         $sql = "SELECT COUNT(id) as number_messages
                 FROM $table
-                WHERE 
+                WHERE
                     $conditions
                 ";
         $result = Database::query($sql);
@@ -184,10 +183,10 @@ class MessageManager
         }
 
         $table = Database::get_main_table(TABLE_MESSAGE);
-        $sql = "SELECT 
-                    id as col0, 
-                    title as col1, 
-                    send_date as col2, 
+        $sql = "SELECT
+                    id as col0,
+                    title as col1,
+                    send_date as col2,
                     msg_status as col3,
                     user_sender_id
                 FROM $table
@@ -340,9 +339,9 @@ class MessageManager
         if (!empty($aboutUserInfo)) {
             $table = Database::get_main_table(TABLE_MESSAGE);
             $sql = 'SELECT id FROM '.$table.'
-                    WHERE 
-                      user_receiver_id = '.$aboutUserInfo['id'].' AND 
-                      msg_status = '.MESSAGE_STATUS_CONVERSATION.'                    
+                    WHERE
+                      user_receiver_id = '.$aboutUserInfo['id'].' AND
+                      msg_status = '.MESSAGE_STATUS_CONVERSATION.'
                     ';
             $result = Database::query($sql);
             $messages = [];
@@ -419,12 +418,12 @@ class MessageManager
         $message = Database::escape_string($message);
 
         $sql = "SELECT * FROM $table
-                WHERE 
+                WHERE
                     user_sender_id = $senderId AND
-                    user_receiver_id = $receiverId AND 
-                    title = '$subject' AND 
+                    user_receiver_id = $receiverId AND
+                    title = '$subject' AND
                     content = '$message' AND
-                    (msg_status = ".MESSAGE_STATUS_UNREAD." OR msg_status = ".MESSAGE_STATUS_NEW.")                    
+                    (msg_status = ".MESSAGE_STATUS_UNREAD." OR msg_status = ".MESSAGE_STATUS_NEW.")
                 ";
         $result = Database::query($sql);
 
@@ -852,8 +851,8 @@ class MessageManager
         }
 
         $sql = "SELECT * FROM $table
-                WHERE 
-                    id = $id AND 
+                WHERE
+                    id = $id AND
                     user_receiver_id = $user_receiver_id AND
                     msg_status <> ".MESSAGE_STATUS_OUTBOX;
         $rs = Database::query($sql);
@@ -862,10 +861,10 @@ class MessageManager
             // Delete attachment file.
             self::delete_message_attachment_file($id, $user_receiver_id);
             // Soft delete message.
-            $query = "UPDATE $table 
+            $query = "UPDATE $table
                       SET msg_status = ".MESSAGE_STATUS_DELETED."
                       WHERE
-                        id = $id AND 
+                        id = $id AND
                         user_receiver_id = $user_receiver_id ";
             Database::query($query);
 
@@ -1044,7 +1043,7 @@ class MessageManager
             $path_message_attach = $path_user_info['dir'].'message_attachments/';
             if (is_file($path_message_attach.$path)) {
                 if (rename($path_message_attach.$path, $path_message_attach.$new_path)) {
-                    $sql = "UPDATE $table_message_attach 
+                    $sql = "UPDATE $table_message_attach
                             SET path = '$new_path'
                             WHERE id = $attach_id ";
                     Database::query($sql);
@@ -1355,8 +1354,8 @@ class MessageManager
         }
 
         $query = "SELECT * FROM $table
-                  WHERE                            
-                    id = $messageId AND 
+                  WHERE
+                    id = $messageId AND
                     $userCondition
                     msg_status = $status";
         $result = Database::query($query);
@@ -2093,8 +2092,8 @@ class MessageManager
         $table = Database::get_main_table(TABLE_MESSAGE);
         $messageId = (int) $messageId;
         $sql = "SELECT * FROM $table
-                WHERE 
-                    id = '$messageId' AND 
+                WHERE
+                    id = '$messageId' AND
                     msg_status <> '".MESSAGE_STATUS_DELETED."' ";
         $res = Database::query($sql);
         $item = [];
@@ -2479,7 +2478,7 @@ class MessageManager
         }
         $messagesTable = Database::get_main_table(TABLE_MESSAGE);
         $userTable = Database::get_main_table(TABLE_MAIN_USER);
-        $sql = "SELECT m.*, u.user_id, u.lastname, u.firstname, u.picture_uri 
+        $sql = "SELECT m.*, u.user_id, u.lastname, u.firstname, u.picture_uri
                 FROM $messagesTable as m
                 INNER JOIN $userTable as u
                 ON m.user_sender_id = u.user_id
@@ -2523,13 +2522,13 @@ class MessageManager
         $messagesTable = Database::get_main_table(TABLE_MESSAGE);
         $userTable = Database::get_main_table(TABLE_MAIN_USER);
 
-        $sql = "SELECT m.*, u.user_id, u.lastname, u.firstname, u.picture_uri 
+        $sql = "SELECT m.*, u.user_id, u.lastname, u.firstname, u.picture_uri
                 FROM $messagesTable as m
                 INNER JOIN $userTable as u
                 ON m.user_receiver_id = u.user_id
                 WHERE
-                    m.user_sender_id = $userId 
-                    AND m.msg_status = ".MESSAGE_STATUS_OUTBOX." 
+                    m.user_sender_id = $userId
+                    AND m.msg_status = ".MESSAGE_STATUS_OUTBOX."
                     AND m.id > $lastId
                 ORDER BY m.send_date DESC";
 
@@ -2887,7 +2886,7 @@ class MessageManager
             return [];
         }
 
-        $sql = "SELECT DISTINCT * 
+        $sql = "SELECT DISTINCT *
                 FROM $messagesTable
                 WHERE
                     (user_receiver_id = $userId AND user_sender_id = $otherUserId) OR
@@ -3084,7 +3083,7 @@ class MessageManager
         }
 
         $table = Database::get_main_table(TABLE_MESSAGE);
-        $sql = "SELECT COUNT(id) as count 
+        $sql = "SELECT COUNT(id) as count
                 FROM $table
                 WHERE
                     user_receiver_id = $userId AND

main/inc/lib/sessionmanager.lib.php

@@ -7618,7 +7618,7 @@ class SessionManager
                 $sessionFieldValueList[$fieldId] = $sessionFieldValue;
             }
         }
- 
+
         foreach ($sessionFieldValueList as $sessionFieldValue) {
             $extrafieldVariable = $fields[$sessionFieldValue['field_id']];
             $extrafieldValue = $sessionFieldValue['value'];

plugin/migrationmoodle/src/Loader/CourseCategoriesLoader.php

@@ -15,8 +15,6 @@ class CourseCategoriesLoader implements LoaderInterface
     /**
      * Load the data and return the ID inserted.
      *
-     * @param array $incomingData
-     *
      * @return int
      */
     public function load(array $incomingData)

plugin/migrationmoodle/src/Loader/CourseFilesLoader.php

@@ -20,8 +20,6 @@ class CourseFilesLoader implements LoaderInterface
     /**
      * Load the data and return the ID inserted.
      *
-     * @param array $incomingData
-     *
      * @throws \Exception
      *
      * @return int

plugin/migrationmoodle/src/Loader/CourseIntroductionLoader.php

@@ -3,7 +3,6 @@
 
 namespace Chamilo\PluginBundle\MigrationMoodle\Loader;
 
-use Chamilo\CourseBundle\Entity\CToolIntro;
 use Chamilo\PluginBundle\MigrationMoodle\Interfaces\LoaderInterface;
 
 /**

plugin/migrationmoodle/src/Loader/LessonPagesLoader.php

@@ -17,8 +17,6 @@ class LessonPagesLoader implements LoaderInterface
     /**
      * Load the data and return the ID inserted.
      *
-     * @param array $incomingData
-     *
      * @return int
      */
     public function load(array $incomingData)

plugin/migrationmoodle/src/Loader/UserLearnPathLessonAttemptLoader.php

@@ -11,8 +11,6 @@ namespace Chamilo\PluginBundle\MigrationMoodle\Loader;
 class UserLearnPathLessonAttemptLoader extends UserLearnPathLessonBranchLoader
 {
     /**
-     * @param array $incomingData
-     *
      * @throws \Exception
      *
      * @return int

plugin/migrationmoodle/src/Loader/UserLearnPathLessonBranchLoader.php

@@ -3,7 +3,6 @@
 
 namespace Chamilo\PluginBundle\MigrationMoodle\Loader;
 
-use Chamilo\CourseBundle\Entity\CLpItemView;
 use Chamilo\PluginBundle\MigrationMoodle\Interfaces\LoaderInterface;
 
 /**
@@ -52,10 +51,9 @@ class UserLearnPathLessonBranchLoader implements LoaderInterface
     }
 
     /**
-     * @param array $incomingData
-     * @return array
-     *
      * @throws \Exception
+     *
+     * @return array
      */
     private function findViewOfItem(array $incomingData)
     {
@@ -70,18 +68,16 @@ class UserLearnPathLessonBranchLoader implements LoaderInterface
         );
 
         if (!$itemView) {
-            throw new \Exception("Item view not found for "
-                ."item ({$incomingData['item_id']}) and user ({$incomingData['user_id']}).");
+            throw new \Exception("Item view not found for "."item ({$incomingData['item_id']}) and user ({$incomingData['user_id']}).");
         }
 
         return $itemView;
     }
 
     /**
-     * @param array $incomingData
-     * @return array
-     *
      * @throws \Exception
+     *
+     * @return array
      */
     private function findViewOfPreviousItem(array $incomingData)
     {
@@ -96,8 +92,7 @@ class UserLearnPathLessonBranchLoader implements LoaderInterface
         $previousItemView = \Database::fetch_assoc($result);
 
         if (!$previousItemView) {
-            throw new \Exception("Item view not found for "
-                ."previous item ({$incomingData['item_id']}) and user ({$incomingData['user_id']}).");
+            throw new \Exception("Item view not found for "."previous item ({$incomingData['item_id']}) and user ({$incomingData['user_id']}).");
         }
 
         return $previousItemView;

plugin/migrationmoodle/src/Loader/UserLearnPathLessonTimerLoader.php

@@ -3,7 +3,6 @@
 
 namespace Chamilo\PluginBundle\MigrationMoodle\Loader;
 
-use Chamilo\CourseBundle\Entity\CLpItemView;
 use Chamilo\PluginBundle\MigrationMoodle\Interfaces\LoaderInterface;
 
 /**
@@ -34,10 +33,9 @@ class UserLearnPathLessonTimerLoader implements LoaderInterface
     }
 
     /**
-     * @param array $incomingData
-     * @return array
-     *
      * @throws \Exception
+     *
+     * @return array
      */
     private function findViewOfParentItem(array $incomingData)
     {
@@ -60,10 +58,9 @@ class UserLearnPathLessonTimerLoader implements LoaderInterface
     }
 
     /**
-     * @param array $incomingData
-     * @return array
-     *
      * @throws \Exception
+     *
+     * @return array
      */
     private function findViewOfFirstItem(array $incomingData)
     {
@@ -85,8 +82,7 @@ class UserLearnPathLessonTimerLoader implements LoaderInterface
         );
 
         if (!$itemView) {
-            throw new \Exception("Item view not found for item with"
-                ." parent item ({$incomingData['parent_item_id']}) and user ({$incomingData['user_id']})");
+            throw new \Exception("Item view not found for item with"." parent item ({$incomingData['parent_item_id']}) and user ({$incomingData['user_id']})");
         }
 
         return $itemView;

plugin/migrationmoodle/src/Loader/UserLearnPathQuizLoader.php

@@ -3,7 +3,6 @@
 
 namespace Chamilo\PluginBundle\MigrationMoodle\Loader;
 
-use Chamilo\CourseBundle\Entity\CLpItemView;
 use Chamilo\PluginBundle\MigrationMoodle\Interfaces\LoaderInterface;
 
 /**

plugin/migrationmoodle/src/Loader/UserLearnPathsLoader.php

@@ -3,7 +3,6 @@
 
 namespace Chamilo\PluginBundle\MigrationMoodle\Loader;
 
-use Chamilo\CoreBundle\Entity\SessionRelCourseRelUser;
 use Chamilo\PluginBundle\MigrationMoodle\Interfaces\LoaderInterface;
 
 /**

plugin/migrationmoodle/src/Loader/UsersScormsViewLoader.php

@@ -3,7 +3,6 @@
 
 namespace Chamilo\PluginBundle\MigrationMoodle\Loader;
 
-use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\PluginBundle\MigrationMoodle\Interfaces\LoaderInterface;
 
 /**

plugin/migrationmoodle/src/MigrationMoodlePlugin.php

@@ -157,7 +157,7 @@ class MigrationMoodlePlugin extends Plugin implements HookPluginInterface
                 'where' => [
                     'name = ?' => Database::escape_string($name.'_task'),
                     'or name = ?' => Database::escape_string($name.'_script'),
-                ]
+                ],
             ],
             'first'
         );

plugin/migrationmoodle/src/Script/BaseScript.php

@@ -32,7 +32,7 @@ abstract class BaseScript
         $this->process();
     }
 
-    abstract function process();
+    abstract public function process();
 
     /**
      * @param string $message