Update entities

pull/3768/head
Julio Montoya 5 years ago
parent fe4bab38b1
commit e046558eb8
  1. 2
      src/CoreBundle/Entity/Career.php
  2. 10
      src/CoreBundle/Entity/CourseRequest.php
  3. 4
      src/CoreBundle/Entity/ExtraField.php
  4. 4
      src/CoreBundle/Entity/ExtraFieldSavedSearch.php
  5. 2
      src/CoreBundle/Entity/GradebookCategory.php
  6. 13
      src/CoreBundle/Entity/Language.php
  7. 6
      src/CoreBundle/Entity/Message.php
  8. 2
      src/CoreBundle/Entity/Promotion.php
  9. 24
      src/CoreBundle/Entity/ResourceFile.php
  10. 2
      src/CoreBundle/Entity/Room.php
  11. 2
      src/CoreBundle/Entity/Tool.php
  12. 5
      src/CoreBundle/Entity/Usergroup.php
  13. 4
      src/CourseBundle/Entity/CCourseDescription.php
  14. 2
      src/CourseBundle/Entity/CCourseSetting.php
  15. 4
      src/CourseBundle/Entity/CForumAttachment.php
  16. 2
      src/CourseBundle/Entity/CForumPost.php
  17. 8
      src/CourseBundle/Entity/CGroupRelTutor.php
  18. 8
      src/CourseBundle/Entity/CGroupRelUser.php
  19. 6
      src/CourseBundle/Entity/CLpCategoryUser.php
  20. 3
      src/CourseBundle/Entity/CNotebook.php
  21. 6
      src/CourseBundle/Entity/CQuizAnswer.php
  22. 9
      src/CourseBundle/Entity/CQuizQuestionCategory.php
  23. 1
      src/CourseBundle/Entity/CQuizQuestionOption.php
  24. 3
      src/CourseBundle/Entity/CStudentPublicationCorrection.php
  25. 8
      src/CourseBundle/Entity/CSurvey.php
  26. 9
      src/CourseBundle/Entity/CSurveyQuestion.php
  27. 12
      src/CourseBundle/Entity/CThematicAdvance.php
  28. 12
      src/CourseBundle/Entity/CThematicPlan.php
  29. 8
      src/CourseBundle/Entity/CWiki.php

@ -6,6 +6,7 @@ namespace Chamilo\CoreBundle\Entity;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Gedmo\Timestampable\Traits\TimestampableEntity; use Gedmo\Timestampable\Traits\TimestampableEntity;
use Symfony\Component\Validator\Constraints as Assert;
/** /**
* Career. * Career.
@ -27,6 +28,7 @@ class Career
protected $id; protected $id;
/** /**
* @Assert\NotBlank()
* @ORM\Column(name="name", type="string", length=255, nullable=false) * @ORM\Column(name="name", type="string", length=255, nullable=false)
*/ */
protected string $name; protected string $name;

@ -6,6 +6,7 @@ namespace Chamilo\CoreBundle\Entity;
use Chamilo\CoreBundle\Traits\UserTrait; use Chamilo\CoreBundle\Traits\UserTrait;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Validator\Constraints as Assert;
/** /**
* CourseRequest. * CourseRequest.
@ -27,19 +28,16 @@ class CourseRequest
protected $id; protected $id;
/** /**
* @var User
*
* @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\User", cascade={"persist"}) * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\User", cascade={"persist"})
* @ORM\JoinColumn(name="user_id", referencedColumnName="id") * @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) * @ORM\Column(name="code", type="string", length=40, nullable=false)
*/ */
protected $code; protected string $code;
/** /**
* @var string * @var string

@ -75,11 +75,9 @@ class ExtraField // extends BaseAttribute
protected ?string $displayText; protected ?string $displayText;
/** /**
* @var string
*
* @ORM\Column(name="helper_text", type="text", nullable=true, unique=false) * @ORM\Column(name="helper_text", type="text", nullable=true, unique=false)
*/ */
protected $helperText; protected ?string $helperText;
/** /**
* @var string * @var string

@ -35,12 +35,10 @@ class ExtraFieldSavedSearch
protected ExtraField $field; protected ExtraField $field;
/** /**
* @var User
*
* @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\User") * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\User")
* @ORM\JoinColumn(name="user_id", referencedColumnName="id") * @ORM\JoinColumn(name="user_id", referencedColumnName="id")
*/ */
protected $user; protected User $user;
/** /**
* @var string * @var string

@ -30,7 +30,7 @@ class GradebookCategory
protected $id; protected $id;
/** /**
* @Assert\NotBlank() * @Assert\NotBlank
* *
* @ORM\Column(name="name", type="text", nullable=false) * @ORM\Column(name="name", type="text", nullable=false)
*/ */

@ -6,6 +6,7 @@ namespace Chamilo\CoreBundle\Entity;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Validator\Constraints as Assert;
/** /**
* Language. * Language.
@ -28,25 +29,25 @@ class Language
protected $id; protected $id;
/** /**
* @var string * @Assert\NotBlank()
* *
* @ORM\Column(name="original_name", type="string", length=255, nullable=true) * @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) * @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) * @ORM\Column(name="isocode", type="string", length=10, nullable=true)
*/ */
protected $isocode; protected string $isocode;
/** /**
* @var bool * @var bool

@ -369,7 +369,7 @@ class Message
return $this; return $this;
} }
public function setParent(self $parent): self public function setParent(self $parent = null): self
{ {
$this->parent = $parent; $this->parent = $parent;
@ -380,10 +380,8 @@ class Message
* Get an excerpt from the content. * Get an excerpt from the content.
* *
* @param int $length Optional. Length of the excerpt. * @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); $striped = strip_tags($this->content);
$replaced = str_replace(["\r\n", "\n"], ' ', $striped); $replaced = str_replace(["\r\n", "\n"], ' ', $striped);

@ -6,6 +6,7 @@ namespace Chamilo\CoreBundle\Entity;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Gedmo\Timestampable\Traits\TimestampableEntity; use Gedmo\Timestampable\Traits\TimestampableEntity;
use Symfony\Component\Validator\Constraints as Assert;
/** /**
* Promotion. * Promotion.
@ -27,6 +28,7 @@ class Promotion
protected $id; protected $id;
/** /**
* @Assert\NotBlank()
* @ORM\Column(name="name", type="string", length=255, nullable=false) * @ORM\Column(name="name", type="string", length=255, nullable=false)
*/ */
protected string $name; protected string $name;

@ -82,13 +82,13 @@ class ResourceFile
* *
* @ORM\Column(type="string", length=255) * @ORM\Column(type="string", length=255)
*/ */
protected string $name; protected $name;
/** /**
* @Groups({"resource_file:read", "resource_node:read", "document:read"}) * @Groups({"resource_file:read", "resource_node:read", "document:read"})
* @ORM\Column(type="text", nullable=true) * @ORM\Column(type="text", nullable=true)
*/ */
protected string $mimeType; protected $mimeType;
/** /**
* @Groups({"resource_file:read", "resource_node:read", "document:read"}) * @Groups({"resource_file:read", "resource_node:read", "document:read"})
@ -129,11 +129,9 @@ class ResourceFile
protected $file; protected $file;
/** /**
* @var string
*
* @ORM\Column(name="crop", type="string", length=255, nullable=true) * @ORM\Column(name="crop", type="string", length=255, nullable=true)
*/ */
protected $crop; protected ?string $crop;
/** /**
* @ORM\OneToOne(targetEntity="Chamilo\CoreBundle\Entity\ResourceNode", mappedBy="resourceFile") * @ORM\OneToOne(targetEntity="Chamilo\CoreBundle\Entity\ResourceNode", mappedBy="resourceFile")
@ -141,32 +139,24 @@ class ResourceFile
protected ResourceNode $resourceNode; protected ResourceNode $resourceNode;
/** /**
* @var array
*
* @ORM\Column(type="array", nullable=true) * @ORM\Column(type="array", nullable=true)
*/ */
protected $metadata; protected ?array $metadata;
/** /**
* @var bool
*
* @Groups({"resource_file:read", "resource_node:read", "document:read"}) * @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"}) * @Groups({"resource_file:read", "resource_node:read", "document:read"})
*/ */
protected $video; protected ?bool $video;
/** /**
* @var string
*
* @ORM\Column(name="description", type="text", nullable=true) * @ORM\Column(name="description", type="text", nullable=true)
*/ */
protected $description; protected ?string $description;
/** /**
* Constructor. * Constructor.

@ -5,6 +5,7 @@
namespace Chamilo\CoreBundle\Entity; namespace Chamilo\CoreBundle\Entity;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Validator\Constraints as Assert;
/** /**
* Room. * Room.
@ -24,6 +25,7 @@ class Room
protected $id; protected $id;
/** /**
* @Assert\NotBlank()
* @ORM\Column(name="title", type="string", length=255, nullable=true, unique=false) * @ORM\Column(name="title", type="string", length=255, nullable=true, unique=false)
*/ */
protected string $title; protected string $title;

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

@ -8,6 +8,7 @@ use ApiPlatform\Core\Annotation\ApiResource;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Gedmo\Timestampable\Traits\TimestampableEntity; use Gedmo\Timestampable\Traits\TimestampableEntity;
use Symfony\Component\Validator\Constraints as Assert;
/** /**
* @ApiResource( * @ApiResource(
@ -32,11 +33,11 @@ class Usergroup
protected $id; protected $id;
/** /**
* @var string * @Assert\NotBlank()
* *
* @ORM\Column(name="name", type="string", length=255, nullable=false, unique=false) * @ORM\Column(name="name", type="string", length=255, nullable=false, unique=false)
*/ */
protected $name; protected string $name;
/** /**
* @var string * @var string

@ -43,11 +43,9 @@ class CCourseDescription extends AbstractResource implements ResourceInterface
protected string $title; protected string $title;
/** /**
* @var string
*
* @ORM\Column(name="content", type="text", nullable=true) * @ORM\Column(name="content", type="text", nullable=true)
*/ */
protected $content; protected ?string $content;
/** /**
* @var int * @var int

@ -56,7 +56,7 @@ class CCourseSetting
/** /**
* @ORM\Column(name="category", type="string", length=255, nullable=true) * @ORM\Column(name="category", type="string", length=255, nullable=true)
*/ */
protected ? string $category; protected ?string $category;
/** /**
* @ORM\Column(name="value", type="text", nullable=true) * @ORM\Column(name="value", type="text", nullable=true)

@ -45,11 +45,9 @@ class CForumAttachment extends AbstractResource implements ResourceInterface
protected $path; protected $path;
/** /**
* @var string
*
* @ORM\Column(name="comment", type="text", nullable=true) * @ORM\Column(name="comment", type="text", nullable=true)
*/ */
protected $comment; protected ?string $comment;
/** /**
* @var int * @var int

@ -9,6 +9,7 @@ use Chamilo\CoreBundle\Entity\ResourceInterface;
use Chamilo\CoreBundle\Entity\User; use Chamilo\CoreBundle\Entity\User;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Validator\Constraints as Assert;
/** /**
* CForumPost. * CForumPost.
@ -48,6 +49,7 @@ class CForumPost extends AbstractResource implements ResourceInterface
protected $cId; protected $cId;
/** /**
* @Assert\NotBlank()
* @ORM\Column(name="post_title", type="string", length=250, nullable=true) * @ORM\Column(name="post_title", type="string", length=250, nullable=true)
*/ */
protected string $postTitle; protected string $postTitle;

@ -37,20 +37,16 @@ class CGroupRelTutor
protected $cId; protected $cId;
/** /**
* @var User
*
* @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\User", inversedBy="courseGroupsAsTutor") * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\User", inversedBy="courseGroupsAsTutor")
* @ORM\JoinColumn(name="user_id", referencedColumnName="id", nullable=false) * @ORM\JoinColumn(name="user_id", referencedColumnName="id", nullable=false)
*/ */
protected $user; protected User $user;
/** /**
* @var CGroup
*
* @ORM\ManyToOne(targetEntity="CGroup", inversedBy="tutors") * @ORM\ManyToOne(targetEntity="CGroup", inversedBy="tutors")
* @ORM\JoinColumn(name="group_id", referencedColumnName="iid", nullable=false) * @ORM\JoinColumn(name="group_id", referencedColumnName="iid", nullable=false)
*/ */
protected $group; protected CGroup $group;
/** /**
* Set userId. * Set userId.

@ -40,20 +40,16 @@ class CGroupRelUser
protected $cId; protected $cId;
/** /**
* @var User
*
* @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\User", inversedBy="courseGroupsAsMember") * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\User", inversedBy="courseGroupsAsMember")
* @ORM\JoinColumn(name="user_id", referencedColumnName="id", nullable=false) * @ORM\JoinColumn(name="user_id", referencedColumnName="id", nullable=false)
*/ */
protected $user; protected User $user;
/** /**
* @var CGroup
*
* @ORM\ManyToOne(targetEntity="CGroup", inversedBy="members") * @ORM\ManyToOne(targetEntity="CGroup", inversedBy="members")
* @ORM\JoinColumn(name="group_id", referencedColumnName="iid", nullable=false) * @ORM\JoinColumn(name="group_id", referencedColumnName="iid", nullable=false)
*/ */
protected $group; protected CGroup $group;
/** /**
* @var int * @var int

@ -31,15 +31,13 @@ class CLpCategoryUser
* @ORM\ManyToOne(targetEntity="Chamilo\CourseBundle\Entity\CLpCategory", inversedBy="users") * @ORM\ManyToOne(targetEntity="Chamilo\CourseBundle\Entity\CLpCategory", inversedBy="users")
* @ORM\JoinColumn(name="category_id", referencedColumnName="iid") * @ORM\JoinColumn(name="category_id", referencedColumnName="iid")
*/ */
protected $category; protected CLpCategory $category;
/** /**
* @var User
*
* @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\User") * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\User")
* @ORM\JoinColumn(name="user_id", referencedColumnName="id") * @ORM\JoinColumn(name="user_id", referencedColumnName="id")
*/ */
protected $user; protected User $user;
/** /**
* @return string * @return string

@ -8,6 +8,7 @@ use Chamilo\CoreBundle\Entity\AbstractResource;
use Chamilo\CoreBundle\Entity\ResourceInterface; use Chamilo\CoreBundle\Entity\ResourceInterface;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Gedmo\Mapping\Annotation as Gedmo; use Gedmo\Mapping\Annotation as Gedmo;
use Symfony\Component\Validator\Constraints as Assert;
/** /**
* CNotebook. * CNotebook.
@ -57,11 +58,13 @@ class CNotebook extends AbstractResource implements ResourceInterface
protected $sessionId; protected $sessionId;
/** /**
* @Assert\NotBlank()
* @ORM\Column(name="title", type="string", length=255, nullable=false) * @ORM\Column(name="title", type="string", length=255, nullable=false)
*/ */
protected string $title; protected string $title;
/** /**
* @Assert\NotBlank()
* @ORM\Column(name="description", type="text", nullable=false) * @ORM\Column(name="description", type="text", nullable=false)
*/ */
protected string $description; protected string $description;

@ -5,6 +5,7 @@
namespace Chamilo\CourseBundle\Entity; namespace Chamilo\CourseBundle\Entity;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Validator\Constraints as Assert;
/** /**
* CQuizAnswer. * CQuizAnswer.
@ -44,11 +45,10 @@ class CQuizAnswer
protected $questionId; protected $questionId;
/** /**
* @var string * @Assert\NotBlank()
*
* @ORM\Column(name="answer", type="text", nullable=false) * @ORM\Column(name="answer", type="text", nullable=false)
*/ */
protected $answer; protected string $answer;
/** /**
* @var int * @var int

@ -12,6 +12,7 @@ use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\Event\LifecycleEventArgs; use Doctrine\ORM\Event\LifecycleEventArgs;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Validator\Constraints as Assert;
/** /**
* CQuizQuestionCategory. * CQuizQuestionCategory.
@ -38,18 +39,16 @@ class CQuizQuestionCategory extends AbstractResource implements ResourceInterfac
protected $iid; protected $iid;
/** /**
* @var string * @Assert\NotBlank()
* *
* @ORM\Column(name="title", type="string", length=255, nullable=false) * @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) * @ORM\Column(name="description", type="text", nullable=true)
*/ */
protected $description; protected ?string $description;
/** /**
* @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\Course") * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\Course")

@ -34,6 +34,7 @@ class CQuizQuestionOption
* @ORM\Column(name="c_id", type="integer") * @ORM\Column(name="c_id", type="integer")
*/ */
protected $cId; protected $cId;
/** /**
* @var int * @var int
* *

@ -27,11 +27,10 @@ class CStudentPublicationCorrection extends AbstractResource implements Resource
protected $id; protected $id;
/** /**
* @var string
* @Assert\NotBlank() * @Assert\NotBlank()
* @ORM\Column(name="title", type="string", length=255, nullable=true) * @ORM\Column(name="title", type="string", length=255, nullable=true)
*/ */
protected $title; protected string $title;
public function __construct() public function __construct()
{ {

@ -101,18 +101,14 @@ class CSurvey extends AbstractResource implements ResourceInterface
protected $template; protected $template;
/** /**
* @var string
*
* @ORM\Column(name="intro", type="text", nullable=true) * @ORM\Column(name="intro", type="text", nullable=true)
*/ */
protected $intro; protected ?string $intro;
/** /**
* @var string
*
* @ORM\Column(name="surveythanks", type="text", nullable=true) * @ORM\Column(name="surveythanks", type="text", nullable=true)
*/ */
protected $surveyThanks; protected ?string $surveyThanks;
/** /**
* @var \DateTime * @var \DateTime

@ -6,6 +6,7 @@ namespace Chamilo\CourseBundle\Entity;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Validator\Constraints as Assert;
/** /**
* CSurveyQuestion. * CSurveyQuestion.
@ -66,18 +67,16 @@ class CSurveyQuestion
protected $surveyId; protected $surveyId;
/** /**
* @var string * @Assert\NotBlank()
* *
* @ORM\Column(name="survey_question", type="text", nullable=false) * @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) * @ORM\Column(name="survey_question_comment", type="text", nullable=false)
*/ */
protected $surveyQuestionComment; protected ?string $surveyQuestionComment;
/** /**
* @var string * @var string

@ -40,27 +40,21 @@ class CThematicAdvance //extends AbstractResource implements ResourceInterface
protected $cId; protected $cId;
/** /**
* @var CThematic
*
* @ORM\ManyToOne(targetEntity="Chamilo\CourseBundle\Entity\CThematic") * @ORM\ManyToOne(targetEntity="Chamilo\CourseBundle\Entity\CThematic")
* @ORM\JoinColumn(name="thematic_id", referencedColumnName="iid") * @ORM\JoinColumn(name="thematic_id", referencedColumnName="iid")
*/ */
protected $thematic; protected CThematic $thematic;
/** /**
* @var CAttendance
*
* @ORM\ManyToOne(targetEntity="Chamilo\CourseBundle\Entity\CAttendance") * @ORM\ManyToOne(targetEntity="Chamilo\CourseBundle\Entity\CAttendance")
* @ORM\JoinColumn(name="attendance_id", referencedColumnName="iid") * @ORM\JoinColumn(name="attendance_id", referencedColumnName="iid")
*/ */
protected $attendance; protected CAttendance $attendance;
/** /**
* @var string
*
* @ORM\Column(name="content", type="text", nullable=true) * @ORM\Column(name="content", type="text", nullable=true)
*/ */
protected $content; protected ?string $content;
/** /**
* @var \DateTime * @var \DateTime

@ -33,13 +33,11 @@ class CThematicPlan //extends AbstractResource implements ResourceInterface
protected $iid; protected $iid;
/** /**
* @var string
*
* @Assert\NotBlank() * @Assert\NotBlank()
* *
* @ORM\Column(name="title", type="string", length=255, nullable=false) * @ORM\Column(name="title", type="string", length=255, nullable=false)
*/ */
protected $title; protected string $title;
/** /**
* @var int * @var int
@ -49,19 +47,15 @@ class CThematicPlan //extends AbstractResource implements ResourceInterface
protected $cId; protected $cId;
/** /**
* @var CThematic
*
* @ORM\ManyToOne(targetEntity="Chamilo\CourseBundle\Entity\CThematic", inversedBy="plans") * @ORM\ManyToOne(targetEntity="Chamilo\CourseBundle\Entity\CThematic", inversedBy="plans")
* @ORM\JoinColumn(name="thematic_id", referencedColumnName="iid") * @ORM\JoinColumn(name="thematic_id", referencedColumnName="iid")
*/ */
protected $thematic; protected CThematic $thematic;
/** /**
* @var string
*
* @ORM\Column(name="description", type="text", nullable=true) * @ORM\Column(name="description", type="text", nullable=true)
*/ */
protected $description; protected ?string $description;
/** /**
* @var int * @var int

@ -58,20 +58,18 @@ class CWiki extends AbstractResource implements ResourceInterface
protected $reflink; protected $reflink;
/** /**
* @var string
*
* @Assert\NotBlank() * @Assert\NotBlank()
* *
* @ORM\Column(name="title", type="string", length=255, nullable=false) * @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) * @ORM\Column(name="content", type="text", nullable=false)
*/ */
protected $content; protected string $content;
/** /**
* @var int * @var int

Loading…
Cancel
Save