Merge pull request #21 from ConductionNL/development

Master bijwerken vanuit dev
ConductionNL · Mar 6, 2020 · 930d719 · 930d719
2 parents 2368f5d + 85482a3
commit 930d719
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/api/src/DataFixtures/AppFixtures.php b/api/src/DataFixtures/AppFixtures.php
@@ -809,7 +809,7 @@ public function load(ObjectManager $manager)
     	$id = Uuid::fromString('5b10c1d6-7121-4be2-b479-7523f1b625f1');
     	$trouwenNL = new RequestType();
     	$trouwenNL->setIcon('fal fa-rings-wedding');
-    	$trouwenNL->setSourceOrganization('000');
+    	$trouwenNL->setSourceOrganization('00000000');
     	$trouwenNL->setName('Huwelijk / Partnerschap');
     	$trouwenNL->setDescription('Huwelijk / Partnerschap');
     	$trouwenNL->setUnique(true);
@@ -915,7 +915,7 @@ public function load(ObjectManager $manager)
     	$stage7->setType('array');
     	$stage7->setFormat('url');
     	$stage7->setIri('irc/assent');
-    	$stage7->setMinItems(2);
+    	$stage7->setMinItems(4);
     	$stage7->setMaxItems(4);
     	$stage7->setRequired(true);
     	$stage7->setDescription('Wie zijn de getuigen van partner?');
@@ -941,6 +941,8 @@ public function load(ObjectManager $manager)
     	$overige->setTitle('Overig');
     	$overige->setIcon('fal fa-file-alt');
     	$overige->setSlug('overig');
+        $overige->setMinItems(4);
+        $overige->setMaxItems(4);
     	$overige->setType('array');
     	$overige->setMinItems(4);
     	$overige->setFormat('string');

diff --git a/api/src/Entity/Property.php b/api/src/Entity/Property.php
@@ -63,7 +63,7 @@ class Property
      *
      * @example My Property
      * @Assert\NotBlank
-     * @Assert\Length(min = 15, max = 255)
+     * @Assert\Length(min = 3, max = 255)
      * @Groups({"read", "write"})
      * @ORM\Column(type="string", length=255)
      */
@@ -98,7 +98,7 @@ class Property
      *
      * @Assert\NotBlank
      * @Assert\Length(max = 255)
-     * @Assert\Choice({"int32","int64","float","double","byte","binary","date","date-time","duration","password","boolean","string","uuid","uri","email","rsin","bag","bsn","iban","challenge","service","assent"})
+     * @Assert\Choice({"int32","int64","float","double","byte","binary","date","date-time","duration","password","boolean","string","uuid","uri","url","email","rsin","bag","bsn","iban","challenge","service","assent"})
      * @Groups({"read", "write"})
      * @ORM\Column(type="string", length=255, nullable=true)
      */
@@ -509,7 +509,7 @@ class Property
 
     /**
      * @var Property The next property of the request type
-     * 
+     *
      * @ORM\ManyToOne(targetEntity="App\Entity\Property", inversedBy="previous", cascade={"persist"})
      */
     private $next;
@@ -526,7 +526,7 @@ class Property
      *
      * @example My Property
      *
-     * @Assert\Length(min = 15, max = 255)
+     * @Assert\Length(min = 3, max = 255)
      * @Groups({"read", "write"})
      * @ORM\Column(type="string", length=255, nullable=true)
      */
@@ -537,7 +537,7 @@ class Property
      *
      * @example my-slug
      *
-     * @Assert\Length(min = 15, max = 255)
+     * @Assert\Length(min = 3, max = 255)
      * @Groups({"read", "write"})
      * @ORM\Column(type="string", length=255, nullable=true)
      */