Update entities

5 years ago · e046558eb8
parent fe4bab38b1
commit e046558eb8
30 changed files with 73 additions and 110 deletions
--- a/src/CoreBundle/Entity/Career.php
+++ b/src/CoreBundle/Entity/Career.php
@ -6,6 +6,7 @@ namespace Chamilo\CoreBundle\Entity;

 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Timestampable\Traits\TimestampableEntity;
+use Symfony\Component\Validator\Constraints as Assert;

 /**
 * Career.
@ -27,6 +28,7 @@ class Career
    protected $id;

    /**
+     * @Assert\NotBlank()
     * @ORM\Column(name="name", type="string", length=255, nullable=false)
     */
    protected string $name;
--- a/src/CoreBundle/Entity/CourseRequest.php
+++ b/src/CoreBundle/Entity/CourseRequest.php
@ -6,6 +6,7 @@ namespace Chamilo\CoreBundle\Entity;

 use Chamilo\CoreBundle\Traits\UserTrait;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Validator\Constraints as Assert;

 /**
 * CourseRequest.
@ -27,19 +28,16 @@ class CourseRequest
    protected $id;

    /**
-     * @var User
-     *
     * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\User", cascade={"persist"})
     * @ORM\JoinColumn(name="user_id", referencedColumnName="id")
     */
-    protected $user;
+    protected User $user;

    /**
-     * @var string
-     *
+     * @Assert\NotBlank()
     * @ORM\Column(name="code", type="string", length=40, nullable=false)
     */
-    protected $code;
+    protected string $code;

    /**
     * @var string
--- a/src/CoreBundle/Entity/ExtraField.php
+++ b/src/CoreBundle/Entity/ExtraField.php
@ -75,11 +75,9 @@ class ExtraField // extends BaseAttribute
    protected ?string $displayText;

    /**
-     * @var string
-     *
     * @ORM\Column(name="helper_text", type="text", nullable=true, unique=false)
     */
-    protected $helperText;
+    protected ?string $helperText;

    /**
     * @var string
--- a/src/CoreBundle/Entity/ExtraFieldSavedSearch.php
+++ b/src/CoreBundle/Entity/ExtraFieldSavedSearch.php
@ -35,12 +35,10 @@ class ExtraFieldSavedSearch
    protected ExtraField $field;

    /**
-     * @var User
-     *
     * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\User")
     * @ORM\JoinColumn(name="user_id", referencedColumnName="id")
     */
-    protected $user;
+    protected User $user;

    /**
     * @var string
--- a/src/CoreBundle/Entity/GradebookCategory.php
+++ b/src/CoreBundle/Entity/GradebookCategory.php
@ -30,7 +30,7 @@ class GradebookCategory
    protected $id;

    /**
-     * @Assert\NotBlank()
+     * @Assert\NotBlank
     *
     * @ORM\Column(name="name", type="text", nullable=false)
     */
--- a/src/CoreBundle/Entity/Language.php
+++ b/src/CoreBundle/Entity/Language.php
@ -6,6 +6,7 @@ namespace Chamilo\CoreBundle\Entity;

 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Validator\Constraints as Assert;

 /**
 * Language.
@ -28,25 +29,25 @@ class Language
    protected $id;

    /**
-     * @var string
+     * @Assert\NotBlank()
     *
     * @ORM\Column(name="original_name", type="string", length=255, nullable=true)
     */
-    protected $originalName;
+    protected string $originalName;

    /**
-     * @var string
+     * @Assert\NotBlank()
     *
     * @ORM\Column(name="english_name", type="string", length=255, nullable=true)
     */
-    protected $englishName;
+    protected string $englishName;

    /**
-     * @var string
+     * @Assert\NotBlank()
     *
     * @ORM\Column(name="isocode", type="string", length=10, nullable=true)
     */
-    protected $isocode;
+    protected string $isocode;

    /**
     * @var bool
--- a/src/CoreBundle/Entity/Message.php
+++ b/src/CoreBundle/Entity/Message.php
@ -369,7 +369,7 @@ class Message
        return $this;
    }

-    public function setParent(self $parent): self
+    public function setParent(self $parent = null): self
    {
        $this->parent = $parent;

@ -380,10 +380,8 @@ class Message
     * Get an excerpt from the content.
     *
     * @param int $length Optional. Length of the excerpt.
-     *
-     * @return string
     */
-    public function getExcerpt($length = 50)
+    public function getExcerpt(int $length = 50): string
    {
        $striped = strip_tags($this->content);
        $replaced = str_replace(["\r\n", "\n"], ' ', $striped);
--- a/src/CoreBundle/Entity/Promotion.php
+++ b/src/CoreBundle/Entity/Promotion.php
@ -6,6 +6,7 @@ namespace Chamilo\CoreBundle\Entity;

 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Timestampable\Traits\TimestampableEntity;
+use Symfony\Component\Validator\Constraints as Assert;

 /**
 * Promotion.
@ -27,6 +28,7 @@ class Promotion
    protected $id;

    /**
+     * @Assert\NotBlank()
     * @ORM\Column(name="name", type="string", length=255, nullable=false)
     */
    protected string $name;
--- a/src/CoreBundle/Entity/ResourceFile.php
+++ b/src/CoreBundle/Entity/ResourceFile.php
@ -82,13 +82,13 @@ class ResourceFile
     *
     * @ORM\Column(type="string", length=255)
     */
-    protected string $name;
+    protected $name;

    /**
     * @Groups({"resource_file:read", "resource_node:read", "document:read"})
     * @ORM\Column(type="text", nullable=true)
     */
-    protected string $mimeType;
+    protected $mimeType;

    /**
     * @Groups({"resource_file:read", "resource_node:read", "document:read"})
@ -129,11 +129,9 @@ class ResourceFile
    protected $file;

    /**
-     * @var string
-     *
     * @ORM\Column(name="crop", type="string", length=255, nullable=true)
     */
-    protected $crop;
+    protected ?string $crop;

    /**
     * @ORM\OneToOne(targetEntity="Chamilo\CoreBundle\Entity\ResourceNode", mappedBy="resourceFile")
@ -141,32 +139,24 @@ class ResourceFile
    protected ResourceNode $resourceNode;

    /**
-     * @var array
-     *
     * @ORM\Column(type="array", nullable=true)
     */
-    protected $metadata;
+    protected ?array $metadata;

    /**
-     * @var bool
-     *
     * @Groups({"resource_file:read", "resource_node:read", "document:read"})
     */
-    protected $image;
+    protected ?bool $image;

    /**
-     * @var bool
-     *
     * @Groups({"resource_file:read", "resource_node:read", "document:read"})
     */
-    protected $video;
+    protected ?bool $video;

    /**
-     * @var string
-     *
     * @ORM\Column(name="description", type="text", nullable=true)
     */
-    protected $description;
+    protected ?string $description;

    /**
     * Constructor.
--- a/src/CoreBundle/Entity/Room.php
+++ b/src/CoreBundle/Entity/Room.php
@ -5,6 +5,7 @@
 namespace Chamilo\CoreBundle\Entity;

 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Validator\Constraints as Assert;

 /**
 * Room.
@ -24,6 +25,7 @@ class Room
    protected $id;

    /**
+     * @Assert\NotBlank()
     * @ORM\Column(name="title", type="string", length=255, nullable=true, unique=false)
     */
    protected string $title;
--- a/src/CoreBundle/Entity/Tool.php
+++ b/src/CoreBundle/Entity/Tool.php
@ -7,6 +7,7 @@ namespace Chamilo\CoreBundle\Entity;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Validator\Constraints as Assert;

 /**
 * Tool.
@ -26,6 +27,7 @@ class Tool
    protected $id;

    /**
+     * @Assert\NotBlank()
     * @ORM\Column(name="name", type="string", nullable=false, unique=true)
     */
    protected string $name;
--- a/src/CoreBundle/Entity/Usergroup.php
+++ b/src/CoreBundle/Entity/Usergroup.php
@ -8,6 +8,7 @@ use ApiPlatform\Core\Annotation\ApiResource;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Timestampable\Traits\TimestampableEntity;
+use Symfony\Component\Validator\Constraints as Assert;

 /**
 * @ApiResource(
@ -32,11 +33,11 @@ class Usergroup
    protected $id;

    /**
-     * @var string
+     * @Assert\NotBlank()
     *
     * @ORM\Column(name="name", type="string", length=255, nullable=false, unique=false)
     */
-    protected $name;
+    protected string $name;

    /**
     * @var string
--- a/src/CourseBundle/Entity/CCourseDescription.php
+++ b/src/CourseBundle/Entity/CCourseDescription.php
@ -43,11 +43,9 @@ class CCourseDescription extends AbstractResource implements ResourceInterface
    protected string $title;

    /**
-     * @var string
-     *
     * @ORM\Column(name="content", type="text", nullable=true)
     */
-    protected $content;
+    protected ?string $content;

    /**
     * @var int
--- a/src/CourseBundle/Entity/CCourseSetting.php
+++ b/src/CourseBundle/Entity/CCourseSetting.php
@ -56,7 +56,7 @@ class CCourseSetting
    /**
     * @ORM\Column(name="category", type="string", length=255, nullable=true)
     */
-    protected ? string $category;
+    protected ?string $category;

    /**
     * @ORM\Column(name="value", type="text", nullable=true)
--- a/src/CourseBundle/Entity/CForumAttachment.php
+++ b/src/CourseBundle/Entity/CForumAttachment.php
@ -45,11 +45,9 @@ class CForumAttachment extends AbstractResource implements ResourceInterface
    protected $path;

    /**
-     * @var string
-     *
     * @ORM\Column(name="comment", type="text", nullable=true)
     */
-    protected $comment;
+    protected ?string $comment;

    /**
     * @var int
--- a/src/CourseBundle/Entity/CForumPost.php
+++ b/src/CourseBundle/Entity/CForumPost.php
@ -9,6 +9,7 @@ use Chamilo\CoreBundle\Entity\ResourceInterface;
 use Chamilo\CoreBundle\Entity\User;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Validator\Constraints as Assert;

 /**
 * CForumPost.
@ -48,6 +49,7 @@ class CForumPost extends AbstractResource implements ResourceInterface
    protected $cId;

    /**
+     * @Assert\NotBlank()
     * @ORM\Column(name="post_title", type="string", length=250, nullable=true)
     */
    protected string $postTitle;
--- a/src/CourseBundle/Entity/CGroupRelTutor.php
+++ b/src/CourseBundle/Entity/CGroupRelTutor.php
@ -37,20 +37,16 @@ class CGroupRelTutor
    protected $cId;

    /**
-     * @var User
-     *
     * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\User", inversedBy="courseGroupsAsTutor")
     * @ORM\JoinColumn(name="user_id", referencedColumnName="id", nullable=false)
     */
-    protected $user;
+    protected User $user;

    /**
-     * @var CGroup
-     *
     * @ORM\ManyToOne(targetEntity="CGroup", inversedBy="tutors")
     * @ORM\JoinColumn(name="group_id", referencedColumnName="iid", nullable=false)
     */
-    protected $group;
+    protected CGroup $group;

    /**
     * Set userId.
--- a/src/CourseBundle/Entity/CGroupRelUser.php
+++ b/src/CourseBundle/Entity/CGroupRelUser.php
@ -40,20 +40,16 @@ class CGroupRelUser
    protected $cId;

    /**
-     * @var User
-     *
     * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\User", inversedBy="courseGroupsAsMember")
     * @ORM\JoinColumn(name="user_id", referencedColumnName="id", nullable=false)
     */
-    protected $user;
+    protected User $user;

    /**
-     * @var CGroup
-     *
     * @ORM\ManyToOne(targetEntity="CGroup", inversedBy="members")
     * @ORM\JoinColumn(name="group_id", referencedColumnName="iid", nullable=false)
     */
-    protected $group;
+    protected CGroup $group;

    /**
     * @var int
--- a/src/CourseBundle/Entity/CLink.php
+++ b/src/CourseBundle/Entity/CLink.php
@ -36,7 +36,7 @@ class CLink extends AbstractResource implements ResourceInterface
     * @Assert\NotBlank()
     * @ORM\Column(name="title", type="string", length=150, nullable=true)
     */
-    protected string  $title;
+    protected string $title;

    /**
     * @ORM\Column(name="description", type="text", nullable=true)
--- a/src/CourseBundle/Entity/CLpCategoryUser.php
+++ b/src/CourseBundle/Entity/CLpCategoryUser.php
@ -31,15 +31,13 @@ class CLpCategoryUser
     * @ORM\ManyToOne(targetEntity="Chamilo\CourseBundle\Entity\CLpCategory", inversedBy="users")
     * @ORM\JoinColumn(name="category_id", referencedColumnName="iid")
     */
-    protected $category;
+    protected CLpCategory $category;

    /**
-     * @var User
-     *
     * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\User")
     * @ORM\JoinColumn(name="user_id", referencedColumnName="id")
     */
-    protected $user;
+    protected User $user;

    /**
     * @return string
--- a/src/CourseBundle/Entity/CNotebook.php
+++ b/src/CourseBundle/Entity/CNotebook.php
@ -8,6 +8,7 @@ use Chamilo\CoreBundle\Entity\AbstractResource;
 use Chamilo\CoreBundle\Entity\ResourceInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
+use Symfony\Component\Validator\Constraints as Assert;

 /**
 * CNotebook.
@ -57,11 +58,13 @@ class CNotebook extends AbstractResource implements ResourceInterface
    protected $sessionId;

    /**
+     * @Assert\NotBlank()
     * @ORM\Column(name="title", type="string", length=255, nullable=false)
     */
    protected string $title;

    /**
+     * @Assert\NotBlank()
     * @ORM\Column(name="description", type="text", nullable=false)
     */
    protected string $description;
--- a/src/CourseBundle/Entity/CQuizAnswer.php
+++ b/src/CourseBundle/Entity/CQuizAnswer.php
@ -5,6 +5,7 @@
 namespace Chamilo\CourseBundle\Entity;

 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Validator\Constraints as Assert;

 /**
 * CQuizAnswer.
@ -44,11 +45,10 @@ class CQuizAnswer
    protected $questionId;

    /**
-     * @var string
-     *
+     * @Assert\NotBlank()
     * @ORM\Column(name="answer", type="text", nullable=false)
     */
-    protected $answer;
+    protected string $answer;

    /**
     * @var int
--- a/src/CourseBundle/Entity/CQuizQuestionCategory.php
+++ b/src/CourseBundle/Entity/CQuizQuestionCategory.php
@ -12,6 +12,7 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Validator\Constraints as Assert;

 /**
 * CQuizQuestionCategory.
@ -38,18 +39,16 @@ class CQuizQuestionCategory extends AbstractResource implements ResourceInterfac
    protected $iid;

    /**
-     * @var string
+     * @Assert\NotBlank()
     *
     * @ORM\Column(name="title", type="string", length=255, nullable=false)
     */
-    protected $title;
+    protected string $title;

    /**
-     * @var string
-     *
     * @ORM\Column(name="description", type="text", nullable=true)
     */
-    protected $description;
+    protected ?string $description;

    /**
     * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\Course")
--- a/src/CourseBundle/Entity/CQuizQuestionOption.php
+++ b/src/CourseBundle/Entity/CQuizQuestionOption.php
@ -34,6 +34,7 @@ class CQuizQuestionOption
     * @ORM\Column(name="c_id", type="integer")
     */
    protected $cId;
+
    /**
     * @var int
     *
--- a/src/CourseBundle/Entity/CStudentPublicationCorrection.php
+++ b/src/CourseBundle/Entity/CStudentPublicationCorrection.php
@ -27,11 +27,10 @@ class CStudentPublicationCorrection extends AbstractResource implements Resource
    protected $id;

    /**
-     * @var string
     * @Assert\NotBlank()
     * @ORM\Column(name="title", type="string", length=255, nullable=true)
     */
-    protected $title;
+    protected string $title;

    public function __construct()
    {
--- a/src/CourseBundle/Entity/CSurvey.php
+++ b/src/CourseBundle/Entity/CSurvey.php
@ -101,18 +101,14 @@ class CSurvey extends AbstractResource implements ResourceInterface
    protected $template;

    /**
-     * @var string
-     *
     * @ORM\Column(name="intro", type="text", nullable=true)
     */
-    protected $intro;
+    protected ?string $intro;

    /**
-     * @var string
-     *
     * @ORM\Column(name="surveythanks", type="text", nullable=true)
     */
-    protected $surveyThanks;
+    protected ?string $surveyThanks;

    /**
     * @var \DateTime
--- a/src/CourseBundle/Entity/CSurveyQuestion.php
+++ b/src/CourseBundle/Entity/CSurveyQuestion.php
@ -6,6 +6,7 @@ namespace Chamilo\CourseBundle\Entity;

 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Validator\Constraints as Assert;

 /**
 * CSurveyQuestion.
@ -66,18 +67,16 @@ class CSurveyQuestion
    protected $surveyId;

    /**
-     * @var string
+     * @Assert\NotBlank()
     *
     * @ORM\Column(name="survey_question", type="text", nullable=false)
     */
-    protected $surveyQuestion;
+    protected string $surveyQuestion;

    /**
-     * @var string
-     *
     * @ORM\Column(name="survey_question_comment", type="text", nullable=false)
     */
-    protected $surveyQuestionComment;
+    protected ?string $surveyQuestionComment;

    /**
     * @var string
--- a/src/CourseBundle/Entity/CThematicAdvance.php
+++ b/src/CourseBundle/Entity/CThematicAdvance.php
@ -40,27 +40,21 @@ class CThematicAdvance //extends AbstractResource implements ResourceInterface
    protected $cId;

    /**
-     * @var CThematic
-     *
     * @ORM\ManyToOne(targetEntity="Chamilo\CourseBundle\Entity\CThematic")
     * @ORM\JoinColumn(name="thematic_id", referencedColumnName="iid")
     */
-    protected $thematic;
+    protected CThematic $thematic;

    /**
-     * @var CAttendance
-     *
     * @ORM\ManyToOne(targetEntity="Chamilo\CourseBundle\Entity\CAttendance")
     * @ORM\JoinColumn(name="attendance_id", referencedColumnName="iid")
     */
-    protected $attendance;
+    protected CAttendance $attendance;

    /**
-     * @var string
-     *
     * @ORM\Column(name="content", type="text", nullable=true)
     */
-    protected $content;
+    protected ?string $content;

    /**
     * @var \DateTime
--- a/src/CourseBundle/Entity/CThematicPlan.php
+++ b/src/CourseBundle/Entity/CThematicPlan.php
@ -33,13 +33,11 @@ class CThematicPlan //extends AbstractResource implements ResourceInterface
    protected $iid;

    /**
-     * @var string
-     *
     * @Assert\NotBlank()
     *
     * @ORM\Column(name="title", type="string", length=255, nullable=false)
     */
-    protected $title;
+    protected string $title;

    /**
     * @var int
@ -49,19 +47,15 @@ class CThematicPlan //extends AbstractResource implements ResourceInterface
    protected $cId;

    /**
-     * @var CThematic
-     *
     * @ORM\ManyToOne(targetEntity="Chamilo\CourseBundle\Entity\CThematic", inversedBy="plans")
     * @ORM\JoinColumn(name="thematic_id", referencedColumnName="iid")
     */
-    protected $thematic;
+    protected CThematic $thematic;

    /**
-     * @var string
-     *
     * @ORM\Column(name="description", type="text", nullable=true)
     */
-    protected $description;
+    protected ?string $description;

    /**
     * @var int
--- a/src/CourseBundle/Entity/CWiki.php
+++ b/src/CourseBundle/Entity/CWiki.php
@ -58,20 +58,18 @@ class CWiki extends AbstractResource implements ResourceInterface
    protected $reflink;

    /**
-     * @var string
-     *
     * @Assert\NotBlank()
     *
     * @ORM\Column(name="title", type="string", length=255, nullable=false)
     */
-    protected $title;
+    protected string $title;

    /**
-     * @var string
+     * @Assert\NotBlank()
     *
     * @ORM\Column(name="content", type="text", nullable=false)
     */
-    protected $content;
+    protected string $content;

    /**
     * @var int