Minor - format code, fix PHP error

public/main/admin/course_edit.php

@@ -17,18 +17,17 @@ $courseCategoriesRepo = Container::getCourseCategoryRepository();
 
 $urlId = api_get_current_access_url_id();
 
-$courseId = isset($_GET['id']) ? $_GET['id'] : null;
+$courseId = $_GET['id'] ?? null;
 
 if (empty($courseId)) {
     api_not_allowed(true);
 }
 
 $courseInfo = api_get_course_info_by_id($courseId);
-$courseCode = $courseInfo['code'];
-
 if (empty($courseInfo)) {
     api_not_allowed(true);
 }
+$courseCode = $courseInfo['code'];
 
 $tool_name = get_lang('Edit course information');
 $interbreadcrumb[] = ['url' => 'index.php', 'name' => get_lang('Administration')];

public/main/inc/lib/TicketManager.php

@@ -2076,11 +2076,11 @@ class TicketManager
     /**
      * @return array
      */
-    public static function getStatusSimple()
+    /*public static function getStatusSimple()
     {
         $projects = Database::getManager()->getRepository(TicketStatus::class)->findAll();
         $list = [];
-        /** @var TicketProject $row */
+        // @var TicketProject $row
         foreach ($projects as $row) {
             $list[] = [
                 'id' => $row->getId(),
@@ -2091,7 +2091,7 @@ class TicketManager
         }
 
         return $list;
-    }
+    }*/
 
     /**
      * @return int

public/main/inc/lib/usermanager.lib.php

@@ -284,7 +284,7 @@ class UserManager
             ->setTimezone(api_get_timezone())
         ;
 
-        if (!empty($expirationDate)) {
+        if (null !== $expirationDate) {
             $user->setExpirationDate($expirationDate);
         }
 

src/CoreBundle/Resources/views/Account/edit.html.twig

@@ -3,12 +3,12 @@
 {% block content %}
     {% autoescape false %}
         <h3>{{ user.userIdentifier }}</h3>
-        <a href="{{ url('app_forgot_password_request') }}" class="btn btn-primary">
+{#        <a href="{{ url('app_forgot_password_request') }}" class="btn btn-primary">#}
-            Reset password
+{#            Reset password#}
-        </a>
+{#        </a>#}
 
         <img class="inline-block h-16 w-16 rounded-full ring-2 ring-white"
-             src="{{ user | illustration }}?w=80&h=80&fit=crop"
+             src="{{ user | illustration }}?w=120&h=120&fit=crop"
              alt=""
         />
 

src/CourseBundle/Entity/CDocument.php

@@ -80,12 +80,15 @@ use Symfony\Component\Validator\Constraints as Assert;
  *                                                 "visibility"={
  *                                                     "type"="integer",
  *                                                 },
- *                                                 "c_id"={
+ *                                                 "cid"={
  *                                                     "type"="integer",
  *                                                 },
- *                                                 "session_id"={
+ *                                                 "gid"={
  *                                                     "type"="integer",
  *                                                 },
+ *                                                 "sid"={
+ *                                                     "type"="integer",
+ *                                                 }
  *                                             }
  *                                         }
  *                                     },