Minor - format code + fix php errors

public/main/extra/myStudents.php

@@ -1,6 +1,8 @@
 <?php
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Entity\Usergroup;
+
 require_once '../inc/global.inc.php';
 
 $allow = api_get_configuration_value('extra');
@@ -480,7 +482,7 @@ if (!empty($studentId)) {
 
     $userPicture = UserManager::getUserPicture($user_info['user_id']);
     $userGroupManager = new UserGroupModel();
-    $userGroups = $userGroupManager->getNameListByUser($user_info['user_id'], UserGroup::NORMAL_CLASS); ?>
+    $userGroups = $userGroupManager->getNameListByUser($user_info['user_id'], Usergroup::NORMAL_CLASS); ?>
     <img src="<?php echo $userPicture; ?>">
     <div class="row">
         <div class="col-sm-6">
@@ -608,7 +610,7 @@ if (!empty($studentId)) {
                         );
             $icon = Display::return_icon('accept_na.png');
             if (isset($value['value'])) {
-                list($legalId, $legalLanguageId, $legalTime) = explode(':', $value['value']);
+                [$legalId, $legalLanguageId, $legalTime] = explode(':', $value['value']);
                 $icon = Display::return_icon('accept.png').' '.api_get_local_time($legalTime);
                 $icon .= ' '.Display::url(
                                     get_lang('Delete legal agreement'),

public/main/inc/lib/SkillModel.php

@@ -906,7 +906,7 @@ class SkillModel extends Model
                 $tableResult .= $table;
             }
         } else {
-            $tableResult .= get_lang('WithoutAchieved skills');
+            $tableResult .= get_lang('Without achieved skills');
         }
 
         if ($addTitle) {

public/main/inc/lib/tracking.lib.php

@@ -6,6 +6,7 @@ use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Entity\ExtraField as EntityExtraField;
 use Chamilo\CoreBundle\Entity\Session as SessionEntity;
 use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CoreBundle\Entity\Usergroup;
 use Chamilo\CoreBundle\Framework\Container;
 use Chamilo\CourseBundle\Entity\CLp;
 use Chamilo\CourseBundle\Entity\CQuiz;
@@ -8936,7 +8937,7 @@ class TrackingCourseLog
             $user_row['count_messages'] = $user['count_messages'];
 
             $userGroupManager = new UserGroupModel();
-            $user_row['classes'] = $userGroupManager->getLabelsFromNameList($user['user_id'], UserGroup::NORMAL_CLASS);
+            $user_row['classes'] = $userGroupManager->getLabelsFromNameList($user['user_id'], Usergroup::NORMAL_CLASS);
 
             if (empty($session_id)) {
                 $user_row['survey'] = $user['survey'];

public/main/lp/lp_report.php

@@ -2,6 +2,7 @@
 
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Entity\Usergroup;
 use Chamilo\CoreBundle\Framework\Container;
 use Chamilo\CourseBundle\Entity\CLp;
 use Chamilo\CourseBundle\Entity\CLpCategory;
@@ -325,7 +326,7 @@ if (!empty($users)) {
 
         $classesToString = '';
         if ($allowUserGroups) {
-            $classes = $userGroup->getUserGroupListByUser($userId, UserGroup::NORMAL_CLASS);
+            $classes = $userGroup->getUserGroupListByUser($userId, Usergroup::NORMAL_CLASS);
             $icon = Display::return_icon('class.png', get_lang('Class'));
             if (!empty($classes)) {
                 $classUrl = api_get_path(WEB_CODE_PATH).'user/class.php?'.api_get_cidreq(true, false);

public/main/mySpace/myStudents.php

@@ -5,6 +5,7 @@
 use Chamilo\CoreBundle\Framework\Container;
 use Chamilo\CourseBundle\Entity\CLpCategory;
 use Chamilo\CourseBundle\Entity\CQuiz;
+use Chamilo\CoreBundle\Entity\Usergroup;
 use Chamilo\CourseBundle\Entity\CStudentPublication;
 use ChamiloSession as Session;
 
@@ -873,7 +874,7 @@ $session_name = '';
 $userGroupManager = new UserGroupModel();
 $userGroups = $userGroupManager->getNameListByUser(
     $studentId,
-    UserGroup::NORMAL_CLASS
+    Usergroup::NORMAL_CLASS
 );
 
 //$userInfo['complete_name_link'] = $userInfo['complete_name_with_message_link'];
@@ -900,10 +901,11 @@ if (!empty($courseCode)) {
 
 // Display timezone if the user selected one and if the admin allows the use of user's timezone
 $timezone = null;
-$timezone_user = UserManager::get_extra_user_data_by_field($studentId, 'timezone');
+$timezone_user = $user->getTimezone();
 $use_users_timezone = api_get_setting('use_users_timezone', 'timezones');
-if (null != $timezone_user['timezone'] && 'true' === $use_users_timezone) {
+
-    $timezone = $timezone_user['timezone'];
+if (null != $timezone_user && 'true' === $use_users_timezone) {
+    $timezone = $timezone_user;
 }
 if (null !== $timezone) {
     $userInfoExtra['timezone'] = $timezone;

public/main/template/default/social/skills_block.html.twig

@@ -10,16 +10,16 @@ $(function () {
         {% if skills %}
             {{ skills }}
         {% else %}
-            <p>{{ 'WithoutAchievedSkills'|get_lang }}</p>
+            <p>{{ 'Without achieved skills'|trans }}</p>
             <p>
                 <a href="{{ url('index') ~ 'main/social/skills_wheel.php' }}">
-                    {{ 'SkillsWheel'|get_lang }}
+                    {{ 'Skills wheel'|trans }}
                 </a>
             </p>
         {% endif %}
     {% endset %}
 
-    {{ macro.panel("Skills" | get_lang, data) }}
+    {{ macro.panel("Skills" | trans, data) }}
 
 {#<div class="panel-group" id="skill-block" role="tablist" aria-multiselectable="true">#}
     {#<div class="panel panel-default">#}

src/CoreBundle/Entity/SessionRelCourse.php

@@ -10,7 +10,6 @@ use ApiPlatform\Core\Annotation\ApiResource;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use Symfony\Component\Serializer\Annotation\Groups;
-use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * Course subscriptions to a session.