Minor - flint fixes, format code, fix phpdoc

main/inc/lib/extra_field_value.lib.php

@@ -565,7 +565,7 @@ class ExtraFieldValue extends Model
      */
     public function get_values_by_handler_and_field_id($item_id, $field_id, $transform = false)
     {
-        $field_id = intval($field_id);
+        $field_id = (int) $field_id;
         $item_id = Database::escape_string($item_id);
 
         $sql = "SELECT s.*, field_type FROM {$this->table} s
@@ -647,8 +647,8 @@ class ExtraFieldValue extends Model
      */
     public function searchValuesByField($tag, $field_id, $limit = 10)
     {
-        $field_id = intval($field_id);
-        $limit = intval($limit);
+        $field_id = (int) $field_id;
+        $limit = (int) $limit;
         $extraFieldType = $this->getExtraField()->getExtraFieldType();
 
         $tag = Database::escape_string($tag);
@@ -692,7 +692,7 @@ class ExtraFieldValue extends Model
         $filterByVisibility = false,
         $visibility = 0
     ) {
-        $item_id = intval($item_id);
+        $item_id = (int) $item_id;
         $field_variable = Database::escape_string($field_variable);
         $extraFieldType = $this->getExtraField()->getExtraFieldType();
 
@@ -706,10 +706,10 @@ class ExtraFieldValue extends Model
                     sf.extra_field_type = $extraFieldType
                 ";
         if ($filterByVisibility) {
-            $visibility = intval($visibility);
+            $visibility = (int) $visibility;
             $sql .= " AND visible_to_self = $visibility ";
         }
-        $sql .= " ORDER BY id";
+        $sql .= ' ORDER BY id';
 
         $result = Database::query($sql);
         if (Database::num_rows($result)) {
@@ -826,7 +826,7 @@ class ExtraFieldValue extends Model
      */
     public function getValuesByFieldId($fieldId)
     {
-        $fieldId = intval($fieldId);
+        $fieldId = (int) $fieldId;
         $extraFieldType = $this->getExtraField()->getExtraFieldType();
 
         $sql = "SELECT s.* FROM {$this->table} s
@@ -853,8 +853,8 @@ class ExtraFieldValue extends Model
      */
     public function getAllValuesByItemAndField($itemId, $fieldId)
     {
-        $fieldId = intval($fieldId);
-        $itemId = intval($itemId);
+        $fieldId = (int) $fieldId;
+        $itemId = (int) $itemId;
         $extraFieldType = $this->getExtraField()->getExtraFieldType();
 
         $sql = "SELECT s.* FROM {$this->table} s
@@ -881,7 +881,7 @@ class ExtraFieldValue extends Model
      */
     public function getAllValuesByItem($itemId)
     {
-        $itemId = intval($itemId);
+        $itemId = (int) $itemId;
         $extraFieldType = $this->getExtraField()->getExtraFieldType();
 
         $sql = "SELECT s.value, sf.variable, sf.field_type, sf.id 
@@ -911,8 +911,8 @@ class ExtraFieldValue extends Model
      */
     public function getAllValuesByItemAndFieldAndValue($itemId, $fieldId, $fieldValue)
     {
-        $fieldId = intval($fieldId);
-        $itemId = intval($itemId);
+        $fieldId = (int) $fieldId;
+        $itemId = (int) $itemId;
         $extraFieldType = $this->getExtraField()->getExtraFieldType();
 
         $fieldValue = Database::escape_string($fieldValue);
@@ -943,7 +943,7 @@ class ExtraFieldValue extends Model
      */
     public function delete_all_values_by_field_id($field_id)
     {
-        $field_id = intval($field_id);
+        $field_id = (int) $field_id;
         $sql = "DELETE FROM {$this->table}
                 WHERE
                     field_id = $field_id ";
@@ -959,8 +959,8 @@ class ExtraFieldValue extends Model
      */
     public function delete_values_by_handler_and_field_id($item_id, $field_id)
     {
-        $field_id = intval($field_id);
-        $item_id = intval($item_id);
+        $field_id = (int) $field_id;
+        $item_id = (int) $item_id;
         $extraFieldType = $this->getExtraField()->getExtraFieldType();
 
         $sql = "DELETE FROM {$this->table}
@@ -979,7 +979,7 @@ class ExtraFieldValue extends Model
      */
     public function deleteValuesByItem($itemId)
     {
-        $itemId = intval($itemId);
+        $itemId = (int) $itemId;
         $extraFieldType = $this->getExtraField()->getExtraFieldType();
 
         $sql = "DELETE FROM {$this->table}
@@ -1002,8 +1002,8 @@ class ExtraFieldValue extends Model
      */
     public function deleteValuesByHandlerAndFieldAndValue($itemId, $fieldId, $fieldValue)
     {
-        $itemId = intval($itemId);
-        $fieldId = intval($fieldId);
+        $itemId = (int) $itemId;
+        $fieldId = (int) $fieldId;
 
         $fieldData = $this->getExtraField()->get($fieldId);
         if ($fieldData) {

main/inc/lib/tracking.lib.php

@@ -4629,7 +4629,7 @@ class Tracking
      * @param bool   $showAllSessions
      * @param bool   $returnArray
      *
-     * @return string
+     * @return string|array
      */
     public static function show_user_progress(
         $user_id,

plugin/lp_calendar/LpCalendarPlugin.php

@@ -153,7 +153,7 @@ class LpCalendarPlugin extends Plugin
      * @param int    $column
      * @param string $direction
      *
-     * @return array|\Doctrine\DBAL\Driver\Statement
+     * @return array
      */
     public static function getCalendars(
         $from,
@@ -344,6 +344,10 @@ class LpCalendarPlugin extends Plugin
         $extraField = new ExtraFieldValue('lp_item');
         $values = $extraField->get_values_by_handler_and_field_variable($id, 'calendar');
 
+        if (empty($values)) {
+            return [];
+        }
+
         return $values;
     }
 
@@ -522,6 +526,7 @@ class LpCalendarPlugin extends Plugin
         $list = [];
         $typeList = self::getEventTypeList();
         foreach ($events as $row) {
+            $event = [];
             $event['id'] = 'personal_'.$row['id'];
             $event['title'] = $calendarInfo['title'];
             $event['className'] = 'personal';

plugin/lp_calendar/start.php

@@ -76,7 +76,7 @@ switch ($action) {
         $item['title'] = $item['title'].' - '.get_lang('Copy');
 
         $newCalendarId = Database::insert('learning_calendar', $item);
-        if ($newCalendarId) {
+        if (!empty($newCalendarId)) {
             Display::addFlash(Display::return_message(get_lang('Saved')));
             $sql = "SELECT * FROM learning_calendar_events WHERE calendar_id = $calendarId";
             $result = Database::query($sql);
@@ -110,8 +110,8 @@ switch ($action) {
 
         break;
     case 'toggle_visibility':
-        $itemId = isset($_REQUEST['lp_item_id']) ? $_REQUEST['lp_item_id'] : '';
-        $lpId = isset($_REQUEST['lp_id']) ? $_REQUEST['lp_id'] : '';
+        $itemId = isset($_REQUEST['lp_item_id']) ? $_REQUEST['lp_item_id'] : 0;
+        $lpId = isset($_REQUEST['lp_id']) ? $_REQUEST['lp_id'] : 0;
         $plugin->toggleVisibility($itemId);
         Display::addFlash(Display::return_message(get_lang('Updated')));
         $url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?action=add_item&lp_id='.$lpId.'&'.api_get_cidreq();