Revert "Merge branch 'signature-app/wp-576-restorestored-object-version' into 'master'"

This reverts merge request !586

src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php

@@ -17,9 +17,11 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * CustomFieldGroup.
+ *
+ * @ORM\Entity
+ *
+ * @ORM\Table(name="customfieldsgroup")
  */
-#[ORM\Entity]
-#[ORM\Table(name: 'customfieldsgroup')]
 class CustomFieldsGroup
 {
     /**
@@ -32,27 +34,40 @@ class CustomFieldsGroup
      * The custom fields of the group.
      * The custom fields are asc-ordered regarding to their property "ordering".
      *
-     * @var Collection<int, CustomField>
+     * @var Collection<CustomField>
+     *
+     * @ORM\OneToMany(
+     *     targetEntity="Chill\CustomFieldsBundle\Entity\CustomField",
+     * mappedBy="customFieldGroup")
+     *
+     * @ORM\OrderBy({"ordering": "ASC"})
      */
-    #[ORM\OneToMany(mappedBy: 'customFieldGroup', targetEntity: CustomField::class)]
-    #[ORM\OrderBy(['ordering' => \Doctrine\Common\Collections\Criteria::ASC])]
     private Collection $customFields;
 
-    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, length: 255)]
+    /**
+     * @ORM\Column(type="string", length=255)
+     */
     private ?string $entity = null;
 
-    #[ORM\Id]
-    #[ORM\Column(name: 'id', type: \Doctrine\DBAL\Types\Types::INTEGER)]
-    #[ORM\GeneratedValue(strategy: 'AUTO')]
+    /**
+     * @ORM\Id
+     *
+     * @ORM\Column(name="id", type="integer")
+     *
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
     private ?int $id = null;
 
     /**
      * @var array
+     *
+     * @ORM\Column(type="json")
      */
-    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON)]
     private $name;
 
-    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON)]
+    /**
+     * @ORM\Column(type="json")
+     */
     private array $options = [];
 
     /**
@@ -165,9 +180,11 @@ class CustomFieldsGroup
     /**
      * Set entity.
      *
+     * @param string $entity
+     *
      * @return CustomFieldsGroup
      */
-    public function setEntity(?string $entity)
+    public function setEntity($entity)
     {
         $this->entity = $entity;