From 7f55c8897fbd87e3baff7202589d2d59c17e7f07 Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Willms Date: Fri, 14 Mar 2025 07:49:25 +0000 Subject: execute sorm:describe for 6.0, re #3804 Merge request studip/studip!4044 --- cli/Commands/SORM/DescribeModels.php | 1 - .../visibility/User_Visibility_Settings.php | 18 +++---- lib/models/Abschluss.php | 6 +-- lib/models/AbschlussKategorie.php | 8 ++-- lib/models/ArchivedCourse.php | 2 +- lib/models/AuthUserMd5.php | 1 + lib/models/AuxLockRule.php | 2 +- lib/models/Banner.php | 2 +- lib/models/BlubberGlobalThread.php | 6 +-- lib/models/BlubberStatusgruppeThread.php | 6 +-- lib/models/BlubberThread.php | 6 +-- lib/models/Clipboard.php | 2 +- lib/models/ClipboardItem.php | 3 +- lib/models/ConsultationBlock.php | 4 +- lib/models/ConsultationBooking.php | 2 +- lib/models/ConsultationEvent.php | 2 +- lib/models/ConsultationSlot.php | 6 +-- lib/models/Contact.php | 9 ++-- lib/models/ContactGroup.php | 10 ++-- lib/models/ContactGroupItem.php | 9 ++-- lib/models/Course.php | 55 +++++++++++++--------- lib/models/CourseDate.php | 13 ++--- lib/models/CourseMember.php | 2 +- lib/models/CourseTopic.php | 4 +- lib/models/Courseware/Block.php | 10 ++-- lib/models/Courseware/Certificate.php | 1 + lib/models/Courseware/Container.php | 4 +- lib/models/Courseware/PeerReview.php | 14 ++++++ lib/models/Courseware/PeerReviewProcess.php | 14 ++++++ lib/models/Courseware/StructuralElement.php | 12 ++--- lib/models/Courseware/Task.php | 7 ++- lib/models/Courseware/TaskGroup.php | 9 ++-- lib/models/Courseware/Unit.php | 3 +- lib/models/CronjobSchedule.php | 2 +- lib/models/CronjobTask.php | 2 +- lib/models/DataField.php | 6 +-- lib/models/Degree.php | 2 +- lib/models/ExternPageConfig.php | 9 ++-- lib/models/Fach.php | 18 +++---- lib/models/FeedbackElement.php | 2 +- lib/models/File.php | 2 +- lib/models/Folder.php | 4 +- lib/models/Freetext.php | 2 +- lib/models/Grading/Definition.php | 2 +- lib/models/Grading/Instance.php | 1 + lib/models/HelpContent.php | 2 +- lib/models/HelpTour.php | 6 +-- lib/models/HelpTourStep.php | 2 +- lib/models/Institute.php | 23 ++++----- lib/models/InstituteMember.php | 2 +- lib/models/Keyring.php | 16 +++---- lib/models/LikertScale.php | 2 +- lib/models/LogAction.php | 2 +- lib/models/LoginFaq.php | 5 ++ lib/models/LtiDeployment.php | 2 +- lib/models/LtiGrade.php | 2 +- lib/models/LtiTool.php | 21 +++++---- lib/models/LtiToolPrivacySettings.php | 15 +++--- lib/models/Lvgruppe.php | 14 +++--- lib/models/MassMail/MassMailFilter.php | 9 ++++ lib/models/MassMail/MassMailMarker.php | 17 +++++++ lib/models/MassMail/MassMailMessage.php | 27 +++++++++++ lib/models/MassMail/MassMailPermission.php | 15 ++++++ lib/models/MassMail/MassMailToken.php | 12 +++++ lib/models/Message.php | 2 +- lib/models/Modul.php | 18 +++---- lib/models/ModulDeskriptor.php | 2 +- lib/models/Modulteil.php | 12 ++--- lib/models/ModulteilDeskriptor.php | 2 +- lib/models/MvvContact.php | 2 +- lib/models/MvvCourse.php | 1 + lib/models/MvvFile.php | 4 +- lib/models/MvvOverlappingSelection.php | 4 +- lib/models/OERMaterial.php | 4 +- lib/models/OERReview.php | 6 +-- lib/models/Questionnaire.php | 6 +-- lib/models/QuestionnaireAutomatedData.php | 15 ++++++ lib/models/QuestionnaireInfo.php | 2 +- lib/models/QuestionnaireQuestion.php | 2 +- lib/models/RangeScale.php | 2 +- lib/models/RangeTreeNode.php | 2 +- lib/models/Semester.php | 4 +- lib/models/SeminarCycleDate.php | 6 +-- lib/models/StatusgruppeUser.php | 2 +- lib/models/Statusgruppen.php | 10 ++-- lib/models/StgteilAbschnitt.php | 8 ++-- lib/models/StgteilBezeichnung.php | 4 +- lib/models/StgteilVersion.php | 8 ++-- lib/models/Studiengang.php | 22 ++++----- lib/models/StudiengangTeil.php | 9 ++-- lib/models/StudipNews.php | 8 ++-- lib/models/StudipStudyArea.php | 4 +- lib/models/StudyCourse.php | 2 +- lib/models/StudygroupCourse.php | 9 ++-- lib/models/StudygroupCourseProposal.php | 10 ++-- lib/models/StudygroupInvitation.php | 12 ++--- lib/models/StudygroupStgteil.php | 7 ++- lib/models/TFASecret.php | 2 +- lib/models/Tag.php | 10 ++-- lib/models/TagRelation.php | 10 ++-- lib/models/User.php | 47 +++++++++--------- lib/models/UserDomain.php | 4 +- lib/models/Vote.php | 2 +- lib/models/WikiOnlineEditingUser.php | 19 ++++---- lib/models/WikiPage.php | 21 ++++----- lib/models/WikiVersion.php | 15 +++--- lib/models/calendar/CalendarCourseDate.php | 24 ++++++++++ lib/models/calendar/CalendarCourseExDate.php | 22 +++++++++ lib/models/calendar/CalendarDate.php | 54 ++++++++++----------- lib/models/calendar/CalendarDateAssignment.php | 23 ++++----- lib/models/calendar/CalendarDateException.php | 10 ++-- lib/models/calendar/ScheduleCourseDate.php | 10 ++-- lib/models/calendar/ScheduleEntry.php | 17 +++---- lib/models/eTask/Assignment.php | 8 ++-- lib/models/eTask/Attempt.php | 3 +- lib/models/eTask/Response.php | 3 ++ lib/models/eTask/Task.php | 6 +-- lib/models/eTask/Test.php | 8 ++-- lib/models/eTask/TestTask.php | 1 + lib/models/resources/BrokenResource.php | 11 +++-- lib/models/resources/Building.php | 11 +++-- lib/models/resources/Location.php | 11 +++-- lib/models/resources/Resource.php | 11 +++-- lib/models/resources/ResourceBooking.php | 2 +- lib/models/resources/ResourceCategory.php | 4 +- lib/models/resources/ResourceLabel.php | 11 +++-- .../resources/ResourcePropertyDefinition.php | 1 + lib/models/resources/ResourcePropertyGroup.php | 2 +- lib/models/resources/ResourceRequest.php | 4 +- lib/models/resources/Room.php | 11 +++-- lib/models/resources/RoomRequest.php | 4 +- lib/models/resources/SeparableRoom.php | 2 +- lib/models/vips/ClozeTask.php | 6 +-- lib/models/vips/DummyExercise.php | 6 +-- lib/models/vips/MatchingTask.php | 6 +-- lib/models/vips/MatrixChoiceTask.php | 6 +-- lib/models/vips/MultipleChoiceTask.php | 6 +-- lib/models/vips/SequenceTask.php | 6 +-- lib/models/vips/SingleChoiceTask.php | 6 +-- lib/models/vips/TextLineTask.php | 6 +-- lib/models/vips/TextTask.php | 6 +-- lib/models/vips/VipsAssignment.php | 4 +- lib/models/vips/VipsBlock.php | 2 +- lib/models/vips/VipsGroup.php | 4 +- lib/models/vips/VipsTest.php | 6 +-- 145 files changed, 698 insertions(+), 486 deletions(-) diff --git a/cli/Commands/SORM/DescribeModels.php b/cli/Commands/SORM/DescribeModels.php index 43ce21f..d23b521 100644 --- a/cli/Commands/SORM/DescribeModels.php +++ b/cli/Commands/SORM/DescribeModels.php @@ -118,7 +118,6 @@ final class DescribeModels extends AbstractCommand continue; } - $model = $this->reflection->newInstance(); // Get current properties diff --git a/lib/classes/visibility/User_Visibility_Settings.php b/lib/classes/visibility/User_Visibility_Settings.php index 975d55f..6169b16 100644 --- a/lib/classes/visibility/User_Visibility_Settings.php +++ b/lib/classes/visibility/User_Visibility_Settings.php @@ -13,14 +13,16 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GPL version 2 * @category Stud.IP * - * @property int $id - * @property int $visibility_id - * @property int $parent_id - * @property string $category - * @property string $name - * @property int|null $state - * @property int|null $plugin - * @property string $identifier + * @property int $id alias column for visibilityid + * @property string $user_id database column + * @property int $visibilityid database column + * @property int $parent_id + * @property string $category + * @property string $name + * @property int|null $state + * @property int|null $plugin + * @property string $identifier + * @property User $user belongs_to User */ class User_Visibility_Settings extends SimpleORMap { diff --git a/lib/models/Abschluss.php b/lib/models/Abschluss.php index 9f68820..cc73f05 100644 --- a/lib/models/Abschluss.php +++ b/lib/models/Abschluss.php @@ -22,11 +22,11 @@ * @property string $editor_id database column * @property int|null $mkdate database column * @property int|null $chdate database column - * @property SimpleORMapCollection|Fach[] $faecher has_many Fach - * @property SimpleORMapCollection|Studiengang[] $studiengaenge has_many Studiengang + * @property SimpleORMapCollection $faecher has_many Fach + * @property SimpleORMapCollection $studiengaenge has_many Studiengang * @property AbschlussKategorie $category belongs_to AbschlussKategorie * @property AbschlussZuord $category_assignment has_one AbschlussZuord - * @property SimpleORMapCollection|Fach[] $professions has_and_belongs_to_many Fach + * @property SimpleORMapCollection $professions has_and_belongs_to_many Fach * @property-read mixed $count_faecher additional field * @property-read mixed $kategorie_name additional field * @property-read mixed $kategorie_id additional field diff --git a/lib/models/AbschlussKategorie.php b/lib/models/AbschlussKategorie.php index f434062..36eb9aa 100644 --- a/lib/models/AbschlussKategorie.php +++ b/lib/models/AbschlussKategorie.php @@ -23,10 +23,10 @@ * @property string $editor_id database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|MvvFile[] $documents has_many MvvFile - * @property SimpleORMapCollection|MvvFile[] $document_assignments has_many MvvFile - * @property SimpleORMapCollection|AbschlussZuord[] $abschluss_assignments has_many AbschlussZuord - * @property SimpleORMapCollection|Abschluss[] $abschluesse has_and_belongs_to_many Abschluss + * @property SimpleORMapCollection $documents has_many MvvFile + * @property SimpleORMapCollection $document_assignments has_many MvvFile + * @property SimpleORMapCollection $abschluss_assignments has_many AbschlussZuord + * @property SimpleORMapCollection $abschluesse has_and_belongs_to_many Abschluss * @property-read mixed $count_abschluesse additional field * @property-read mixed $count_studiengaenge additional field * @property-read mixed $count_dokumente additional field diff --git a/lib/models/ArchivedCourse.php b/lib/models/ArchivedCourse.php index f3b2de8..a167d80 100644 --- a/lib/models/ArchivedCourse.php +++ b/lib/models/ArchivedCourse.php @@ -32,7 +32,7 @@ * @property string|null $wikidump database column * @property string $studienbereiche database column * @property string $veranstaltungsnummer database column - * @property SimpleORMapCollection|ArchivedCourseMember[] $members has_many ArchivedCourseMember + * @property SimpleORMapCollection $members has_many ArchivedCourseMember * @property Institute $home_institut belongs_to Institute */ diff --git a/lib/models/AuthUserMd5.php b/lib/models/AuthUserMd5.php index d8b7c53..85e12c4 100644 --- a/lib/models/AuthUserMd5.php +++ b/lib/models/AuthUserMd5.php @@ -27,6 +27,7 @@ * @property string|null $lock_comment database column * @property string|null $locked_by database column * @property string $visible database column + * @property string|null $matriculation_number database column */ class AuthUserMd5 extends SimpleORMap diff --git a/lib/models/AuxLockRule.php b/lib/models/AuxLockRule.php index f5ebfac..b4018fd 100644 --- a/lib/models/AuxLockRule.php +++ b/lib/models/AuxLockRule.php @@ -22,7 +22,7 @@ * @property JSONArrayObject $sorting database column * @property int|null $mkdate database column * @property int|null $chdate database column - * @property SimpleORMapCollection|Course[] $courses has_many Course + * @property SimpleORMapCollection $courses has_many Course * @property mixed $datafields additional field */ class AuxLockRule extends SimpleORMap diff --git a/lib/models/Banner.php b/lib/models/Banner.php index a418760..3a67022 100644 --- a/lib/models/Banner.php +++ b/lib/models/Banner.php @@ -28,7 +28,7 @@ * @property int $clicks database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|BannerRoles[] $banner_roles has_many BannerRoles + * @property SimpleORMapCollection $banner_roles has_many BannerRoles */ class Banner extends SimpleORMap diff --git a/lib/models/BlubberGlobalThread.php b/lib/models/BlubberGlobalThread.php index 3279b87..14630fe 100644 --- a/lib/models/BlubberGlobalThread.php +++ b/lib/models/BlubberGlobalThread.php @@ -16,9 +16,9 @@ * @property JSONArrayObject|null $metadata database column * @property int|null $chdate database column * @property int|null $mkdate database column - * @property SimpleORMapCollection|BlubberComment[] $comments has_many BlubberComment - * @property SimpleORMapCollection|BlubberMention[] $mentions has_many BlubberMention - * @property SimpleORMapCollection|ObjectUserVisit[] $visits has_many ObjectUserVisit + * @property SimpleORMapCollection $comments has_many BlubberComment + * @property SimpleORMapCollection $mentions has_many BlubberMention + * @property SimpleORMapCollection $visits has_many ObjectUserVisit * @property User $user belongs_to User */ class BlubberGlobalThread extends BlubberThread diff --git a/lib/models/BlubberStatusgruppeThread.php b/lib/models/BlubberStatusgruppeThread.php index 63e67a4..2686bd6 100644 --- a/lib/models/BlubberStatusgruppeThread.php +++ b/lib/models/BlubberStatusgruppeThread.php @@ -16,9 +16,9 @@ * @property JSONArrayObject|null $metadata database column * @property int|null $chdate database column * @property int|null $mkdate database column - * @property SimpleORMapCollection|BlubberComment[] $comments has_many BlubberComment - * @property SimpleORMapCollection|BlubberMention[] $mentions has_many BlubberMention - * @property SimpleORMapCollection|ObjectUserVisit[] $visits has_many ObjectUserVisit + * @property SimpleORMapCollection $comments has_many BlubberComment + * @property SimpleORMapCollection $mentions has_many BlubberMention + * @property SimpleORMapCollection $visits has_many ObjectUserVisit * @property Statusgruppen $statusgruppe belongs_to Statusgruppen * @property User $user belongs_to User */ diff --git a/lib/models/BlubberThread.php b/lib/models/BlubberThread.php index 17b3c95..c8362eb 100644 --- a/lib/models/BlubberThread.php +++ b/lib/models/BlubberThread.php @@ -26,9 +26,9 @@ * @property JSONArrayObject|null $metadata database column * @property int|null $chdate database column * @property int|null $mkdate database column - * @property SimpleORMapCollection|BlubberComment[] $comments has_many BlubberComment - * @property SimpleORMapCollection|BlubberMention[] $mentions has_many BlubberMention - * @property SimpleORMapCollection|ObjectUserVisit[] $visits has_many ObjectUserVisit + * @property SimpleORMapCollection $comments has_many BlubberComment + * @property SimpleORMapCollection $mentions has_many BlubberMention + * @property SimpleORMapCollection $visits has_many ObjectUserVisit * @property User $user belongs_to User */ diff --git a/lib/models/Clipboard.php b/lib/models/Clipboard.php index 01282cc..5451ad9 100644 --- a/lib/models/Clipboard.php +++ b/lib/models/Clipboard.php @@ -36,7 +36,7 @@ * @property string $allowed_item_class database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|ClipboardItem[] $items has_many ClipboardItem + * @property SimpleORMapCollection $items has_many ClipboardItem * @property User $user belongs_to User */ class Clipboard extends SimpleORMap diff --git a/lib/models/ClipboardItem.php b/lib/models/ClipboardItem.php index a19eeaf..9f51774 100644 --- a/lib/models/ClipboardItem.php +++ b/lib/models/ClipboardItem.php @@ -23,8 +23,7 @@ * @property int $mkdate database column * @property int $chdate database column * @property Clipboard $clipboard belongs_to Clipboard - * - * @property-read string $name + * @property-read string $name */ class ClipboardItem extends SimpleORMap { diff --git a/lib/models/ConsultationBlock.php b/lib/models/ConsultationBlock.php index 3e5de6e..fbc5de8 100644 --- a/lib/models/ConsultationBlock.php +++ b/lib/models/ConsultationBlock.php @@ -28,8 +28,8 @@ * @property bool $consecutive database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|ConsultationSlot[] $slots has_many ConsultationSlot - * @property SimpleORMapCollection|ConsultationResponsibility[] $responsibilities has_many ConsultationResponsibility + * @property SimpleORMapCollection $slots has_many ConsultationSlot + * @property SimpleORMapCollection $responsibilities has_many ConsultationResponsibility * @property mixed $range additional field * @property-read mixed $range_display additional field * @property-read mixed $has_bookings additional field diff --git a/lib/models/ConsultationBooking.php b/lib/models/ConsultationBooking.php index fb1e1e6..30ec21f 100644 --- a/lib/models/ConsultationBooking.php +++ b/lib/models/ConsultationBooking.php @@ -16,7 +16,7 @@ * @property int $chdate database column * @property ConsultationSlot $slot belongs_to ConsultationSlot * @property User $user belongs_to User - * @property CalendarDate $event has_one CalendarDate + * @property CalendarDate|null $event has_one CalendarDate */ class ConsultationBooking extends SimpleORMap implements PrivacyObject { diff --git a/lib/models/ConsultationEvent.php b/lib/models/ConsultationEvent.php index 4194f6a..c182443 100644 --- a/lib/models/ConsultationEvent.php +++ b/lib/models/ConsultationEvent.php @@ -10,7 +10,7 @@ * @property string $event_id database column * @property int $mkdate database column * @property ConsultationSlot $slot belongs_to ConsultationSlot - * @property CalendarDate $event belongs_to CalendarDate + * @property CalendarDate $event has_one CalendarDate */ class ConsultationEvent extends SimpleORMap { diff --git a/lib/models/ConsultationSlot.php b/lib/models/ConsultationSlot.php index e078914..c7aa78e 100644 --- a/lib/models/ConsultationSlot.php +++ b/lib/models/ConsultationSlot.php @@ -9,14 +9,14 @@ * @property int $id alias column for slot_id * @property int $slot_id database column * @property int $block_id database column - * @property int $previous_slot_id database column + * @property int|null $previous_slot_id database column * @property int $start_time database column * @property int $end_time database column * @property string $note database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|ConsultationBooking[] $bookings has_many ConsultationBooking - * @property SimpleORMapCollection|ConsultationEvent[] $events has_many ConsultationEvent + * @property SimpleORMapCollection $bookings has_many ConsultationBooking + * @property SimpleORMapCollection $events has_many ConsultationEvent * @property ConsultationBlock $block belongs_to ConsultationBlock * @property ConsultationSlot|null $previous_slot has_one ConsultationSlot * @property ConsultationSlot|null $next_slot has_one ConsultationSlot diff --git a/lib/models/Contact.php b/lib/models/Contact.php index bea5b95..ef59373 100644 --- a/lib/models/Contact.php +++ b/lib/models/Contact.php @@ -9,13 +9,14 @@ * @property array $id alias for pk * @property string $owner_id database column * @property string $user_id database column + * @property int $mkdate database column + * @property int $chdate database column * @property string $calendar_permissions database column - * An enum with the possible values "", "READ" and "WRITE". - * The empty string specifies that no calendar permissions are granted. +An enum with the possible values "", "READ" and "WRITE". +The empty string specifies that no calendar permissions are granted. + * @property SimpleORMapCollection $groups has_many ContactGroupItem * @property User $owner belongs_to User * @property User $friend belongs_to User - * @property string $mkdate database column - * @property string $chdate database column */ class Contact extends SimpleORMap { diff --git a/lib/models/ContactGroup.php b/lib/models/ContactGroup.php index 0e60d3b..2aae983 100644 --- a/lib/models/ContactGroup.php +++ b/lib/models/ContactGroup.php @@ -1,7 +1,7 @@ $items The items (users) that belong to the group. * @property User $owner The owner of the group. - * @property ContactGroupItem[]|SimpleORMapCollection $items The items (users) that belong to the group. */ class ContactGroup extends SimpleORMap { diff --git a/lib/models/ContactGroupItem.php b/lib/models/ContactGroupItem.php index 0204d0a..fd93aeb 100644 --- a/lib/models/ContactGroupItem.php +++ b/lib/models/ContactGroupItem.php @@ -1,7 +1,7 @@ $topics has_many CourseTopic + * @property SimpleORMapCollection $dates has_many CourseDate + * @property SimpleORMapCollection $ex_dates has_many CourseExDate + * @property SimpleORMapCollection $members has_many CourseMember + * @property SimpleORMapCollection $deputies has_many Deputy + * @property SimpleORMapCollection $statusgruppen has_many Statusgruppen + * @property SimpleORMapCollection $admission_applicants has_many AdmissionApplication + * @property SimpleORMapCollection $datafields has_many DatafieldEntryModel + * @property SimpleORMapCollection $cycles has_many SeminarCycleDate + * @property SimpleORMapCollection $scm_entries has_many StudipScmEntry + * @property SimpleORMapCollection $wiki_pages has_many WikiPage + * @property SimpleORMapCollection $news has_many StudipNews + * @property SimpleORMapCollection $blubberthreads has_many BlubberThread + * @property SimpleORMapCollection $consultation_blocks has_many ConsultationBlock + * @property SimpleORMapCollection $room_requests has_many RoomRequest + * @property SimpleORMapCollection $resource_bookings has_many ResourceBooking + * @property SimpleORMapCollection $children has_many Course + * @property SimpleORMapCollection $tools has_many ToolActivation + * @property SimpleORMapCollection $member_notifications has_many CourseMemberNotification + * @property SimpleORMapCollection $config_values has_many ConfigValue + * @property SimpleORMapCollection $courseware_units has_many Courseware\Unit + * @property SimpleORMapCollection $studygroup_proposals has_many StudygroupCourseProposal + * @property SimpleORMapCollection $course_proposals has_many StudygroupCourseProposal + * @property SimpleORMapCollection $studygroup_invitations has_many StudygroupInvitation * @property Institute $home_institut belongs_to Institute * @property AuxLockRule|null $aux belongs_to AuxLockRule * @property Course|null $parent belongs_to Course - * @property SimpleORMapCollection|Semester[] $semesters has_and_belongs_to_many Semester - * @property SimpleORMapCollection|StudipStudyArea[] $study_areas has_and_belongs_to_many StudipStudyArea - * @property SimpleORMapCollection|Institute[] $institutes has_and_belongs_to_many Institute - * @property SimpleORMapCollection|UserDomain[] $domains has_and_belongs_to_many UserDomain + * @property SimpleORMapCollection $semesters has_and_belongs_to_many Semester + * @property SimpleORMapCollection $study_areas has_and_belongs_to_many StudipStudyArea + * @property SimpleORMapCollection $institutes has_and_belongs_to_many Institute + * @property SimpleORMapCollection $domains has_and_belongs_to_many UserDomain + * @property SimpleORMapCollection $studygroups has_and_belongs_to_many Course + * @property SimpleORMapCollection $connectedcourses has_and_belongs_to_many Course + * @property SimpleORMapCollection $tags has_and_belongs_to_many Tag * @property-read mixed $teachers additional field * @property Semester $start_semester additional field - * @property Semester|null $end_semester additional field + * @property (Semester | null) $end_semester additional field * @property-read mixed $semester_text additional field * @property-read mixed $config additional field */ diff --git a/lib/models/CourseDate.php b/lib/models/CourseDate.php index 34c4450..2cf6d99 100644 --- a/lib/models/CourseDate.php +++ b/lib/models/CourseDate.php @@ -22,16 +22,17 @@ * @property int $date_typ database column * @property string|null $raum database column * @property string|null $metadate_id database column - * @property SimpleORMapCollection|Folder[] $folders has_many Folder - * @property SimpleORMapCollection|RoomRequest[] $room_requests has_many RoomRequest - * @property SimpleORMapCollection|ResourceRequestAppointment[] $resource_request_appointments has_many ResourceRequestAppointment + * @property int|null $number_of_participants database column + * @property SimpleORMapCollection $folders has_many Folder + * @property SimpleORMapCollection $room_requests has_many RoomRequest + * @property SimpleORMapCollection $resource_request_appointments has_many ResourceRequestAppointment * @property User $author belongs_to User * @property Course $course belongs_to Course * @property SeminarCycleDate|null $cycle belongs_to SeminarCycleDate * @property ResourceBooking $room_booking has_one ResourceBooking - * @property SimpleORMapCollection|CourseTopic[] $topics has_and_belongs_to_many CourseTopic - * @property SimpleORMapCollection|Statusgruppen[] $statusgruppen has_and_belongs_to_many Statusgruppen - * @property SimpleORMapCollection|User[] $dozenten has_and_belongs_to_many User + * @property SimpleORMapCollection $topics has_and_belongs_to_many CourseTopic + * @property SimpleORMapCollection $statusgruppen has_and_belongs_to_many Statusgruppen + * @property SimpleORMapCollection $dozenten has_and_belongs_to_many User */ class CourseDate extends SimpleORMap implements PrivacyObject, Event diff --git a/lib/models/CourseMember.php b/lib/models/CourseMember.php index eb3b6ba..affbd05 100644 --- a/lib/models/CourseMember.php +++ b/lib/models/CourseMember.php @@ -24,7 +24,7 @@ * @property string $visible database column * @property string $label database column * @property int $bind_calendar database column - * @property SimpleORMapCollection|DatafieldEntryModel[] $datafields has_many DatafieldEntryModel + * @property SimpleORMapCollection $datafields has_many DatafieldEntryModel * @property User $user belongs_to User * @property Course $course belongs_to Course * @property mixed $vorname additional field diff --git a/lib/models/CourseTopic.php b/lib/models/CourseTopic.php index 0a0d75d..72d2167 100644 --- a/lib/models/CourseTopic.php +++ b/lib/models/CourseTopic.php @@ -20,10 +20,10 @@ * @property int $paper_related database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|Folder[] $folders has_many Folder + * @property SimpleORMapCollection $folders has_many Folder * @property Course $course belongs_to Course * @property User $author belongs_to User - * @property SimpleORMapCollection|CourseDate[] $dates has_and_belongs_to_many CourseDate + * @property SimpleORMapCollection $dates has_and_belongs_to_many CourseDate * @property-read mixed $forum_thread_url additional field */ class CourseTopic extends SimpleORMap diff --git a/lib/models/Courseware/Block.php b/lib/models/Courseware/Block.php index a3d7f09..925e7e2 100644 --- a/lib/models/Courseware/Block.php +++ b/lib/models/Courseware/Block.php @@ -26,15 +26,15 @@ use User; * @property string $payload database column * @property int $mkdate database column * @property int $chdate database column - * @property \SimpleORMapCollection|UserDataField[] $data_fields has_many UserDataField - * @property \SimpleORMapCollection|BlockComment[] $comments has_many BlockComment - * @property \SimpleORMapCollection|BlockFeedback[] $block_feedback has_many BlockFeedback - * @property \SimpleORMapCollection|UserProgress[] $progresses has_many UserProgress + * @property \SimpleORMapCollection $data_fields has_many UserDataField + * @property \SimpleORMapCollection $comments has_many BlockComment + * @property \SimpleORMapCollection $block_feedback has_many BlockFeedback + * @property \SimpleORMapCollection $progresses has_many UserProgress * @property \User $owner belongs_to \User * @property \User $editor belongs_to \User * @property \User|null $edit_blocker belongs_to \User * @property Container $container belongs_to Container - * @property mixed $type additional field + * @property-read mixed $type additional field * @property-read mixed $files additional field */ class Block extends \SimpleORMap implements \PrivacyObject diff --git a/lib/models/Courseware/Certificate.php b/lib/models/Courseware/Certificate.php index 2948a9c..a0cdc44 100644 --- a/lib/models/Courseware/Certificate.php +++ b/lib/models/Courseware/Certificate.php @@ -16,6 +16,7 @@ use \User, \Course, \CoursewarePDFCertificate; * @property string $user_id database column * @property string $course_id database column * @property int $unit_id database column + * @property string|null $fileref_id database column * @property int $mkdate database column * @property \User $user belongs_to \User * @property \Course $course belongs_to \Course diff --git a/lib/models/Courseware/Container.php b/lib/models/Courseware/Container.php index 5e4a49a..f2f9470 100644 --- a/lib/models/Courseware/Container.php +++ b/lib/models/Courseware/Container.php @@ -27,12 +27,12 @@ use User; * @property \JSONArrayObject $payload database column * @property int $mkdate database column * @property int $chdate database column - * @property \SimpleORMapCollection|Block[] $blocks has_many Block + * @property \SimpleORMapCollection $blocks has_many Block * @property \User $owner belongs_to \User * @property \User $editor belongs_to \User * @property \User|null $edit_blocker belongs_to \User * @property StructuralElement $structural_element belongs_to StructuralElement - * @property mixed $type additional field + * @property-read mixed $type additional field */ class Container extends \SimpleORMap implements \PrivacyObject { diff --git a/lib/models/Courseware/PeerReview.php b/lib/models/Courseware/PeerReview.php index 0a62527..e522301 100644 --- a/lib/models/Courseware/PeerReview.php +++ b/lib/models/Courseware/PeerReview.php @@ -12,6 +12,20 @@ use User; * @since Stud.IP 6.0 * * @SuppressWarnings(PHPMD.StaticAccess) + * + * @property int $id database column + * @property int $process_id database column + * @property int $task_id database column + * @property string $submitter_id database column + * @property string $reviewer_id database column + * @property string|null $reviewer_type database column + * @property \JSONArrayObject|null $assessment database column + * @property int $mkdate database column + * @property int $chdate database column + * @property PeerReviewProcess $process belongs_to PeerReviewProcess + * @property Task $task belongs_to Task + * @property \User $submitter belongs_to \User + * @property \User $reviewer belongs_to \User */ class PeerReview extends \SimpleORMap { diff --git a/lib/models/Courseware/PeerReviewProcess.php b/lib/models/Courseware/PeerReviewProcess.php index ae92698..840cd68 100644 --- a/lib/models/Courseware/PeerReviewProcess.php +++ b/lib/models/Courseware/PeerReviewProcess.php @@ -13,6 +13,20 @@ use User; * @SuppressWarnings(PHPMD.StaticAccess) * * @since Stud.IP 6.0 + * + * @property int $id database column + * @property int $task_group_id database column + * @property string $owner_id database column + * @property \JSONArrayObject $configuration database column + * @property int $review_start database column + * @property int $review_end database column + * @property int|null $paired_at database column + * @property int $mkdate database column + * @property int $chdate database column + * @property \SimpleORMapCollection $_peer_reviews has_many PeerReview + * @property TaskGroup $task_group belongs_to TaskGroup + * @property \User $owner belongs_to \User + * @property mixed $peer_reviews additional field */ class PeerReviewProcess extends \SimpleORMap { diff --git a/lib/models/Courseware/StructuralElement.php b/lib/models/Courseware/StructuralElement.php index 3f7c569..9262123 100644 --- a/lib/models/Courseware/StructuralElement.php +++ b/lib/models/Courseware/StructuralElement.php @@ -35,8 +35,8 @@ use User; * @property string $permission_type database column * @property string $visible database column * @property bool $visible_all database column - * @property int $visible_start_date database column - * @property int $visible_end_date database column + * @property int|null $visible_start_date database column + * @property int|null $visible_end_date database column * @property string $writable database column * @property bool $writable_all database column * @property int|null $writable_start_date database column @@ -48,10 +48,10 @@ use User; * @property \JSONArrayObject $external_relations database column * @property int $mkdate database column * @property int $chdate database column - * @property \SimpleORMapCollection|StructuralElement[] $children has_many StructuralElement - * @property \SimpleORMapCollection|Container[] $containers has_many Container - * @property \SimpleORMapCollection|StructuralElementComment[] $comments has_many StructuralElementComment - * @property \SimpleORMapCollection|StructuralElementFeedback[] $feedback has_many StructuralElementFeedback + * @property \SimpleORMapCollection $children has_many StructuralElement + * @property \SimpleORMapCollection $containers has_many Container + * @property \SimpleORMapCollection $comments has_many StructuralElementComment + * @property \SimpleORMapCollection $feedback has_many StructuralElementFeedback * @property StructuralElement|null $parent belongs_to StructuralElement * @property \User $user belongs_to \User * @property \Course $course belongs_to \Course diff --git a/lib/models/Courseware/Task.php b/lib/models/Courseware/Task.php index 5f38ce9..12a2d25 100644 --- a/lib/models/Courseware/Task.php +++ b/lib/models/Courseware/Task.php @@ -18,7 +18,6 @@ use User; * @property int $structural_element_id database column * @property string $solver_id database column * @property string|null $solver_type database column - * @property int $submission_date database column * @property int $submitted database column * @property string|null $renewal database column * @property int $renewal_date database column @@ -26,6 +25,7 @@ use User; * @property int|null $feedback_id database column * @property int $mkdate database column * @property int $chdate database column + * @property \SimpleORMapCollection $peer_reviews has_many PeerReview * @property TaskGroup $task_group belongs_to TaskGroup * @property StructuralElement $structural_element belongs_to StructuralElement * @property \User $lecturer belongs_to \User @@ -33,9 +33,8 @@ use User; * @property \Statusgruppen $group belongs_to \Statusgruppen * @property \Course $course belongs_to \Course * @property TaskFeedback|null $task_feedback belongs_to TaskFeedback - * @property-read \User|\Statusgruppen|null $solver additional field - * - * @SuppressWarnings(PHPMD.StaticAccess) + * @property-read (\User | \Statusgruppen | null) $solver additional field + * @property-read int $submission_date additional field */ class Task extends \SimpleORMap { diff --git a/lib/models/Courseware/TaskGroup.php b/lib/models/Courseware/TaskGroup.php index 626e7cc..e549edb 100644 --- a/lib/models/Courseware/TaskGroup.php +++ b/lib/models/Courseware/TaskGroup.php @@ -25,14 +25,11 @@ use User; * @property int $end_date database column * @property int $mkdate database column * @property int $chdate database column - * @property \SimpleORMapCollection|Task[] $tasks has_many Task + * @property \SimpleORMapCollection $tasks has_many Task + * @property \SimpleORMapCollection $peer_review_processes has_many PeerReviewProcess * @property \User $lecturer belongs_to \User * @property \Course $course belongs_to \Course - * @property \Courseware\StructuralElement $target belongs_to Courseware\StructuralElement - * @property \SimpleORMapCollection $tasks has_many Courseware\Task - * @property \SimpleORMapCollection $peer_review_processes has_many Courseware\PeerReviewProcess - * - * @SuppressWarnings(PHPMD.StaticAccess) + * @property StructuralElement $target belongs_to StructuralElement */ class TaskGroup extends \SimpleORMap implements \PrivacyObject { diff --git a/lib/models/Courseware/Unit.php b/lib/models/Courseware/Unit.php index e05bae3..f5e05b9 100644 --- a/lib/models/Courseware/Unit.php +++ b/lib/models/Courseware/Unit.php @@ -18,6 +18,7 @@ use User; * @property string|null $range_type database column * @property int $structural_element_id database column * @property string $content_type database column + * @property int|null $position database column * @property int $public database column * @property string|null $creator_id database column * @property string $permission_scope database column @@ -30,8 +31,8 @@ use User; * @property bool $writable_all database column * @property int|null $writable_start_date database column * @property int|null $writable_end_date database column - * @property \JSONArrayObject $writable_approval database column * @property \JSONArrayObject $visible_approval database column + * @property \JSONArrayObject $writable_approval database column * @property \JSONArrayObject $config database column * @property int $mkdate database column * @property int $chdate database column diff --git a/lib/models/CronjobSchedule.php b/lib/models/CronjobSchedule.php index 08a18d3..34b2673 100644 --- a/lib/models/CronjobSchedule.php +++ b/lib/models/CronjobSchedule.php @@ -45,7 +45,7 @@ * @property int $execution_count database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|CronjobLog[] $logs has_many CronjobLog + * @property SimpleORMapCollection $logs has_many CronjobLog * @property CronjobTask $task belongs_to CronjobTask */ diff --git a/lib/models/CronjobTask.php b/lib/models/CronjobTask.php index 1304bc1..b829832 100644 --- a/lib/models/CronjobTask.php +++ b/lib/models/CronjobTask.php @@ -36,7 +36,7 @@ * @property int $assigned_count database column * @property int|null $mkdate database column * @property int|null $chdate database column - * @property SimpleORMapCollection|CronjobSchedule[] $schedules has_many CronjobSchedule + * @property SimpleORMapCollection $schedules has_many CronjobSchedule * @property-read mixed $description additional field * @property-read mixed $name additional field * @property-read mixed $parameters additional field diff --git a/lib/models/DataField.php b/lib/models/DataField.php index 1a83804..b66a817 100644 --- a/lib/models/DataField.php +++ b/lib/models/DataField.php @@ -31,9 +31,9 @@ * @property int $is_userfilter database column * @property string $description database column * @property int $system database column - * @property SimpleORMapCollection|DatafieldEntryModel[] $entries has_many DatafieldEntryModel - * @property SimpleORMapCollection|User_Visibility_Settings[] $visibility_settings has_many User_Visibility_Settings - * @property mixed $institution additional field + * @property SimpleORMapCollection $entries has_many DatafieldEntryModel + * @property SimpleORMapCollection $visibility_settings has_many User_Visibility_Settings + * @property-read mixed $institution additional field */ class DataField extends SimpleORMap implements PrivacyObject { diff --git a/lib/models/Degree.php b/lib/models/Degree.php index 9c908d3..07cb844 100644 --- a/lib/models/Degree.php +++ b/lib/models/Degree.php @@ -22,7 +22,7 @@ * @property string $editor_id database column * @property int|null $mkdate database column * @property int|null $chdate database column - * @property SimpleORMapCollection|StudyCourse[] $professions has_and_belongs_to_many StudyCourse + * @property SimpleORMapCollection $professions has_and_belongs_to_many StudyCourse * @property-read mixed $count_user additional field */ class Degree extends SimpleORMap diff --git a/lib/models/ExternPageConfig.php b/lib/models/ExternPageConfig.php index 5259d41..dc7a718 100644 --- a/lib/models/ExternPageConfig.php +++ b/lib/models/ExternPageConfig.php @@ -13,20 +13,21 @@ * @package extern * @since 5.4 * - * @property string $config_id database column * @property string $id alias column for config_id + * @property string $config_id database column * @property string $range_id database column * @property string $type database column * @property string $name database column * @property string $description database column - * @property string $conf database column + * @property JSONArrayObject $conf database column * @property string $template database column * @property string $author_id database column * @property string $editor_id database column * @property int $mkdate database column * @property int $chdate database column - * @property User $author has_one User - * @property User $editor has_one User + * @property User $author belongs_to User + * @property User $editor belongs_to User + * @property Institute $range belongs_to Institute */ class ExternPageConfig extends SimpleORMap diff --git a/lib/models/Fach.php b/lib/models/Fach.php index aff81be..8f03cf4 100644 --- a/lib/models/Fach.php +++ b/lib/models/Fach.php @@ -23,15 +23,15 @@ * @property string $editor_id database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|Abschluss[] $abschluesse has_many Abschluss - * @property SimpleORMapCollection|StudiengangTeil[] $studiengangteile has_many StudiengangTeil - * @property SimpleORMapCollection|FachFachbereich[] $department_assignments has_many FachFachbereich - * @property SimpleORMapCollection|Fachbereich[] $departments has_and_belongs_to_many Fachbereich - * @property SimpleORMapCollection|Abschluss[] $degrees has_and_belongs_to_many Abschluss - * @property mixed $count_abschluesse additional field - * @property mixed $count_user additional field - * @property mixed $count_sem additional field - * @property mixed $count_stgteile additional field + * @property SimpleORMapCollection $abschluesse has_many Abschluss + * @property SimpleORMapCollection $studiengangteile has_many StudiengangTeil + * @property SimpleORMapCollection $department_assignments has_many FachFachbereich + * @property SimpleORMapCollection $departments has_and_belongs_to_many Fachbereich + * @property SimpleORMapCollection $degrees has_and_belongs_to_many Abschluss + * @property-read mixed $count_abschluesse additional field + * @property-read mixed $count_user additional field + * @property-read mixed $count_sem additional field + * @property-read mixed $count_stgteile additional field * @property-read mixed $count_module additional field */ diff --git a/lib/models/FeedbackElement.php b/lib/models/FeedbackElement.php index 468f146..88f3ba7 100644 --- a/lib/models/FeedbackElement.php +++ b/lib/models/FeedbackElement.php @@ -21,7 +21,7 @@ * @property int $anonymous_entries database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|FeedbackEntry[] $entries has_many FeedbackEntry + * @property SimpleORMapCollection $entries has_many FeedbackEntry * @property Course $course belongs_to Course * @property User $user belongs_to User */ diff --git a/lib/models/File.php b/lib/models/File.php index 603a228..a76ac46 100644 --- a/lib/models/File.php +++ b/lib/models/File.php @@ -24,7 +24,7 @@ * @property int|null $is_accessible database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|FileRef[] $refs has_many FileRef + * @property SimpleORMapCollection $refs has_many FileRef * @property User $owner belongs_to User * @property mixed $extension additional field * @property mixed $path additional field diff --git a/lib/models/Folder.php b/lib/models/Folder.php index 111decf..7c83d71 100644 --- a/lib/models/Folder.php +++ b/lib/models/Folder.php @@ -24,8 +24,8 @@ * @property string $description database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|FileRef[] $file_refs has_many FileRef - * @property SimpleORMapCollection|Folder[] $subfolders has_many Folder + * @property SimpleORMapCollection $file_refs has_many FileRef + * @property SimpleORMapCollection $subfolders has_many Folder * @property User $owner belongs_to User * @property Folder $parentfolder belongs_to Folder * @property Course $course belongs_to Course diff --git a/lib/models/Freetext.php b/lib/models/Freetext.php index 3e59512..395836a 100644 --- a/lib/models/Freetext.php +++ b/lib/models/Freetext.php @@ -14,7 +14,7 @@ require_once 'lib/classes/QuestionType.php'; * @property int $position database column * @property int $chdate database column * @property int $mkdate database column - * @property SimpleORMapCollection|QuestionnaireAnswer[] $answers has_many QuestionnaireAnswer + * @property SimpleORMapCollection $answers has_many QuestionnaireAnswer * @property Questionnaire $questionnaire belongs_to Questionnaire */ class Freetext extends QuestionnaireQuestion implements QuestionType diff --git a/lib/models/Grading/Definition.php b/lib/models/Grading/Definition.php index 26c2bba..7fc2066 100644 --- a/lib/models/Grading/Definition.php +++ b/lib/models/Grading/Definition.php @@ -19,7 +19,7 @@ use OAT\Library\Lti1p3Ags\Model\LineItem\LineItemSubmissionReview; * @property float $weight database column * @property int $mkdate database column * @property int $chdate database column - * @property \SimpleORMapCollection|Instance[] $instances has_many Instance + * @property \SimpleORMapCollection $instances has_many Instance * @property \Course $course belongs_to \Course */ class Definition extends \SimpleORMap diff --git a/lib/models/Grading/Instance.php b/lib/models/Grading/Instance.php index 8d92801..e152544 100644 --- a/lib/models/Grading/Instance.php +++ b/lib/models/Grading/Instance.php @@ -12,6 +12,7 @@ use OAT\Library\Lti1p3Ags\Model\Result\Result; * @property string $user_id database column * @property float $rawgrade database column * @property string|null $feedback database column + * @property int $passed database column * @property int $mkdate database column * @property int $chdate database column * @property \User $user belongs_to \User diff --git a/lib/models/HelpContent.php b/lib/models/HelpContent.php index e9a6f47..80bd3db 100644 --- a/lib/models/HelpContent.php +++ b/lib/models/HelpContent.php @@ -41,7 +41,7 @@ * @property int $mkdate database column * @property int $chdate database column * @property string|null $comment database column - * @property User $author has_one User + * @property User|null $author has_one User */ class HelpContent extends SimpleORMap { diff --git a/lib/models/HelpTour.php b/lib/models/HelpTour.php index 978e203..e3704d7 100644 --- a/lib/models/HelpTour.php +++ b/lib/models/HelpTour.php @@ -43,10 +43,10 @@ require_once 'lib/object.inc.php'; * @property string $author_email database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|HelpTourStep[] $steps has_many HelpTourStep - * @property SimpleORMapCollection|HelpTourAudience[] $audiences has_many HelpTourAudience + * @property SimpleORMapCollection $steps has_many HelpTourStep + * @property SimpleORMapCollection $audiences has_many HelpTourAudience * @property HelpTourSettings $settings has_one HelpTourSettings - * @property User $author has_one User + * @property User|null $author has_one User */ class HelpTour extends SimpleORMap { diff --git a/lib/models/HelpTourStep.php b/lib/models/HelpTourStep.php index 3bd5ad8..dc6a8d0 100644 --- a/lib/models/HelpTourStep.php +++ b/lib/models/HelpTourStep.php @@ -45,7 +45,7 @@ * @property int $mkdate database column * @property int $chdate database column * @property HelpTour $help_tour belongs_to HelpTour - * @property User $author has_one User + * @property User|null $author has_one User */ class HelpTourStep extends SimpleORMap { diff --git a/lib/models/Institute.php b/lib/models/Institute.php index e87a408..fd6a155 100644 --- a/lib/models/Institute.php +++ b/lib/models/Institute.php @@ -29,18 +29,19 @@ * @property string|null $lit_plugin_name database column * @property int $srienabled database column * @property string $lock_rule database column - * @property SimpleORMapCollection|InstituteMember[] $members has_many InstituteMember - * @property SimpleORMapCollection|Course[] $home_courses has_many Course - * @property SimpleORMapCollection|Institute[] $sub_institutes has_many Institute - * @property SimpleORMapCollection|DatafieldEntryModel[] $datafields has_many DatafieldEntryModel - * @property SimpleORMapCollection|StudipScmEntry[] $scm has_many StudipScmEntry - * @property SimpleORMapCollection|Statusgruppen[] $status_groups has_many Statusgruppen - * @property SimpleORMapCollection|BlubberThread[] $blubberthreads has_many BlubberThread - * @property SimpleORMapCollection|ConsultationBlock[] $consultation_blocks has_many ConsultationBlock - * @property SimpleORMapCollection|ConsultationResponsibility[] $consultation_responsibilities has_many ConsultationResponsibility - * @property SimpleORMapCollection|ToolActivation[] $tools has_many ToolActivation + * @property SimpleORMapCollection $members has_many InstituteMember + * @property SimpleORMapCollection $home_courses has_many Course + * @property SimpleORMapCollection $sub_institutes has_many Institute + * @property SimpleORMapCollection $datafields has_many DatafieldEntryModel + * @property SimpleORMapCollection $scm has_many StudipScmEntry + * @property SimpleORMapCollection $status_groups has_many Statusgruppen + * @property SimpleORMapCollection $blubberthreads has_many BlubberThread + * @property SimpleORMapCollection $consultation_blocks has_many ConsultationBlock + * @property SimpleORMapCollection $consultation_responsibilities has_many ConsultationResponsibility + * @property SimpleORMapCollection $tools has_many ToolActivation + * @property SimpleORMapCollection $courses_of_study has_many Studiengang * @property Institute $faculty belongs_to Institute - * @property SimpleORMapCollection|Course[] $courses has_and_belongs_to_many Course + * @property SimpleORMapCollection $courses has_and_belongs_to_many Course * @property-read mixed $is_fak additional field * @property-read mixed $all_status_groups additional field */ diff --git a/lib/models/InstituteMember.php b/lib/models/InstituteMember.php index ec1c026..81427c1 100644 --- a/lib/models/InstituteMember.php +++ b/lib/models/InstituteMember.php @@ -26,7 +26,7 @@ * @property int $visible database column * @property int|null $mkdate database column * @property int|null $chdate database column - * @property SimpleORMapCollection|DatafieldEntryModel[] $datafields has_many DatafieldEntryModel + * @property SimpleORMapCollection $datafields has_many DatafieldEntryModel * @property User $user belongs_to User * @property Institute $institute belongs_to Institute * @property mixed $vorname additional field diff --git a/lib/models/Keyring.php b/lib/models/Keyring.php index b4cfffc..40f670f 100644 --- a/lib/models/Keyring.php +++ b/lib/models/Keyring.php @@ -15,14 +15,14 @@ /** * The Keyring class stores cryptographic keyrings in the database. * - * @property string id database column - * @property string range_id database column - * @property string range_type database column - * @property string public_key database column - * @property string private_key database column - * @property string passphrase database column - * @property string mkdate database column - * @property string chdate database column + * @property int $id database column + * @property string $range_id database column + * @property string $range_type database column + * @property string $public_key database column + * @property string $private_key database column + * @property string $passphrase database column + * @property int $mkdate database column + * @property int $chdate database column */ class Keyring extends SimpleORMap { diff --git a/lib/models/LikertScale.php b/lib/models/LikertScale.php index 4fde898..cc17c3d 100644 --- a/lib/models/LikertScale.php +++ b/lib/models/LikertScale.php @@ -11,7 +11,7 @@ * @property int $position database column * @property int $chdate database column * @property int $mkdate database column - * @property SimpleORMapCollection|QuestionnaireAnswer[] $answers has_many QuestionnaireAnswer + * @property SimpleORMapCollection $answers has_many QuestionnaireAnswer * @property Questionnaire $questionnaire belongs_to Questionnaire */ class LikertScale extends QuestionnaireQuestion implements QuestionType diff --git a/lib/models/LogAction.php b/lib/models/LogAction.php index 5ec4b7d..4c0fe32 100644 --- a/lib/models/LogAction.php +++ b/lib/models/LogAction.php @@ -26,7 +26,7 @@ * @property string|null $type database column * @property int|null $mkdate database column * @property int|null $chdate database column - * @property SimpleORMapCollection|LogEvent[] $events has_many LogEvent + * @property SimpleORMapCollection $events has_many LogEvent */ class LogAction extends SimpleORMap { diff --git a/lib/models/LoginFaq.php b/lib/models/LoginFaq.php index 4c049ac..bd93087 100644 --- a/lib/models/LoginFaq.php +++ b/lib/models/LoginFaq.php @@ -15,6 +15,11 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GPL version 2 * @category Stud.IP * @since 5.5 + * + * @property int $id alias column for faq_id + * @property int $faq_id database column + * @property I18NString $title database column + * @property I18NString $description database column */ class LoginFaq extends SimpleORMap { diff --git a/lib/models/LtiDeployment.php b/lib/models/LtiDeployment.php index 9860279..0b66427 100644 --- a/lib/models/LtiDeployment.php +++ b/lib/models/LtiDeployment.php @@ -21,7 +21,7 @@ * @property int $mkdate database column * @property int $chdate database column * @property JSONArrayObject|null $options database column - * @property SimpleORMapCollection|LtiGrade[] $grades has_many LtiGrade + * @property SimpleORMapCollection $grades has_many LtiGrade * @property Course $course belongs_to Course * @property LtiTool $tool belongs_to LtiTool */ diff --git a/lib/models/LtiGrade.php b/lib/models/LtiGrade.php index 7afe456..a7a5dbc 100644 --- a/lib/models/LtiGrade.php +++ b/lib/models/LtiGrade.php @@ -16,7 +16,7 @@ * @property float $score database column * @property int $mkdate database column * @property int $chdate database column - * @property LtiDeployment $link belongs_to LtiData + * @property LtiDeployment $link belongs_to LtiDeployment * @property User $user belongs_to User */ diff --git a/lib/models/LtiTool.php b/lib/models/LtiTool.php index 066df46..9839ac0 100644 --- a/lib/models/LtiTool.php +++ b/lib/models/LtiTool.php @@ -19,23 +19,24 @@ use OAT\Library\Lti1p3Core\Tool\Tool; * @property string $consumer_key database column * @property string $consumer_secret database column * @property string $custom_parameters database column + * @property int $allow_custom_url database column + * @property int $deep_linking database column + * @property int $send_lis_person database column + * @property int $mkdate database column + * @property int $chdate database column + * @property string $oauth_signature_method database column * @property string $lti_version database column + * @property string $range_id database column * @property string $oidc_init_url database column - * @property string $oauth2_client_id database column + * @property int|null $oauth2_client_id database column * @property string $jwks_url database column * @property string $jwks_key_id database column * @property string $deep_linking_url database column * @property string $terms_of_use_url database column * @property string $privacy_policy_url database column - * @property string $data_protection_notes database column - * @property string $range_id database column - * @property int $allow_custom_url database column - * @property int $deep_linking database column - * @property int $send_lis_person database column - * @property int $mkdate database column - * @property int $chdate database column - * @property string $oauth_signature_method database column - * @property SimpleORMapCollection|LtiDeployment[] $links has_many LtiData + * @property string|null $data_protection_notes database column + * @property SimpleORMapCollection $links has_many LtiDeployment + * @property Studip\OAuth2\Models\Client|null $oauth2_client has_one Studip\OAuth2\Models\Client */ class LtiTool extends SimpleORMap diff --git a/lib/models/LtiToolPrivacySettings.php b/lib/models/LtiToolPrivacySettings.php index 040aba1..601de58 100644 --- a/lib/models/LtiToolPrivacySettings.php +++ b/lib/models/LtiToolPrivacySettings.php @@ -19,12 +19,15 @@ * has been accepted, but also which data may be transferred to the * LTI tool. * - * @property string deployment_id database column - * @property string user_id database column - * @property string accepted database column - * @property string allowed_optional_fields database column - * @property string mkdate database column - * @property string chdate database column + * @property array $id alias for pk + * @property int $tool_id database column + * @property string $user_id database column + * @property int $accepted database column + * @property string $allowed_optional_fields database column + * @property int $mkdate database column + * @property int $chdate database column + * @property User $user belongs_to User + * @property LtiTool $tool belongs_to LtiTool */ class LtiToolPrivacySettings extends SimpleORMap { diff --git a/lib/models/Lvgruppe.php b/lib/models/Lvgruppe.php index 6f82215..0db7319 100644 --- a/lib/models/Lvgruppe.php +++ b/lib/models/Lvgruppe.php @@ -21,13 +21,13 @@ * @property string $editor_id database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|Modulteil[] $modulteile has_and_belongs_to_many Modulteil - * @property SimpleORMapCollection|Course[] $courses has_and_belongs_to_many Course - * @property SimpleORMapCollection|ArchivedCourse[] $archived_courses has_and_belongs_to_many ArchivedCourse - * @property mixed $count_seminare additional field - * @property mixed $count_archiv additional field - * @property mixed $count_modulteile additional field - * @property mixed $count_semester additional field + * @property SimpleORMapCollection $modulteile has_and_belongs_to_many Modulteil + * @property SimpleORMapCollection $courses has_and_belongs_to_many Course + * @property SimpleORMapCollection $archived_courses has_and_belongs_to_many ArchivedCourse + * @property-read mixed $count_seminare additional field + * @property-read mixed $count_archiv additional field + * @property-read mixed $count_modulteile additional field + * @property-read mixed $count_semester additional field */ class Lvgruppe extends ModuleManagementModelTreeItem diff --git a/lib/models/MassMail/MassMailFilter.php b/lib/models/MassMail/MassMailFilter.php index 8d88c65..e67c302 100644 --- a/lib/models/MassMail/MassMailFilter.php +++ b/lib/models/MassMail/MassMailFilter.php @@ -2,6 +2,15 @@ namespace MassMail; +/** + * @license GPL2 or any later version + * + * @property array $id alias for pk + * @property int $message_id database column + * @property string $filter_id database column + * @property int $mkdate database column + * @property-read mixed $userfilter additional field + */ class MassMailFilter extends \SimpleORMap { diff --git a/lib/models/MassMail/MassMailMarker.php b/lib/models/MassMail/MassMailMarker.php index 21dc42b..5ce79ad 100644 --- a/lib/models/MassMail/MassMailMarker.php +++ b/lib/models/MassMail/MassMailMarker.php @@ -4,6 +4,23 @@ namespace MassMail; use \User, \DBManager, \StudipPDO, \PDO; +/** + * @license GPL2 or any later version + * + * @property int $id alias column for marker_id + * @property int $marker_id database column + * @property string $marker database column + * @property string $name database column + * @property string|null $type database column + * @property string|null $description database column + * @property int|null $root_only database column + * @property string|null $replacement database column + * @property string|null $replacement_female database column + * @property string|null $replacement_unknown database column + * @property int|null $position database column + * @property int $mkdate database column + * @property int $chdate database column + */ class MassMailMarker extends \SimpleORMap { diff --git a/lib/models/MassMail/MassMailMessage.php b/lib/models/MassMail/MassMailMessage.php index b5c5f40..2a073db 100644 --- a/lib/models/MassMail/MassMailMessage.php +++ b/lib/models/MassMail/MassMailMessage.php @@ -4,6 +4,33 @@ namespace MassMail; use \Semester, \DBManager, \UserFilter, \Folder, \User, \Config; +/** + * @license GPL2 or any later version + * + * @property int $id alias column for message_id + * @property int $message_id database column + * @property string|null $sender_id database column + * @property string $author_id database column + * @property int|null $send_at_date database column + * @property string|null $target database column + * @property \JSONArrayObject|null $config database column + * @property string|null $exclude_users database column + * @property string|null $cc database column + * @property string $subject database column + * @property string $message database column + * @property string|null $folder_id database column + * @property int $is_template database column + * @property int $locked database column + * @property int $sent database column + * @property int $protected database column + * @property int $mkdate database column + * @property int $chdate database column + * @property \SimpleORMapCollection $filters has_many MassMailFilter + * @property \SimpleORMapCollection $tokens has_many MassMailToken + * @property \User $author has_one \User + * @property \User|null $sender has_one \User + * @property \Folder|null $folder has_one \Folder + */ class MassMailMessage extends \SimpleORMap implements \UserFilterRange { diff --git a/lib/models/MassMail/MassMailPermission.php b/lib/models/MassMail/MassMailPermission.php index 33af43d..a5edd4a 100644 --- a/lib/models/MassMail/MassMailPermission.php +++ b/lib/models/MassMail/MassMailPermission.php @@ -2,6 +2,21 @@ namespace MassMail; +/** + * @license GPL2 or any later version + * + * @property int $id alias column for permission_id + * @property int $permission_id database column + * @property string $institute_id database column + * @property string $min_perm database column + * @property int $mkdate database column + * @property int $chdate database column + * @property \Institute $institute belongs_to \Institute + * @property \SimpleORMapCollection<\Degree> $allowed_degrees has_and_belongs_to_many \Degree + * @property \SimpleORMapCollection<\StudyCourse> $allowed_subjects has_and_belongs_to_many \StudyCourse + * @property \SimpleORMapCollection<\Institute> $allowed_institutes has_and_belongs_to_many \Institute + * @property-read mixed $institute_name additional field + */ class MassMailPermission extends \SimpleORMap { diff --git a/lib/models/MassMail/MassMailToken.php b/lib/models/MassMail/MassMailToken.php index aacfe4b..de5fe75 100644 --- a/lib/models/MassMail/MassMailToken.php +++ b/lib/models/MassMail/MassMailToken.php @@ -2,6 +2,18 @@ namespace MassMail; +/** + * @license GPL2 or any later version + * + * @property int $id alias column for token_id + * @property int $token_id database column + * @property int $message_id database column + * @property string|null $user_id database column + * @property string $token database column + * @property int $mkdate database column + * @property MassMailMessage $message belongs_to MassMailMessage + * @property \User|null $user belongs_to \User + */ class MassMailToken extends \SimpleORMap { diff --git a/lib/models/Message.php b/lib/models/Message.php index fb6b78e..fc83764 100644 --- a/lib/models/Message.php +++ b/lib/models/Message.php @@ -19,7 +19,7 @@ * @property int $show_adressees database column * @property int $mkdate database column * @property string $priority database column - * @property SimpleORMapCollection|MessageUser[] $receivers has_many MessageUser + * @property SimpleORMapCollection $receivers has_many MessageUser * @property User $author belongs_to User * @property MessageUser $originator has_one MessageUser * @property Folder $attachment_folder has_one Folder diff --git a/lib/models/Modul.php b/lib/models/Modul.php index b6410b2..8c90e18 100644 --- a/lib/models/Modul.php +++ b/lib/models/Modul.php @@ -41,20 +41,20 @@ * @property string $editor_id database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|Modulteil[] $modulteile has_many Modulteil - * @property SimpleORMapCollection|ModulInst[] $assigned_institutes has_many ModulInst - * @property SimpleORMapCollection|MvvContactRange[] $contact_assignments has_many MvvContactRange - * @property SimpleORMapCollection|StgteilabschnittModul[] $abschnitte_modul has_many StgteilabschnittModul - * @property SimpleORMapCollection|ModulLanguage[] $languages has_many ModulLanguage + * @property SimpleORMapCollection $modulteile has_many Modulteil + * @property SimpleORMapCollection $assigned_institutes has_many ModulInst + * @property SimpleORMapCollection $contact_assignments has_many MvvContactRange + * @property SimpleORMapCollection $abschnitte_modul has_many StgteilabschnittModul + * @property SimpleORMapCollection $languages has_many ModulLanguage * @property Semester|null $start_semester belongs_to Semester - * @property Semester|null $end_semester belongs_to Semester + * @property Semester $end_semester belongs_to Semester * @property ModulDeskriptor $deskriptoren has_one ModulDeskriptor * @property Modul|null $modul_quelle has_one Modul * @property Modul|null $modul_variante has_one Modul * @property ModulInst $responsible_institute has_one ModulInst - * @property SimpleORMapCollection|StgteilAbschnitt[] $abschnitte has_and_belongs_to_many StgteilAbschnitt - * @property mixed $count_modulteile additional field - * @property mixed $languagesofinstruction additional field + * @property SimpleORMapCollection $abschnitte has_and_belongs_to_many StgteilAbschnitt + * @property-read mixed $count_modulteile additional field + * @property-read mixed $languagesofinstruction additional field * @property-read mixed $display_name additional field */ diff --git a/lib/models/ModulDeskriptor.php b/lib/models/ModulDeskriptor.php index 096d2d6..d9da0bb 100644 --- a/lib/models/ModulDeskriptor.php +++ b/lib/models/ModulDeskriptor.php @@ -38,7 +38,7 @@ * @property string|null $editor_id database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|DatafieldEntryModel[] $datafields has_many DatafieldEntryModel + * @property SimpleORMapCollection $datafields has_many DatafieldEntryModel * @property Modul $modul belongs_to Modul */ diff --git a/lib/models/Modulteil.php b/lib/models/Modulteil.php index 5c769f8..541d301 100644 --- a/lib/models/Modulteil.php +++ b/lib/models/Modulteil.php @@ -36,14 +36,14 @@ * @property string $editor_id database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|ModulteilStgteilabschnitt[] $abschnitt_assignments has_many ModulteilStgteilabschnitt - * @property SimpleORMapCollection|LvgruppeModulteil[] $lvgruppen_assignments has_many LvgruppeModulteil - * @property SimpleORMapCollection|ModulteilLanguage[] $languages has_many ModulteilLanguage + * @property SimpleORMapCollection $abschnitt_assignments has_many ModulteilStgteilabschnitt + * @property SimpleORMapCollection $lvgruppen_assignments has_many LvgruppeModulteil + * @property SimpleORMapCollection $languages has_many ModulteilLanguage * @property Modul $modul belongs_to Modul * @property ModulteilDeskriptor $deskriptoren has_one ModulteilDeskriptor - * @property SimpleORMapCollection|StgteilAbschnitt[] $abschnitte has_and_belongs_to_many StgteilAbschnitt - * @property SimpleORMapCollection|Lvgruppe[] $lvgruppen has_and_belongs_to_many Lvgruppe - * @property mixed $count_lvgruppen additional field + * @property SimpleORMapCollection $abschnitte has_and_belongs_to_many StgteilAbschnitt + * @property SimpleORMapCollection $lvgruppen has_and_belongs_to_many Lvgruppe + * @property-read mixed $count_lvgruppen additional field */ class Modulteil extends ModuleManagementModelTreeItem diff --git a/lib/models/ModulteilDeskriptor.php b/lib/models/ModulteilDeskriptor.php index 26c38a1..eaf41a5 100644 --- a/lib/models/ModulteilDeskriptor.php +++ b/lib/models/ModulteilDeskriptor.php @@ -31,7 +31,7 @@ * @property string $editor_id database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|DatafieldEntryModel[] $datafields has_many DatafieldEntryModel + * @property SimpleORMapCollection $datafields has_many DatafieldEntryModel * @property Modulteil $modulteil belongs_to Modulteil */ diff --git a/lib/models/MvvContact.php b/lib/models/MvvContact.php index 075acf9..35fdf62 100644 --- a/lib/models/MvvContact.php +++ b/lib/models/MvvContact.php @@ -20,7 +20,7 @@ * @property string|null $editor_id database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|MvvContactRange[] $ranges has_many MvvContactRange + * @property SimpleORMapCollection $ranges has_many MvvContactRange * @property-read mixed $name additional field * @property-read mixed $count_relations additional field */ diff --git a/lib/models/MvvCourse.php b/lib/models/MvvCourse.php index 148b8db..71b68cc 100644 --- a/lib/models/MvvCourse.php +++ b/lib/models/MvvCourse.php @@ -47,6 +47,7 @@ * @property int $admission_disable_waitlist_move database column * @property int $completion database column * @property string|null $parent_course database column + * @property int|null $expires database column */ class MvvCourse extends ModuleManagementModelTreeItem diff --git a/lib/models/MvvFile.php b/lib/models/MvvFile.php index 4b0be71..1874892 100644 --- a/lib/models/MvvFile.php +++ b/lib/models/MvvFile.php @@ -23,8 +23,8 @@ * @property string|null $editor_id database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|MvvFileFileref[] $file_refs has_many MvvFileFileref - * @property SimpleORMapCollection|MvvFileRange[] $ranges has_many MvvFileRange + * @property SimpleORMapCollection $file_refs has_many MvvFileFileref + * @property SimpleORMapCollection $ranges has_many MvvFileRange * @property-read mixed $count_relations additional field */ diff --git a/lib/models/MvvOverlappingSelection.php b/lib/models/MvvOverlappingSelection.php index 89a765c..ee92dad 100644 --- a/lib/models/MvvOverlappingSelection.php +++ b/lib/models/MvvOverlappingSelection.php @@ -23,8 +23,8 @@ * @property string $user_id database column * @property int $show_excluded database column * @property int $mkdate database column - * @property SimpleORMapCollection|MvvOverlappingConflict[] $conflicts has_many MvvOverlappingConflict - * @property SimpleORMapCollection|MvvOverlappingExclude[] $excludes has_many MvvOverlappingExclude + * @property SimpleORMapCollection $conflicts has_many MvvOverlappingConflict + * @property SimpleORMapCollection $excludes has_many MvvOverlappingExclude * @property Semester $semester belongs_to Semester * @property StgteilVersion $base_version belongs_to StgteilVersion * @property StgteilVersion $comp_version belongs_to StgteilVersion diff --git a/lib/models/OERMaterial.php b/lib/models/OERMaterial.php index 83ca8e2..0981247 100644 --- a/lib/models/OERMaterial.php +++ b/lib/models/OERMaterial.php @@ -28,8 +28,8 @@ * @property JSONArrayObject|null $data database column * @property int $chdate database column * @property int $mkdate database column - * @property SimpleORMapCollection|OERReview[] $reviews has_many OERReview - * @property SimpleORMapCollection|OERMaterialUser[] $users has_many OERMaterialUser + * @property SimpleORMapCollection $reviews has_many OERReview + * @property SimpleORMapCollection $users has_many OERMaterialUser * @property OERHost|null $host belongs_to OERHost * @property License $license belongs_to License */ diff --git a/lib/models/OERReview.php b/lib/models/OERReview.php index 3655c57..4ae7fa3 100644 --- a/lib/models/OERReview.php +++ b/lib/models/OERReview.php @@ -16,9 +16,9 @@ * @property JSONArrayObject|null $metadata database column * @property int|null $chdate database column * @property int|null $mkdate database column - * @property SimpleORMapCollection|BlubberComment[] $comments has_many BlubberComment - * @property SimpleORMapCollection|BlubberMention[] $mentions has_many BlubberMention - * @property SimpleORMapCollection|ObjectUserVisit[] $visits has_many ObjectUserVisit + * @property SimpleORMapCollection $comments has_many BlubberComment + * @property SimpleORMapCollection $mentions has_many BlubberMention + * @property SimpleORMapCollection $visits has_many ObjectUserVisit * @property OERMaterial $material belongs_to OERMaterial * @property User $user belongs_to User * @property OERHost $host has_one OERHost diff --git a/lib/models/Questionnaire.php b/lib/models/Questionnaire.php index 777182d..f8cc703 100644 --- a/lib/models/Questionnaire.php +++ b/lib/models/Questionnaire.php @@ -15,9 +15,9 @@ * @property int $copyable database column * @property int $chdate database column * @property int $mkdate database column - * @property SimpleORMapCollection|QuestionnaireQuestion[] $questions has_many QuestionnaireQuestion - * @property SimpleORMapCollection|QuestionnaireAssignment[] $assignments has_many QuestionnaireAssignment - * @property SimpleORMapCollection|QuestionnaireAnonymousAnswer[] $anonymousanswers has_many QuestionnaireAnonymousAnswer + * @property SimpleORMapCollection $questions has_many QuestionnaireQuestion + * @property SimpleORMapCollection $assignments has_many QuestionnaireAssignment + * @property SimpleORMapCollection $anonymousanswers has_many QuestionnaireAnonymousAnswer */ class Questionnaire extends SimpleORMap implements PrivacyObject { diff --git a/lib/models/QuestionnaireAutomatedData.php b/lib/models/QuestionnaireAutomatedData.php index 5b48392..cb58b7f 100644 --- a/lib/models/QuestionnaireAutomatedData.php +++ b/lib/models/QuestionnaireAutomatedData.php @@ -1,5 +1,20 @@ $answers has_many QuestionnaireAnswer + * @property Questionnaire $questionnaire belongs_to Questionnaire + */ class QuestionnaireAutomatedData extends QuestionnaireQuestion implements QuestionType { public static function getIcon(bool $active = false) : Icon diff --git a/lib/models/QuestionnaireInfo.php b/lib/models/QuestionnaireInfo.php index e820cee..185ac68 100644 --- a/lib/models/QuestionnaireInfo.php +++ b/lib/models/QuestionnaireInfo.php @@ -11,7 +11,7 @@ * @property int $position database column * @property int $chdate database column * @property int $mkdate database column - * @property SimpleORMapCollection|QuestionnaireAnswer[] $answers has_many QuestionnaireAnswer + * @property SimpleORMapCollection $answers has_many QuestionnaireAnswer * @property Questionnaire $questionnaire belongs_to Questionnaire */ class QuestionnaireInfo extends QuestionnaireQuestion implements QuestionType diff --git a/lib/models/QuestionnaireQuestion.php b/lib/models/QuestionnaireQuestion.php index e5a5947..2dc913d 100644 --- a/lib/models/QuestionnaireQuestion.php +++ b/lib/models/QuestionnaireQuestion.php @@ -14,7 +14,7 @@ use eTask\Task; * @property int $position database column * @property int $chdate database column * @property int $mkdate database column - * @property SimpleORMapCollection|QuestionnaireAnswer[] $answers has_many QuestionnaireAnswer + * @property SimpleORMapCollection $answers has_many QuestionnaireAnswer * @property Questionnaire $questionnaire belongs_to Questionnaire */ class QuestionnaireQuestion extends SimpleORMap diff --git a/lib/models/RangeScale.php b/lib/models/RangeScale.php index 92c1fba..de51114 100644 --- a/lib/models/RangeScale.php +++ b/lib/models/RangeScale.php @@ -11,7 +11,7 @@ * @property int $position database column * @property int $chdate database column * @property int $mkdate database column - * @property SimpleORMapCollection|QuestionnaireAnswer[] $answers has_many QuestionnaireAnswer + * @property SimpleORMapCollection $answers has_many QuestionnaireAnswer * @property Questionnaire $questionnaire belongs_to Questionnaire */ class RangeScale extends QuestionnaireQuestion implements QuestionType diff --git a/lib/models/RangeTreeNode.php b/lib/models/RangeTreeNode.php index d3d1567..db2f4d4 100644 --- a/lib/models/RangeTreeNode.php +++ b/lib/models/RangeTreeNode.php @@ -23,7 +23,7 @@ * @property string $name database column * @property string|null $studip_object database column * @property string|null $studip_object_id database column - * @property SimpleORMapCollection|RangeTreeNode[] $children has_many RangeTreeNode + * @property SimpleORMapCollection $children has_many RangeTreeNode * @property Institute|null $institute belongs_to Institute * @property RangeTreeNode $parent belongs_to RangeTreeNode */ diff --git a/lib/models/Semester.php b/lib/models/Semester.php index 51ee4a6..4a142c5 100644 --- a/lib/models/Semester.php +++ b/lib/models/Semester.php @@ -32,8 +32,8 @@ * @property-read mixed $current additional field * @property-read mixed $past additional field * @property-read mixed $short_name additional field - * @property mixed $absolute_seminars_count additional field - * @property mixed $continuous_seminars_count additional field + * @property-read mixed $absolute_seminars_count additional field + * @property-read mixed $continuous_seminars_count additional field */ class Semester extends SimpleORMap { diff --git a/lib/models/SeminarCycleDate.php b/lib/models/SeminarCycleDate.php index 135b676..fb81bff 100644 --- a/lib/models/SeminarCycleDate.php +++ b/lib/models/SeminarCycleDate.php @@ -33,9 +33,9 @@ require_once 'lib/dates.inc.php'; * @property int $sorter database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|RoomRequest[] $room_requests has_many RoomRequest - * @property SimpleORMapCollection|CourseDate[] $dates has_many CourseDate - * @property SimpleORMapCollection|CourseExDate[] $exdates has_many CourseExDate + * @property SimpleORMapCollection $room_requests has_many RoomRequest + * @property SimpleORMapCollection $dates has_many CourseDate + * @property SimpleORMapCollection $exdates has_many CourseExDate * @property Course $course belongs_to Course * @property mixed $start_hour additional field * @property mixed $start_minute additional field diff --git a/lib/models/StatusgruppeUser.php b/lib/models/StatusgruppeUser.php index 228568b..95eb81b 100644 --- a/lib/models/StatusgruppeUser.php +++ b/lib/models/StatusgruppeUser.php @@ -22,7 +22,7 @@ * @property int $visible database column * @property int $inherit database column * @property int|null $mkdate database column - * @property SimpleORMapCollection|DatafieldEntryModel[] $datafields has_many DatafieldEntryModel + * @property SimpleORMapCollection $datafields has_many DatafieldEntryModel * @property Statusgruppen $group belongs_to Statusgruppen * @property User $user belongs_to User * @property mixed $vorname additional field diff --git a/lib/models/Statusgruppen.php b/lib/models/Statusgruppen.php index b934cf5..ea1b677 100644 --- a/lib/models/Statusgruppen.php +++ b/lib/models/Statusgruppen.php @@ -32,17 +32,17 @@ * @property int $calendar_group database column * @property I18NString|null $name_w database column * @property I18NString|null $name_m database column - * @property SimpleORMapCollection|StatusgruppeUser[] $members has_many StatusgruppeUser - * @property SimpleORMapCollection|ConsultationBlock[] $consultation_blocks has_many ConsultationBlock - * @property SimpleORMapCollection|ConsultationResponsibility[] $consultation_responsibilities has_many ConsultationResponsibility + * @property SimpleORMapCollection $members has_many StatusgruppeUser + * @property SimpleORMapCollection $consultation_blocks has_many ConsultationBlock + * @property SimpleORMapCollection $consultation_responsibilities has_many ConsultationResponsibility * @property Statusgruppen $parent belongs_to Statusgruppen * @property Course $course belongs_to Course * @property Institute $institute belongs_to Institute * @property User $user belongs_to User * @property BlubberStatusgruppeThread $blubberthread has_one BlubberStatusgruppeThread - * @property SimpleORMapCollection|CourseDate[] $dates has_and_belongs_to_many CourseDate + * @property SimpleORMapCollection $dates has_and_belongs_to_many CourseDate * @property mixed $children additional field - * @property-read Range|null $range + * @property-read (Range | null) $range */ class Statusgruppen extends SimpleORMap implements PrivacyObject { diff --git a/lib/models/StgteilAbschnitt.php b/lib/models/StgteilAbschnitt.php index 77f8aef..7b34bcb 100644 --- a/lib/models/StgteilAbschnitt.php +++ b/lib/models/StgteilAbschnitt.php @@ -25,11 +25,11 @@ * @property string $editor_id database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|StgteilabschnittModul[] $modul_zuordnungen has_many StgteilabschnittModul - * @property SimpleORMapCollection|ModulteilStgteilabschnitt[] $modulteil_abschnitte has_many ModulteilStgteilabschnitt + * @property SimpleORMapCollection $modul_zuordnungen has_many StgteilabschnittModul + * @property SimpleORMapCollection $modulteil_abschnitte has_many ModulteilStgteilabschnitt * @property StgteilVersion $version belongs_to StgteilVersion - * @property SimpleORMapCollection|Modul[] $module has_and_belongs_to_many Modul - * @property mixed $count_module additional field + * @property SimpleORMapCollection $module has_and_belongs_to_many Modul + * @property-read mixed $count_module additional field */ class StgteilAbschnitt extends ModuleManagementModelTreeItem diff --git a/lib/models/StgteilBezeichnung.php b/lib/models/StgteilBezeichnung.php index 58eea27..16e0f54 100644 --- a/lib/models/StgteilBezeichnung.php +++ b/lib/models/StgteilBezeichnung.php @@ -22,8 +22,8 @@ * @property string $editor_id database column * @property int $mkdate database column * @property int $chdate database column - * @property mixed $count_stgteile additional field - * @property mixed $count_studiengaenge additional field + * @property-read mixed $count_stgteile additional field + * @property-read mixed $count_studiengaenge additional field */ class StgteilBezeichnung extends ModuleManagementModel diff --git a/lib/models/StgteilVersion.php b/lib/models/StgteilVersion.php index 40bdb8a..017b590 100644 --- a/lib/models/StgteilVersion.php +++ b/lib/models/StgteilVersion.php @@ -29,10 +29,12 @@ * @property string $editor_id database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|StgteilAbschnitt[] $abschnitte has_many StgteilAbschnitt - * @property SimpleORMapCollection|MvvFile[] $documents has_many MvvFile - * @property SimpleORMapCollection|MvvFile[] $document_assignments has_many MvvFile + * @property SimpleORMapCollection $abschnitte has_many StgteilAbschnitt + * @property SimpleORMapCollection $documents has_many MvvFile + * @property SimpleORMapCollection $document_assignments has_many MvvFile * @property StudiengangTeil $studiengangteil belongs_to StudiengangTeil + * @property Semester|null $start_semester belongs_to Semester + * @property Semester|null $end_semester belongs_to Semester * @property-read mixed $count_abschnitte additional field * @property-read mixed $count_dokumente additional field */ diff --git a/lib/models/Studiengang.php b/lib/models/Studiengang.php index 3c8a10f..f72b0d3 100644 --- a/lib/models/Studiengang.php +++ b/lib/models/Studiengang.php @@ -37,19 +37,19 @@ * @property string $editor_id database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|StudiengangStgteil[] $stgteil_assignments has_many StudiengangStgteil - * @property SimpleORMapCollection|MvvFile[] $documents has_many MvvFile - * @property SimpleORMapCollection|MvvFileRange[] $document_assignments has_many MvvFileRange - * @property SimpleORMapCollection|MvvContactRange[] $contact_assignments has_many MvvContactRange - * @property SimpleORMapCollection|StudycourseType[] $studycourse_types has_many StudycourseType - * @property SimpleORMapCollection|StudycourseLanguage[] $languages has_many StudycourseLanguage - * @property SimpleORMapCollection|DatafieldEntryModel[] $datafields has_many DatafieldEntryModel - * @property SimpleORMapCollection|Aufbaustudiengang[] $grundstg_assignments has_many Aufbaustudiengang - * @property SimpleORMapCollection|Aufbaustudiengang[] $aufbaustg_assignments has_many Aufbaustudiengang + * @property SimpleORMapCollection $stgteil_assignments has_many StudiengangStgteil + * @property SimpleORMapCollection $documents has_many MvvFile + * @property SimpleORMapCollection $document_assignments has_many MvvFileRange + * @property SimpleORMapCollection $contact_assignments has_many MvvContactRange + * @property SimpleORMapCollection $studycourse_types has_many StudycourseType + * @property SimpleORMapCollection $languages has_many StudycourseLanguage + * @property SimpleORMapCollection $datafields has_many DatafieldEntryModel + * @property SimpleORMapCollection $grundstg_assignments has_many Aufbaustudiengang + * @property SimpleORMapCollection $aufbaustg_assignments has_many Aufbaustudiengang * @property Abschluss|null $abschluss belongs_to Abschluss * @property Fachbereich|null $responsible_institute has_one Fachbereich - * @property SimpleORMapCollection|StudiengangTeil[] $studiengangteile has_and_belongs_to_many StudiengangTeil - * @property SimpleORMapCollection|StgteilBezeichnung[] $stgteil_bezeichnungen has_and_belongs_to_many StgteilBezeichnung + * @property SimpleORMapCollection $studiengangteile has_and_belongs_to_many StudiengangTeil + * @property SimpleORMapCollection $stgteil_bezeichnungen has_and_belongs_to_many StgteilBezeichnung * @property-read mixed $count_dokumente additional field * @property-read mixed $count_faecher additional field * @property-read mixed $count_module additional field diff --git a/lib/models/StudiengangTeil.php b/lib/models/StudiengangTeil.php index b4a71eb..ee526d1 100644 --- a/lib/models/StudiengangTeil.php +++ b/lib/models/StudiengangTeil.php @@ -23,11 +23,12 @@ * @property string $editor_id database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|StgteilVersion[] $versionen has_many StgteilVersion - * @property SimpleORMapCollection|MvvContactRange[] $contact_assignments has_many MvvContactRange - * @property SimpleORMapCollection|StudiengangStgteil[] $studiengang_assignments has_many StudiengangStgteil + * @property SimpleORMapCollection $versionen has_many StgteilVersion + * @property SimpleORMapCollection $contact_assignments has_many MvvContactRange + * @property SimpleORMapCollection $studiengang_assignments has_many StudiengangStgteil * @property Fach|null $fach belongs_to Fach - * @property SimpleORMapCollection|Studiengang[] $studiengang has_and_belongs_to_many Studiengang + * @property SimpleORMapCollection $studiengang has_and_belongs_to_many Studiengang + * @property SimpleORMapCollection $studygroups has_and_belongs_to_many Course * @property-read mixed $count_versionen additional field * @property-read mixed $fach_name additional field * @property-read mixed $count_contacts additional field diff --git a/lib/models/StudipNews.php b/lib/models/StudipNews.php index c00e4a5..7fc8dfe 100644 --- a/lib/models/StudipNews.php +++ b/lib/models/StudipNews.php @@ -40,11 +40,11 @@ require_once 'lib/object.inc.php'; * @property int $chdate database column * @property string $chdate_uid database column * @property int $mkdate database column - * @property SimpleORMapCollection|NewsRange[] $news_ranges has_many NewsRange - * @property SimpleORMapCollection|StudipComment[] $comments has_many StudipComment - * @property SimpleORMapCollection|NewsRoles[] $news_roles has_many NewsRoles + * @property SimpleORMapCollection $news_ranges has_many NewsRange + * @property SimpleORMapCollection $comments has_many StudipComment + * @property SimpleORMapCollection $news_roles has_many NewsRoles * @property User $owner belongs_to User - * @property int $views additional field + * @property-read int $views additional field */ class StudipNews extends SimpleORMap implements PrivacyObject { diff --git a/lib/models/StudipStudyArea.php b/lib/models/StudipStudyArea.php index 923d341..7aedeff 100644 --- a/lib/models/StudipStudyArea.php +++ b/lib/models/StudipStudyArea.php @@ -25,9 +25,9 @@ * @property int $type database column * @property int|null $mkdate database column * @property int|null $chdate database column - * @property SimpleORMapCollection|StudipStudyArea[] $_children has_many StudipStudyArea + * @property SimpleORMapCollection $_children has_many StudipStudyArea * @property StudipStudyArea $_parent belongs_to StudipStudyArea - * @property SimpleORMapCollection|Course[] $courses has_and_belongs_to_many Course + * @property SimpleORMapCollection $courses has_and_belongs_to_many Course */ class StudipStudyArea extends SimpleORMap implements StudipTreeNode diff --git a/lib/models/StudyCourse.php b/lib/models/StudyCourse.php index 91937ea..9658089 100644 --- a/lib/models/StudyCourse.php +++ b/lib/models/StudyCourse.php @@ -23,7 +23,7 @@ * @property string $editor_id database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|Degree[] $degrees has_and_belongs_to_many Degree + * @property SimpleORMapCollection $degrees has_and_belongs_to_many Degree * @property-read mixed $count_user additional field */ class StudyCourse extends SimpleORMap diff --git a/lib/models/StudygroupCourse.php b/lib/models/StudygroupCourse.php index 14450ac..a02f365 100644 --- a/lib/models/StudygroupCourse.php +++ b/lib/models/StudygroupCourse.php @@ -3,11 +3,12 @@ /** * @license GPL2 or any later version * - * @property string $id alias column for tag_hash + * @property int $id database column * @property string $studygroup_id database column - * @property string $course_id database column - * @property int $mkdate database column - * + * @property string|null $course_id database column + * @property int|null $mkdate database column + * @property Course|null $course belongs_to Course + * @property Course $studygroup belongs_to Course */ class StudygroupCourse extends SimpleORMap { diff --git a/lib/models/StudygroupCourseProposal.php b/lib/models/StudygroupCourseProposal.php index b746fbc..c3d3b3e 100644 --- a/lib/models/StudygroupCourseProposal.php +++ b/lib/models/StudygroupCourseProposal.php @@ -3,13 +3,15 @@ /** * @license GPL2 or any later version * - * @property string $id alias column for tag_hash + * @property int $id database column * @property string $studygroup_id database column * @property string $course_id database column * @property string $proposed_from database column 'course' or 'studygroup' - * @property string $user_id database column - * @property int $mkdate database column - * + * @property string|null $user_id database column + * @property int|null $mkdate database column + * @property Course $course belongs_to Course + * @property Course $studygroup belongs_to Course + * @property User|null $user belongs_to User */ class StudygroupCourseProposal extends SimpleORMap { diff --git a/lib/models/StudygroupInvitation.php b/lib/models/StudygroupInvitation.php index c7d09dc..705afbe 100644 --- a/lib/models/StudygroupInvitation.php +++ b/lib/models/StudygroupInvitation.php @@ -1,13 +1,13 @@ $tokens has_many TFAToken * @property User $user belongs_to User */ class TFASecret extends SimpleORMap diff --git a/lib/models/Tag.php b/lib/models/Tag.php index 8614e5a..48b15d3 100644 --- a/lib/models/Tag.php +++ b/lib/models/Tag.php @@ -3,12 +3,12 @@ /** * @license GPL2 or any later version * - * @property string $id alias column for tag_hash + * @property int $id database column * @property string $name database column - * @property int $active database column - * @property int $chdate database column - * @property int $mkdate database column - * + * @property int|null $active database column + * @property int|null $chdate database column + * @property int|null $mkdate database column + * @property SimpleORMapCollection $related_objects has_many TagRelation */ class Tag extends SimpleORMap { diff --git a/lib/models/TagRelation.php b/lib/models/TagRelation.php index 168b7d3..dbd44aa 100644 --- a/lib/models/TagRelation.php +++ b/lib/models/TagRelation.php @@ -3,11 +3,11 @@ /** * @license GPL2 or any later version * - * @property string $id alias column for tag_hash - * @property int $tag_id database column - * @property string $range_id database column - * @property string $range_type database column - * @property int $mkdate database column + * @property int $id database column + * @property int|null $tag_id database column + * @property string|null $range_id database column + * @property string|null $range_type database column + * @property int|null $mkdate database column */ class TagRelation extends SimpleORMap { diff --git a/lib/models/User.php b/lib/models/User.php index f7a19a7..8e52589 100644 --- a/lib/models/User.php +++ b/lib/models/User.php @@ -30,37 +30,40 @@ * @property string $vorname database column * @property string $nachname database column * @property string $email database column - * @property string $matriculation_number database column * @property string $validation_key database column * @property string|null $auth_plugin database column * @property int $locked database column * @property string|null $lock_comment database column * @property string|null $locked_by database column * @property string $visible database column - * @property SimpleORMapCollection|CourseMember[] $course_memberships has_many CourseMember - * @property SimpleORMapCollection|InstituteMember[] $institute_memberships has_many InstituteMember - * @property SimpleORMapCollection|AdmissionApplication[] $admission_applications has_many AdmissionApplication - * @property SimpleORMapCollection|ArchivedCourseMember[] $archived_course_memberships has_many ArchivedCourseMember - * @property SimpleORMapCollection|DatafieldEntryModel[] $datafields has_many DatafieldEntryModel - * @property SimpleORMapCollection|UserStudyCourse[] $studycourses has_many UserStudyCourse - * @property SimpleORMapCollection|Statusgruppen[] $contactgroups has_many Statusgruppen - * @property SimpleORMapCollection|ResourcePermission[] $resource_permissions has_many ResourcePermission - * @property SimpleORMapCollection|ResourceTemporaryPermission[] $resource_temporary_permissions has_many ResourceTemporaryPermission - * @property SimpleORMapCollection|ConsultationBlock[] $consultation_blocks has_many ConsultationBlock - * @property SimpleORMapCollection|ConsultationBooking[] $consultation_bookings has_many ConsultationBooking - * @property SimpleORMapCollection|ConsultationResponsibility[] $consultation_responsibilities has_many ConsultationResponsibility - * @property SimpleORMapCollection|Kategorie[] $profile_categories has_many Kategorie - * @property SimpleORMapCollection|MvvContact[] $mvv_assignments has_many MvvContact - * @property SimpleORMapCollection|CourseMemberNotification[] $course_notifications has_many CourseMemberNotification - * @property SimpleORMapCollection|BlubberThread[] $blubber_threads has_many BlubberThread - * @property SimpleORMapCollection|BlubberComment[] $blubber_comments has_many BlubberComment - * @property SimpleORMapCollection|BlubberMention[] $blubber_mentions has_many BlubberMention + * @property string|null $matriculation_number database column + * @property SimpleORMapCollection $course_memberships has_many CourseMember + * @property SimpleORMapCollection $institute_memberships has_many InstituteMember + * @property SimpleORMapCollection $admission_applications has_many AdmissionApplication + * @property SimpleORMapCollection $archived_course_memberships has_many ArchivedCourseMember + * @property SimpleORMapCollection $datafields has_many DatafieldEntryModel + * @property SimpleORMapCollection $studycourses has_many UserStudyCourse + * @property SimpleORMapCollection $contactgroups has_many Statusgruppen + * @property SimpleORMapCollection $resource_permissions has_many ResourcePermission + * @property SimpleORMapCollection $resource_temporary_permissions has_many ResourceTemporaryPermission + * @property SimpleORMapCollection $consultation_blocks has_many ConsultationBlock + * @property SimpleORMapCollection $consultation_bookings has_many ConsultationBooking + * @property SimpleORMapCollection $consultation_responsibilities has_many ConsultationResponsibility + * @property SimpleORMapCollection $profile_categories has_many Kategorie + * @property SimpleORMapCollection $mvv_assignments has_many MvvContact + * @property SimpleORMapCollection $course_notifications has_many CourseMemberNotification + * @property SimpleORMapCollection $extern_pages_configs has_many ExternPageConfig + * @property SimpleORMapCollection $blubber_threads has_many BlubberThread + * @property SimpleORMapCollection $blubber_comments has_many BlubberComment + * @property SimpleORMapCollection $blubber_mentions has_many BlubberMention + * @property SimpleORMapCollection $studygroup_invitations has_many StudygroupInvitation * @property UserInfo $info has_one UserInfo * @property UserOnline $online has_one UserOnline - * @property Courseware\Unit $courseware_units has_one Courseware\Unit - * @property SimpleORMapCollection|User[] $contacts has_and_belongs_to_many User - * @property SimpleORMapCollection|UserDomain[] $domains has_and_belongs_to_many UserDomain + * @property SimpleORMapCollection $contacts has_and_belongs_to_many User + * @property SimpleORMapCollection $domains has_and_belongs_to_many UserDomain * @property-read mixed $config additional field + * @property-read mixed $gender additional field + * @property-read mixed $salutation additional field * @property mixed $hobby additional field * @property mixed $lebenslauf additional field * @property mixed $publi additional field diff --git a/lib/models/UserDomain.php b/lib/models/UserDomain.php index 74681d2..0fd5ab7 100644 --- a/lib/models/UserDomain.php +++ b/lib/models/UserDomain.php @@ -13,8 +13,8 @@ * @property int $restricted_access database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|User[] $users has_and_belongs_to_many User - * @property SimpleORMapCollection|Course[] $courses has_and_belongs_to_many Course + * @property SimpleORMapCollection $users has_and_belongs_to_many User + * @property SimpleORMapCollection $courses has_and_belongs_to_many Course */ class UserDomain extends SimpleORMap { diff --git a/lib/models/Vote.php b/lib/models/Vote.php index ab82ce9..9941f7e 100644 --- a/lib/models/Vote.php +++ b/lib/models/Vote.php @@ -11,7 +11,7 @@ * @property int $position database column * @property int $chdate database column * @property int $mkdate database column - * @property SimpleORMapCollection|QuestionnaireAnswer[] $answers has_many QuestionnaireAnswer + * @property SimpleORMapCollection $answers has_many QuestionnaireAnswer * @property Questionnaire $questionnaire belongs_to Questionnaire */ class Vote extends QuestionnaireQuestion implements QuestionType diff --git a/lib/models/WikiOnlineEditingUser.php b/lib/models/WikiOnlineEditingUser.php index f28ae0e..251c0da 100644 --- a/lib/models/WikiOnlineEditingUser.php +++ b/lib/models/WikiOnlineEditingUser.php @@ -12,16 +12,15 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GPL version 2 * @category Stud.IP * - * @property int $id pk - * @property string $user_id database column - * @property int $page_id database column - * @property bool $editing database column - * @property bool $editing_request database column - * @property int $chdate database column - * @property int $mkdate database column - * - * @property WikiPage $page - * @property User $user + * @property int $id pk + * @property string $user_id database column + * @property int $page_id database column + * @property bool $editing database column + * @property bool $editing_request database column + * @property int $chdate database column + * @property int $mkdate database column + * @property WikiPage $page + * @property User $user */ class WikiOnlineEditingUser extends SimpleORMap { diff --git a/lib/models/WikiPage.php b/lib/models/WikiPage.php index 57b9c89..bc61374 100644 --- a/lib/models/WikiPage.php +++ b/lib/models/WikiPage.php @@ -11,27 +11,26 @@ * @author mlunzena * @copyright (c) Authors * - * @property int $id alias for pk + * @property int $id alias column for page_id * @property int $page_id database column * @property string $range_id database column * @property string $name database column - * @property string $content database column - * @property string|null $parent_id database column + * @property string|null $content database column + * @property int|null $parent_id database column * @property string $read_permission database column * @property string $write_permission database column * @property string $user_id database column * @property int|null $locked_since database column * @property string|null $locked_by_user_id database column - * @property int|null $mkdate database column - * @property int|null $chdate database column - * - * @property User|null $user belongs_to User + * @property int $chdate database column + * @property int $mkdate database column + * @property SimpleORMapCollection $versions + * @property SimpleORMapCollection $onlineeditingusers + * @property User $user belongs_to User * @property Course $course belongs_to Course - * @property WikiVersion[]|SimpleORMapCollection $versions - * @property WikiOnlineEditingUser[]|SimpleORMapCollection $onlineeditingusers - * @property-read WikiPage|null $parent additional field + * @property-read (WikiPage | null) $parent additional field * @property-read WikiPage[] $children additional field - * @property-read WikiVersion|null $predecessor additional field + * @property-read (WikiVersion | null) $predecessor additional field * @property-read int $versionnumber additional field */ class WikiPage extends SimpleORMap implements PrivacyObject diff --git a/lib/models/WikiVersion.php b/lib/models/WikiVersion.php index 2adb958..13f6b27 100644 --- a/lib/models/WikiVersion.php +++ b/lib/models/WikiVersion.php @@ -13,19 +13,18 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GPL version 2 * @category Stud.IP * - * @property int $id alias column for user_id + * @property int $id alias column for version_id * @property int $version_id database column * @property int $page_id database column * @property string $name database column - * @property string $content database column + * @property string|null $content database column * @property string $user_id database column * @property int $mkdate database column - * - * @property WikiPage $page - * @property User $user - * @property WikiPage|null $predecessor - * @property WikiPage|null $successor - * @property int|null $versionnumber + * @property WikiPage $page + * @property User $user + * @property-read (WikiPage | null) $predecessor + * @property-read (WikiPage | null) $successor + * @property-read (int | null) $versionnumber */ class WikiVersion extends SimpleORMap { diff --git a/lib/models/calendar/CalendarCourseDate.php b/lib/models/calendar/CalendarCourseDate.php index b312bda..bc48bfc 100644 --- a/lib/models/calendar/CalendarCourseDate.php +++ b/lib/models/calendar/CalendarCourseDate.php @@ -3,6 +3,30 @@ /** * CalendarCourseDate is a specialisation of CourseDate for * course dates that are displayed in the personal calendar. + * + * @property string $id alias column for termin_id + * @property string $termin_id database column + * @property string $range_id database column + * @property string $autor_id database column + * @property string $content database column + * @property int $date database column + * @property int $end_time database column + * @property int $mkdate database column + * @property int $chdate database column + * @property int $date_typ database column + * @property string|null $raum database column + * @property string|null $metadate_id database column + * @property int|null $number_of_participants database column + * @property SimpleORMapCollection $folders has_many Folder + * @property SimpleORMapCollection $room_requests has_many RoomRequest + * @property SimpleORMapCollection $resource_request_appointments has_many ResourceRequestAppointment + * @property User $author belongs_to User + * @property Course $course belongs_to Course + * @property SeminarCycleDate|null $cycle belongs_to SeminarCycleDate + * @property ResourceBooking $room_booking has_one ResourceBooking + * @property SimpleORMapCollection $topics has_and_belongs_to_many CourseTopic + * @property SimpleORMapCollection $statusgruppen has_and_belongs_to_many Statusgruppen + * @property SimpleORMapCollection $dozenten has_and_belongs_to_many User */ class CalendarCourseDate extends CourseDate { diff --git a/lib/models/calendar/CalendarCourseExDate.php b/lib/models/calendar/CalendarCourseExDate.php index 5e979a8..7aaead7 100644 --- a/lib/models/calendar/CalendarCourseExDate.php +++ b/lib/models/calendar/CalendarCourseExDate.php @@ -3,6 +3,28 @@ /** * CalendarCourseExDate is a specialisation of CourseExDate for * cancelled course dates that are displayed in the personal calendar. + * + * @property string $id alias column for termin_id + * @property string $termin_id database column + * @property string $range_id database column + * @property string $autor_id database column + * @property string $content database column + * @property int $date database column + * @property int $end_time database column + * @property int $mkdate database column + * @property int $chdate database column + * @property int $date_typ database column + * @property string|null $raum database column + * @property string|null $metadate_id database column + * @property string $resource_id database column + * @property User $author belongs_to User + * @property Course $course belongs_to Course + * @property SeminarCycleDate|null $cycle belongs_to SeminarCycleDate + * @property-read mixed $topics additional field + * @property-read mixed $statusgruppen additional field + * @property-read mixed $dozenten additional field + * @property-read mixed $room_booking additional field + * @property-read mixed $room_request additional field */ class CalendarCourseExDate extends CourseExDate { diff --git a/lib/models/calendar/CalendarDate.php b/lib/models/calendar/CalendarDate.php index ebfb20e..e0ee324 100644 --- a/lib/models/calendar/CalendarDate.php +++ b/lib/models/calendar/CalendarDate.php @@ -15,34 +15,32 @@ * @category Stud.IP * @since 3.2 * - * @property string id database column - * @property string author_id database column - * @property string editor_id database column - * @property string unique_id database column - * @property string begin database column - * @property string end database column - * @property string title database column - * @property string description database column - * @property string access database column - * @property string user_category database column - * @property string category database column - * @property string location database column - * @property string interval database column - * @property string offset database column - * @property string days database column - * @property string month database column - * @property string day_offset database column - * @property string repetition_type database column - * @property string number_of_dates database column - * @property string repetition_end database column - * @property string mkdate database column - * @property string chdate database column - * @property string import_date database column - * - * @property User $author - * @property User $editor - * @property CalendarDateAssignment[]|SimpleORMapCollection $calendars - * @property CalendarDateException[]|SimpleORMapCollection $exceptions + * @property string $id database column + * @property string $author_id database column + * @property string|null $editor_id database column + * @property string $unique_id database column + * @property int $begin database column + * @property int $end database column + * @property string $title database column + * @property string|null $description database column + * @property string $access database column + * @property string|null $user_category database column + * @property int $category database column + * @property string|null $location database column + * @property int|null $interval database column + * @property int|null $offset database column + * @property string|null $days database column + * @property int|null $month database column + * @property string|null $repetition_type database column + * @property int $number_of_dates database column + * @property int $repetition_end database column + * @property int $mkdate database column + * @property int $chdate database column + * @property int $import_date database column + * @property SimpleORMapCollection $calendars + * @property SimpleORMapCollection $exceptions + * @property User $author + * @property User|null $editor */ class CalendarDate extends SimpleORMap implements PrivacyObject { diff --git a/lib/models/calendar/CalendarDateAssignment.php b/lib/models/calendar/CalendarDateAssignment.php index 05fafec..c7bfc46 100644 --- a/lib/models/calendar/CalendarDateAssignment.php +++ b/lib/models/calendar/CalendarDateAssignment.php @@ -17,20 +17,15 @@ * @category Stud.IP * @since 5.5 * - * @property string range_id The range-ID for the assignment. - * @property string calendar_date_id The ID of the calendar date for the assignment. - * @property string participation The participation status of the receiver (range_id). - * This column is an enum with the following values: - * - empty string: Participation status is unknown. - * - "ACCEPTED": The calendar owner accepted the date. - * - "DECLINED": The calendar owner declined the date. - * - "ACKNOWLEDGED": The calendar owner only acknowledged that the date exists - * but doesn't necessarily participate in it. - * @property string mkdate The creation date of the assignment. - * @property string chdate The modification date of the assignment. - * @property CalendarDate|null calendar_date The associated calendar date object. - * @property User|null $user - * @property Course|null $course + * @property array $id alias for pk + * @property string $range_id database column + * @property string $calendar_date_id database column + * @property int $mkdate database column + * @property int $chdate database column + * @property string $participation database column + * @property CalendarDate $calendar_date belongs_to CalendarDate + * @property User $user + * @property Course $course */ class CalendarDateAssignment extends SimpleORMap implements Event { diff --git a/lib/models/calendar/CalendarDateException.php b/lib/models/calendar/CalendarDateException.php index b53a728..1429ee4 100644 --- a/lib/models/calendar/CalendarDateException.php +++ b/lib/models/calendar/CalendarDateException.php @@ -1,7 +1,7 @@ $attempts has_many Attempt + * @property \SimpleORMapCollection $ranges has_many AssignmentRange + * @property \SimpleORMapCollection $responses has_many Response * @property Test $test belongs_to Test */ class Assignment extends \SimpleORMap diff --git a/lib/models/eTask/Attempt.php b/lib/models/eTask/Attempt.php index 2720f47..193cb24 100644 --- a/lib/models/eTask/Attempt.php +++ b/lib/models/eTask/Attempt.php @@ -11,7 +11,8 @@ use JSONArrayObject; * @property string $user_id database column * @property int|null $start database column * @property int|null $end database column - * @property \JSONArrayObject $options database column + * @property string $ip_address database column + * @property \JSONArrayObject|null $options database column * @property int|null $mkdate database column * @property int|null $chdate database column * @property Assignment $assignment belongs_to Assignment diff --git a/lib/models/eTask/Response.php b/lib/models/eTask/Response.php index fbed047..d5bf08f 100644 --- a/lib/models/eTask/Response.php +++ b/lib/models/eTask/Response.php @@ -13,9 +13,12 @@ use User; * @property int $task_id database column * @property string $user_id database column * @property \JSONArrayObject $response database column + * @property string|null $student_comment database column + * @property string $ip_address database column * @property int|null $state database column * @property float|null $points database column * @property string|null $feedback database column + * @property string|null $commented_solution database column * @property string|null $grader_id database column * @property int $mkdate database column * @property int $chdate database column diff --git a/lib/models/eTask/Task.php b/lib/models/eTask/Task.php index 40c5404..d68c6bd 100644 --- a/lib/models/eTask/Task.php +++ b/lib/models/eTask/Task.php @@ -17,10 +17,10 @@ use User; * @property int $mkdate database column * @property int $chdate database column * @property \JSONArrayObject $options database column - * @property \SimpleORMapCollection|TestTask[] $test_tasks has_many TestTask - * @property \SimpleORMapCollection|Response[] $responses has_many Response + * @property \SimpleORMapCollection $test_tasks has_many TestTask + * @property \SimpleORMapCollection $responses has_many Response * @property \User $owner belongs_to \User - * @property \SimpleORMapCollection|Test[] $tests has_and_belongs_to_many Test + * @property \SimpleORMapCollection $tests has_and_belongs_to_many Test */ class Task extends \SimpleORMap implements \PrivacyObject { diff --git a/lib/models/eTask/Test.php b/lib/models/eTask/Test.php index 8554a06..676daa3 100644 --- a/lib/models/eTask/Test.php +++ b/lib/models/eTask/Test.php @@ -14,11 +14,11 @@ use User; * @property string $user_id database column * @property int $mkdate database column * @property int $chdate database column - * @property \JSONArrayObject $options database column - * @property \SimpleORMapCollection|TestTask[] $testtasks has_many TestTask - * @property \SimpleORMapCollection|Assignment[] $assignments has_many Assignment + * @property \JSONArrayObject|null $options database column + * @property \SimpleORMapCollection $testtasks has_many TestTask + * @property \SimpleORMapCollection $assignments has_many Assignment * @property \User $owner belongs_to \User - * @property \SimpleORMapCollection|Task[] $tasks has_and_belongs_to_many Task + * @property \SimpleORMapCollection $tasks has_and_belongs_to_many Task */ class Test extends \SimpleORMap implements \PrivacyObject { diff --git a/lib/models/eTask/TestTask.php b/lib/models/eTask/TestTask.php index 6759491..d2072fe 100644 --- a/lib/models/eTask/TestTask.php +++ b/lib/models/eTask/TestTask.php @@ -11,6 +11,7 @@ use JSONArrayObject; * @property int $test_id database column * @property int $task_id database column * @property int $position database column + * @property int $part database column * @property float|null $points database column * @property \JSONArrayObject $options database column * @property int|null $mkdate database column diff --git a/lib/models/resources/BrokenResource.php b/lib/models/resources/BrokenResource.php index 38d0c81..ad84d4d 100644 --- a/lib/models/resources/BrokenResource.php +++ b/lib/models/resources/BrokenResource.php @@ -30,14 +30,15 @@ * @property I18NString|null $description database column * @property int $requestable database column * @property int $lockable database column + * @property int $booking_plan_request database column * @property int $mkdate database column * @property int $chdate database column * @property int $sort_position database column - * @property SimpleORMapCollection|ResourceProperty[] $properties has_many ResourceProperty - * @property SimpleORMapCollection|ResourcePermission[] $permissions has_many ResourcePermission - * @property SimpleORMapCollection|ResourceRequest[] $requests has_many ResourceRequest - * @property SimpleORMapCollection|ResourceBooking[] $bookings has_many ResourceBooking - * @property SimpleORMapCollection|Resource[] $children has_many Resource + * @property SimpleORMapCollection $properties has_many ResourceProperty + * @property SimpleORMapCollection $permissions has_many ResourcePermission + * @property SimpleORMapCollection $requests has_many ResourceRequest + * @property SimpleORMapCollection $bookings has_many ResourceBooking + * @property SimpleORMapCollection $children has_many Resource * @property ResourceCategory $category belongs_to ResourceCategory * @property Resource $parent belongs_to Resource * @property mixed $class_name additional field diff --git a/lib/models/resources/Building.php b/lib/models/resources/Building.php index 7f1402f..9c7534a 100644 --- a/lib/models/resources/Building.php +++ b/lib/models/resources/Building.php @@ -26,14 +26,15 @@ * @property I18NString|null $description database column * @property int $requestable database column * @property int $lockable database column + * @property int $booking_plan_request database column * @property int $mkdate database column * @property int $chdate database column * @property int $sort_position database column - * @property SimpleORMapCollection|ResourceProperty[] $properties has_many ResourceProperty - * @property SimpleORMapCollection|ResourcePermission[] $permissions has_many ResourcePermission - * @property SimpleORMapCollection|ResourceRequest[] $requests has_many ResourceRequest - * @property SimpleORMapCollection|ResourceBooking[] $bookings has_many ResourceBooking - * @property SimpleORMapCollection|Resource[] $children has_many Resource + * @property SimpleORMapCollection $properties has_many ResourceProperty + * @property SimpleORMapCollection $permissions has_many ResourcePermission + * @property SimpleORMapCollection $requests has_many ResourceRequest + * @property SimpleORMapCollection $bookings has_many ResourceBooking + * @property SimpleORMapCollection $children has_many Resource * @property ResourceCategory $category belongs_to ResourceCategory * @property Resource $parent belongs_to Resource * @property mixed $address additional field diff --git a/lib/models/resources/Location.php b/lib/models/resources/Location.php index 788b4b3..9078b71 100644 --- a/lib/models/resources/Location.php +++ b/lib/models/resources/Location.php @@ -23,14 +23,15 @@ * @property I18NString|null $description database column * @property int $requestable database column * @property int $lockable database column + * @property int $booking_plan_request database column * @property int $mkdate database column * @property int $chdate database column * @property int $sort_position database column - * @property SimpleORMapCollection|ResourceProperty[] $properties has_many ResourceProperty - * @property SimpleORMapCollection|ResourcePermission[] $permissions has_many ResourcePermission - * @property SimpleORMapCollection|ResourceRequest[] $requests has_many ResourceRequest - * @property SimpleORMapCollection|ResourceBooking[] $bookings has_many ResourceBooking - * @property SimpleORMapCollection|Resource[] $children has_many Resource + * @property SimpleORMapCollection $properties has_many ResourceProperty + * @property SimpleORMapCollection $permissions has_many ResourcePermission + * @property SimpleORMapCollection $requests has_many ResourceRequest + * @property SimpleORMapCollection $bookings has_many ResourceBooking + * @property SimpleORMapCollection $children has_many Resource * @property ResourceCategory $category belongs_to ResourceCategory * @property Resource $parent belongs_to Resource * @property mixed $geo_coordinates additional field diff --git a/lib/models/resources/Resource.php b/lib/models/resources/Resource.php index 661e8f4..c264053 100644 --- a/lib/models/resources/Resource.php +++ b/lib/models/resources/Resource.php @@ -28,14 +28,15 @@ * @property I18NString|null $description database column * @property int $requestable database column * @property int $lockable database column + * @property int $booking_plan_request database column * @property int $mkdate database column * @property int $chdate database column * @property int $sort_position database column - * @property SimpleORMapCollection|ResourceProperty[] $properties has_many ResourceProperty - * @property SimpleORMapCollection|ResourcePermission[] $permissions has_many ResourcePermission - * @property SimpleORMapCollection|ResourceRequest[] $requests has_many ResourceRequest - * @property SimpleORMapCollection|ResourceBooking[] $bookings has_many ResourceBooking - * @property SimpleORMapCollection|Resource[] $children has_many Resource + * @property SimpleORMapCollection $properties has_many ResourceProperty + * @property SimpleORMapCollection $permissions has_many ResourcePermission + * @property SimpleORMapCollection $requests has_many ResourceRequest + * @property SimpleORMapCollection $bookings has_many ResourceBooking + * @property SimpleORMapCollection $children has_many Resource * @property ResourceCategory $category belongs_to ResourceCategory * @property Resource $parent belongs_to Resource * @property mixed $class_name additional field diff --git a/lib/models/resources/ResourceBooking.php b/lib/models/resources/ResourceBooking.php index 49de381..45076eb 100644 --- a/lib/models/resources/ResourceBooking.php +++ b/lib/models/resources/ResourceBooking.php @@ -42,7 +42,7 @@ * @property string $booking_user_id database column * @property string $repetition_interval database column * @property string $weekdays database column - * @property SimpleORMapCollection|ResourceBookingInterval[] $time_intervals has_many ResourceBookingInterval + * @property SimpleORMapCollection $time_intervals has_many ResourceBookingInterval * @property Resource $resource belongs_to Resource * @property User $assigned_user belongs_to User * @property CourseDate $assigned_course_date belongs_to CourseDate diff --git a/lib/models/resources/ResourceCategory.php b/lib/models/resources/ResourceCategory.php index 476dcd9..a7d2b26 100644 --- a/lib/models/resources/ResourceCategory.php +++ b/lib/models/resources/ResourceCategory.php @@ -26,8 +26,8 @@ * @property string $class_name database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|ResourceCategoryProperty[] $property_links has_many ResourceCategoryProperty - * @property SimpleORMapCollection|ResourcePropertyDefinition[] $property_definitions has_and_belongs_to_many ResourcePropertyDefinition + * @property SimpleORMapCollection $property_links has_many ResourceCategoryProperty + * @property SimpleORMapCollection $property_definitions has_and_belongs_to_many ResourcePropertyDefinition */ class ResourceCategory extends SimpleORMap { diff --git a/lib/models/resources/ResourceLabel.php b/lib/models/resources/ResourceLabel.php index 1d1968d..d44c533 100644 --- a/lib/models/resources/ResourceLabel.php +++ b/lib/models/resources/ResourceLabel.php @@ -30,14 +30,15 @@ * @property I18NString|null $description database column * @property int $requestable database column * @property int $lockable database column + * @property int $booking_plan_request database column * @property int $mkdate database column * @property int $chdate database column * @property int $sort_position database column - * @property SimpleORMapCollection|ResourceProperty[] $properties has_many ResourceProperty - * @property SimpleORMapCollection|ResourcePermission[] $permissions has_many ResourcePermission - * @property SimpleORMapCollection|ResourceRequest[] $requests has_many ResourceRequest - * @property SimpleORMapCollection|ResourceBooking[] $bookings has_many ResourceBooking - * @property SimpleORMapCollection|Resource[] $children has_many Resource + * @property SimpleORMapCollection $properties has_many ResourceProperty + * @property SimpleORMapCollection $permissions has_many ResourcePermission + * @property SimpleORMapCollection $requests has_many ResourceRequest + * @property SimpleORMapCollection $bookings has_many ResourceBooking + * @property SimpleORMapCollection $children has_many Resource * @property ResourceCategory $category belongs_to ResourceCategory * @property Resource $parent belongs_to Resource * @property mixed $class_name additional field diff --git a/lib/models/resources/ResourcePropertyDefinition.php b/lib/models/resources/ResourcePropertyDefinition.php index b87e8e6..f878975 100644 --- a/lib/models/resources/ResourcePropertyDefinition.php +++ b/lib/models/resources/ResourcePropertyDefinition.php @@ -34,6 +34,7 @@ * @property int|null $property_group_pos database column * @property int $mkdate database column * @property int $chdate database column + * @property SimpleORMapCollection $properties has_many ResourceProperty * @property ResourcePropertyGroup|null $group belongs_to ResourcePropertyGroup */ diff --git a/lib/models/resources/ResourcePropertyGroup.php b/lib/models/resources/ResourcePropertyGroup.php index f6ea825..647497f 100644 --- a/lib/models/resources/ResourcePropertyGroup.php +++ b/lib/models/resources/ResourcePropertyGroup.php @@ -20,7 +20,7 @@ * @property int $position database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|ResourcePropertyDefinition[] $properties has_many ResourcePropertyDefinition + * @property SimpleORMapCollection $properties has_many ResourcePropertyDefinition */ class ResourcePropertyGroup extends SimpleORMap { diff --git a/lib/models/resources/ResourceRequest.php b/lib/models/resources/ResourceRequest.php index f46d08d..86289eb 100644 --- a/lib/models/resources/ResourceRequest.php +++ b/lib/models/resources/ResourceRequest.php @@ -37,8 +37,8 @@ * @property int $end database column * @property int $preparation_time database column * @property int $marked database column - * @property SimpleORMapCollection|ResourceRequestProperty[] $properties has_many ResourceRequestProperty - * @property SimpleORMapCollection|ResourceRequestAppointment[] $appointments has_many ResourceRequestAppointment + * @property SimpleORMapCollection $properties has_many ResourceRequestProperty + * @property SimpleORMapCollection $appointments has_many ResourceRequestAppointment * @property Resource $resource belongs_to Resource * @property ResourceCategory|null $category belongs_to ResourceCategory * @property User $user belongs_to User diff --git a/lib/models/resources/Room.php b/lib/models/resources/Room.php index c8e393c..4b1f85c 100644 --- a/lib/models/resources/Room.php +++ b/lib/models/resources/Room.php @@ -26,14 +26,15 @@ * @property I18NString|null $description database column * @property int $requestable database column * @property int $lockable database column + * @property int $booking_plan_request database column * @property int $mkdate database column * @property int $chdate database column * @property int $sort_position database column - * @property SimpleORMapCollection|ResourceProperty[] $properties has_many ResourceProperty - * @property SimpleORMapCollection|ResourcePermission[] $permissions has_many ResourcePermission - * @property SimpleORMapCollection|ResourceRequest[] $requests has_many ResourceRequest - * @property SimpleORMapCollection|ResourceBooking[] $bookings has_many ResourceBooking - * @property SimpleORMapCollection|Resource[] $children has_many Resource + * @property SimpleORMapCollection $properties has_many ResourceProperty + * @property SimpleORMapCollection $permissions has_many ResourcePermission + * @property SimpleORMapCollection $requests has_many ResourceRequest + * @property SimpleORMapCollection $bookings has_many ResourceBooking + * @property SimpleORMapCollection $children has_many Resource * @property ResourceCategory $category belongs_to ResourceCategory * @property Resource $parent belongs_to Resource * @property mixed $room_type additional field diff --git a/lib/models/resources/RoomRequest.php b/lib/models/resources/RoomRequest.php index 4ba11bc..384e0f7 100644 --- a/lib/models/resources/RoomRequest.php +++ b/lib/models/resources/RoomRequest.php @@ -26,8 +26,8 @@ * @property int $end database column * @property int $preparation_time database column * @property int $marked database column - * @property SimpleORMapCollection|ResourceRequestProperty[] $properties has_many ResourceRequestProperty - * @property SimpleORMapCollection|ResourceRequestAppointment[] $appointments has_many ResourceRequestAppointment + * @property SimpleORMapCollection $properties has_many ResourceRequestProperty + * @property SimpleORMapCollection $appointments has_many ResourceRequestAppointment * @property Room $room belongs_to Room * @property Resource $resource belongs_to Resource * @property ResourceCategory|null $category belongs_to ResourceCategory diff --git a/lib/models/resources/SeparableRoom.php b/lib/models/resources/SeparableRoom.php index d1bf125..b5931b0 100644 --- a/lib/models/resources/SeparableRoom.php +++ b/lib/models/resources/SeparableRoom.php @@ -20,7 +20,7 @@ * @property string $name database column * @property int $mkdate database column * @property int $chdate database column - * @property SimpleORMapCollection|SeparableRoomPart[] $parts has_many SeparableRoomPart + * @property SimpleORMapCollection $parts has_many SeparableRoomPart * @property Building $building belongs_to Building */ diff --git a/lib/models/vips/ClozeTask.php b/lib/models/vips/ClozeTask.php index 4e45d26..634d177 100644 --- a/lib/models/vips/ClozeTask.php +++ b/lib/models/vips/ClozeTask.php @@ -21,11 +21,11 @@ * @property int $mkdate database column * @property int $chdate database column * @property JSONArrayObject $options database column - * @property SimpleORMapCollection|VipsExerciseRef[] $exercise_refs has_many VipsExerciseRef - * @property SimpleORMapCollection|VipsSolution[] $solutions has_many VipsSolution + * @property SimpleORMapCollection $exercise_refs has_many VipsExerciseRef + * @property SimpleORMapCollection $solutions has_many VipsSolution * @property User $user belongs_to User * @property Folder $folder has_one Folder - * @property SimpleORMapCollection|VipsTest[] $tests has_and_belongs_to_many VipsTest + * @property SimpleORMapCollection $tests has_and_belongs_to_many VipsTest */ class ClozeTask extends Exercise { diff --git a/lib/models/vips/DummyExercise.php b/lib/models/vips/DummyExercise.php index daa9dc5..2f76f15 100644 --- a/lib/models/vips/DummyExercise.php +++ b/lib/models/vips/DummyExercise.php @@ -21,11 +21,11 @@ * @property int $mkdate database column * @property int $chdate database column * @property JSONArrayObject $options database column - * @property SimpleORMapCollection|VipsExerciseRef[] $exercise_refs has_many VipsExerciseRef - * @property SimpleORMapCollection|VipsSolution[] $solutions has_many VipsSolution + * @property SimpleORMapCollection $exercise_refs has_many VipsExerciseRef + * @property SimpleORMapCollection $solutions has_many VipsSolution * @property User $user belongs_to User * @property Folder $folder has_one Folder - * @property SimpleORMapCollection|VipsTest[] $tests has_and_belongs_to_many VipsTest + * @property SimpleORMapCollection $tests has_and_belongs_to_many VipsTest */ class DummyExercise extends Exercise { diff --git a/lib/models/vips/MatchingTask.php b/lib/models/vips/MatchingTask.php index 62d704f..ee645b7 100644 --- a/lib/models/vips/MatchingTask.php +++ b/lib/models/vips/MatchingTask.php @@ -21,11 +21,11 @@ * @property int $mkdate database column * @property int $chdate database column * @property JSONArrayObject $options database column - * @property SimpleORMapCollection|VipsExerciseRef[] $exercise_refs has_many VipsExerciseRef - * @property SimpleORMapCollection|VipsSolution[] $solutions has_many VipsSolution + * @property SimpleORMapCollection $exercise_refs has_many VipsExerciseRef + * @property SimpleORMapCollection $solutions has_many VipsSolution * @property User $user belongs_to User * @property Folder $folder has_one Folder - * @property SimpleORMapCollection|VipsTest[] $tests has_and_belongs_to_many VipsTest + * @property SimpleORMapCollection $tests has_and_belongs_to_many VipsTest */ class MatchingTask extends Exercise { diff --git a/lib/models/vips/MatrixChoiceTask.php b/lib/models/vips/MatrixChoiceTask.php index f6ca62c..b142565 100644 --- a/lib/models/vips/MatrixChoiceTask.php +++ b/lib/models/vips/MatrixChoiceTask.php @@ -21,11 +21,11 @@ * @property int $mkdate database column * @property int $chdate database column * @property JSONArrayObject $options database column - * @property SimpleORMapCollection|VipsExerciseRef[] $exercise_refs has_many VipsExerciseRef - * @property SimpleORMapCollection|VipsSolution[] $solutions has_many VipsSolution + * @property SimpleORMapCollection $exercise_refs has_many VipsExerciseRef + * @property SimpleORMapCollection $solutions has_many VipsSolution * @property User $user belongs_to User * @property Folder $folder has_one Folder - * @property SimpleORMapCollection|VipsTest[] $tests has_and_belongs_to_many VipsTest + * @property SimpleORMapCollection $tests has_and_belongs_to_many VipsTest */ class MatrixChoiceTask extends Exercise { diff --git a/lib/models/vips/MultipleChoiceTask.php b/lib/models/vips/MultipleChoiceTask.php index 90ba859..bbfe8ce 100644 --- a/lib/models/vips/MultipleChoiceTask.php +++ b/lib/models/vips/MultipleChoiceTask.php @@ -21,11 +21,11 @@ * @property int $mkdate database column * @property int $chdate database column * @property JSONArrayObject $options database column - * @property SimpleORMapCollection|VipsExerciseRef[] $exercise_refs has_many VipsExerciseRef - * @property SimpleORMapCollection|VipsSolution[] $solutions has_many VipsSolution + * @property SimpleORMapCollection $exercise_refs has_many VipsExerciseRef + * @property SimpleORMapCollection $solutions has_many VipsSolution * @property User $user belongs_to User * @property Folder $folder has_one Folder - * @property SimpleORMapCollection|VipsTest[] $tests has_and_belongs_to_many VipsTest + * @property SimpleORMapCollection $tests has_and_belongs_to_many VipsTest */ class MultipleChoiceTask extends Exercise { diff --git a/lib/models/vips/SequenceTask.php b/lib/models/vips/SequenceTask.php index b7aa908..a690066 100644 --- a/lib/models/vips/SequenceTask.php +++ b/lib/models/vips/SequenceTask.php @@ -21,11 +21,11 @@ * @property int $mkdate database column * @property int $chdate database column * @property JSONArrayObject $options database column - * @property SimpleORMapCollection|VipsExerciseRef[] $exercise_refs has_many VipsExerciseRef - * @property SimpleORMapCollection|VipsSolution[] $solutions has_many VipsSolution + * @property SimpleORMapCollection $exercise_refs has_many VipsExerciseRef + * @property SimpleORMapCollection $solutions has_many VipsSolution * @property User $user belongs_to User * @property Folder $folder has_one Folder - * @property SimpleORMapCollection|VipsTest[] $tests has_and_belongs_to_many VipsTest + * @property SimpleORMapCollection $tests has_and_belongs_to_many VipsTest */ class SequenceTask extends Exercise { diff --git a/lib/models/vips/SingleChoiceTask.php b/lib/models/vips/SingleChoiceTask.php index 1db425d..c275f53 100644 --- a/lib/models/vips/SingleChoiceTask.php +++ b/lib/models/vips/SingleChoiceTask.php @@ -21,11 +21,11 @@ * @property int $mkdate database column * @property int $chdate database column * @property JSONArrayObject $options database column - * @property SimpleORMapCollection|VipsExerciseRef[] $exercise_refs has_many VipsExerciseRef - * @property SimpleORMapCollection|VipsSolution[] $solutions has_many VipsSolution + * @property SimpleORMapCollection $exercise_refs has_many VipsExerciseRef + * @property SimpleORMapCollection $solutions has_many VipsSolution * @property User $user belongs_to User * @property Folder $folder has_one Folder - * @property SimpleORMapCollection|VipsTest[] $tests has_and_belongs_to_many VipsTest + * @property SimpleORMapCollection $tests has_and_belongs_to_many VipsTest */ class SingleChoiceTask extends Exercise { diff --git a/lib/models/vips/TextLineTask.php b/lib/models/vips/TextLineTask.php index 2a7dc18..490e52b 100644 --- a/lib/models/vips/TextLineTask.php +++ b/lib/models/vips/TextLineTask.php @@ -21,11 +21,11 @@ * @property int $mkdate database column * @property int $chdate database column * @property JSONArrayObject $options database column - * @property SimpleORMapCollection|VipsExerciseRef[] $exercise_refs has_many VipsExerciseRef - * @property SimpleORMapCollection|VipsSolution[] $solutions has_many VipsSolution + * @property SimpleORMapCollection $exercise_refs has_many VipsExerciseRef + * @property SimpleORMapCollection $solutions has_many VipsSolution * @property User $user belongs_to User * @property Folder $folder has_one Folder - * @property SimpleORMapCollection|VipsTest[] $tests has_and_belongs_to_many VipsTest + * @property SimpleORMapCollection $tests has_and_belongs_to_many VipsTest */ class TextLineTask extends Exercise { diff --git a/lib/models/vips/TextTask.php b/lib/models/vips/TextTask.php index 03aa088..dd2d189 100644 --- a/lib/models/vips/TextTask.php +++ b/lib/models/vips/TextTask.php @@ -21,11 +21,11 @@ * @property int $mkdate database column * @property int $chdate database column * @property JSONArrayObject $options database column - * @property SimpleORMapCollection|VipsExerciseRef[] $exercise_refs has_many VipsExerciseRef - * @property SimpleORMapCollection|VipsSolution[] $solutions has_many VipsSolution + * @property SimpleORMapCollection $exercise_refs has_many VipsExerciseRef + * @property SimpleORMapCollection $solutions has_many VipsSolution * @property User $user belongs_to User * @property Folder $folder has_one Folder - * @property SimpleORMapCollection|VipsTest[] $tests has_and_belongs_to_many VipsTest + * @property SimpleORMapCollection $tests has_and_belongs_to_many VipsTest */ class TextTask extends Exercise { diff --git a/lib/models/vips/VipsAssignment.php b/lib/models/vips/VipsAssignment.php index b737a4b..7810019 100644 --- a/lib/models/vips/VipsAssignment.php +++ b/lib/models/vips/VipsAssignment.php @@ -25,8 +25,8 @@ * @property JSONArrayObject $options database column * @property int|null $mkdate database column * @property int|null $chdate database column - * @property SimpleORMapCollection|VipsAssignmentAttempt[] $assignment_attempts has_many VipsAssignmentAttempt - * @property SimpleORMapCollection|VipsSolution[] $solutions has_many VipsSolution + * @property SimpleORMapCollection $assignment_attempts has_many VipsAssignmentAttempt + * @property SimpleORMapCollection $solutions has_many VipsSolution * @property Course|null $course belongs_to Course * @property VipsBlock|null $block belongs_to VipsBlock * @property VipsTest $test belongs_to VipsTest diff --git a/lib/models/vips/VipsBlock.php b/lib/models/vips/VipsBlock.php index 2179254..94163f7 100644 --- a/lib/models/vips/VipsBlock.php +++ b/lib/models/vips/VipsBlock.php @@ -18,7 +18,7 @@ * @property string|null $group_id database column * @property int $visible database column * @property float|null $weight database column - * @property SimpleORMapCollection|VipsAssignment[] $assignments has_many VipsAssignment + * @property SimpleORMapCollection $assignments has_many VipsAssignment * @property Course $course belongs_to Course * @property Statusgruppen|null $group belongs_to Statusgruppen */ diff --git a/lib/models/vips/VipsGroup.php b/lib/models/vips/VipsGroup.php index 8b43c2e..e5eb504 100644 --- a/lib/models/vips/VipsGroup.php +++ b/lib/models/vips/VipsGroup.php @@ -27,8 +27,8 @@ * @property int $calendar_group database column * @property string|null $name_w database column * @property string|null $name_m database column - * @property SimpleORMapCollection|VipsGroupMember[] $members has_many VipsGroupMember - * @property SimpleORMapCollection|VipsGroupMember[] $current_members has_many VipsGroupMember + * @property SimpleORMapCollection $members has_many VipsGroupMember + * @property SimpleORMapCollection $current_members has_many VipsGroupMember * @property Course $course belongs_to Course */ class VipsGroup extends SimpleORMap diff --git a/lib/models/vips/VipsTest.php b/lib/models/vips/VipsTest.php index 178b352..1627803 100644 --- a/lib/models/vips/VipsTest.php +++ b/lib/models/vips/VipsTest.php @@ -19,10 +19,10 @@ * @property int $mkdate database column * @property int $chdate database column * @property string|null $options database column - * @property SimpleORMapCollection|VipsAssignment[] $assignments has_many VipsAssignment - * @property SimpleORMapCollection|VipsExerciseRef[] $exercise_refs has_many VipsExerciseRef + * @property SimpleORMapCollection $assignments has_many VipsAssignment + * @property SimpleORMapCollection $exercise_refs has_many VipsExerciseRef * @property User $user belongs_to User - * @property SimpleORMapCollection|Exercise[] $exercises has_and_belongs_to_many Exercise + * @property SimpleORMapCollection $exercises has_and_belongs_to_many Exercise */ class VipsTest extends SimpleORMap { -- cgit v1.0