execute sorm:describe for 6.0, re #3804

Merge request studip/studip!4044

9 files changed, 50 insertions, 24 deletions

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<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 \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<Block> $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<PeerReview> $_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<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 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<PeerReview> $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<Task> $tasks has_many Task
+ * @property \SimpleORMapCollection<PeerReviewProcess> $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