Merge branch 'master' into upgrade-sf5

This commit is contained in:
2024-02-12 21:50:34 +01:00
920 changed files with 6430 additions and 1914 deletions

View File

@@ -37,7 +37,7 @@ class Document implements TrackCreationInterface, TrackUpdateInterface
* @ORM\JoinColumn(name="category_id_inside_bundle", referencedColumnName="id_inside_bundle")
* })
*/
private ?\Chill\DocStoreBundle\Entity\DocumentCategory $category = null;
private ?DocumentCategory $category = null;
/**
* @ORM\Column(type="datetime")
@@ -61,12 +61,12 @@ class Document implements TrackCreationInterface, TrackUpdateInterface
* message="Upload a document"
* )
*/
private ?\Chill\DocStoreBundle\Entity\StoredObject $object = null;
private ?StoredObject $object = null;
/**
* @ORM\ManyToOne(targetEntity="Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate")
*/
private ?\Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate $template = null;
private ?DocGeneratorTemplate $template = null;
/**
* @ORM\Column(type="text")
@@ -138,7 +138,7 @@ class Document implements TrackCreationInterface, TrackUpdateInterface
return $this;
}
public function setObject(StoredObject $object = null)
public function setObject(?StoredObject $object = null)
{
$this->object = $object;

View File

@@ -53,7 +53,8 @@ class DocumentCategory
* @var int The id which is unique inside the bundle
*/
private $idInsideBundle
) {}
) {
}
public function getBundleId() // ::class BundleClass (FQDN)
{

View File

@@ -43,7 +43,7 @@ class PersonDocument extends Document implements HasCenterInterface, HasScopeInt
*
* @var Scope The document's center
*/
private ?\Chill\MainBundle\Entity\Scope $scope = null;
private ?Scope $scope = null;
public function getCenter()
{