Merge branch 'master' into dev-robert

ConductionNL · Jan 13, 2020 · 89fbb7c · 89fbb7c
2 parents 46724bf + ee9b5a2
commit 89fbb7c
Show file tree

Hide file tree

Showing 47 changed files with 603 additions and 568 deletions.
diff --git a/admin/yarn.lock b/admin/yarn.lock
@@ -2602,7 +2602,7 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
   integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
 
-commander@^2.11.0, commander@^2.19.0, commander@^2.20.0, commander@~2.20.0:
+commander@^2.11.0, commander@^2.19.0, commander@^2.20.0:
   version "2.20.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
   integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
@@ -2612,6 +2612,11 @@ commander@~2.19.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
   integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
 
+commander@~2.20.3:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
 common-tags@^1.4.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
@@ -4545,9 +4550,9 @@ handle-thing@^2.0.0:
   integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
 
 handlebars@^4.0.3:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.2.1.tgz#dc69c0e61604224f0c23b38b5b6741db210b57da"
-  integrity sha512-bqPIlDk06UWbVEIFoYj+LVo42WhK96J+b25l7hbFDpxrOXMphFM3fNIm+cluwg4Pk2jiLjWU5nHQY7igGE75NQ==
+  version "4.5.3"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482"
+  integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==
   dependencies:
     neo-async "^2.6.0"
     optimist "^0.6.1"
@@ -10318,11 +10323,11 @@ [email protected]:
     source-map "~0.6.1"
 
 uglify-js@^3.1.4:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz#704681345c53a8b2079fb6cec294b05ead242ff5"
-  integrity sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==
+  version "3.7.3"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.3.tgz#f918fce9182f466d5140f24bb0ff35c2d32dcc6a"
+  integrity sha512-7tINm46/3puUA4hCkKYo4Xdts+JDaVC9ZPRcG8Xw9R4nhO/gZgUM3TENq8IF4Vatk8qCig4MzP/c8G4u2BkVQg==
   dependencies:
-    commander "~2.20.0"
+    commander "~2.20.3"
     source-map "~0.6.1"
 
 unicode-canonical-property-names-ecmascript@^1.0.4:

diff --git a/api/src/Command/ApiHelmCommand.php b/api/src/Command/ApiHelmCommand.php
@@ -65,9 +65,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
         } else {
             // outputs multiple lines to the console (adding "\n" at the end of each line)
             $output->writeln([
-                    'Helm Chart Creator',
-                    '============',
-                    $chart,
+                'Helm Chart Creator',
+                '============',
+                $chart,
             ]);
         }
     }

diff --git a/api/src/DataFixtures/AppFixtures.php b/api/src/DataFixtures/AppFixtures.php
@@ -206,15 +206,15 @@ public function load(ObjectManager $manager)
         $this->loadFromExcel($manager);
     }
 
-    public function createReader() :PhpSpreadsheet\Reader\Xlsx
+    public function createReader(): PhpSpreadsheet\Reader\Xlsx
     {
         $reader = new PhpSpreadsheet\Reader\Xlsx();
         $reader->setReadDataOnly(true);
 
         return $reader;
     }
 
-    public function loadXlsx(string $filename) :PhpSpreadsheet\Spreadsheet
+    public function loadXlsx(string $filename): PhpSpreadsheet\Spreadsheet
     {
         $reader = $this->createReader();
 

diff --git a/api/src/Entity/AangaanHuwelijkPartnerschap.php b/api/src/Entity/AangaanHuwelijkPartnerschap.php
@@ -2,14 +2,12 @@
 
 namespace App\Entity;
 
+use ApiPlatform\Core\Annotation\ApiResource;
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
 use Ramsey\Uuid\UuidInterface;
 use Symfony\Component\Serializer\Annotation\Groups;
-use ApiPlatform\Core\Annotation\ApiResource;
-use ApiPlatform\Core\Annotation\ApiProperty;
 use Symfony\Component\Serializer\Annotation\MaxDepth;
-use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ApiResource(
@@ -23,6 +21,7 @@ class AangaanHuwelijkPartnerschap
 {
     /**
      * @var UuidInterface
+     *
      * @example e2984465-190a-4562-829e-a8cca81aa35d
      *
      * @Groups({"read"})
@@ -31,10 +30,11 @@ class AangaanHuwelijkPartnerschap
      * @ORM\GeneratedValue(strategy="CUSTOM")
      * @ORM\CustomIdGenerator(class="Ramsey\Uuid\Doctrine\UuidGenerator")
      */
-	private $uuid;
+    private $uuid;
 
     /**
-     * @var string $datum Datum this huwelijk has been requested
+     * @var string Datum this huwelijk has been requested
+     *
      * @example 01-01-2000
      *
      * @Groups({"read","write"})
@@ -44,7 +44,8 @@ class AangaanHuwelijkPartnerschap
     private $datum;
 
     /**
-     * @var string $land Land this huwelijk is in
+     * @var string Land this huwelijk is in
+     *
      * @example The Netherlands
      *
      * @Groups({"read","write"})
@@ -55,7 +56,8 @@ class AangaanHuwelijkPartnerschap
     private $land;
 
     /**
-     * @var string $plaats Plaats this huwelijk is in
+     * @var string Plaats this huwelijk is in
+     *
      * @example Amsterdam
      *
      * @Groups({"read","write"})
@@ -74,7 +76,8 @@ class AangaanHuwelijkPartnerschap
     private $inOnderzoek;
 
     /**
-     * @var Partner $partner Other partner of this huwelijk
+     * @var Partner Other partner of this huwelijk
+     *
      * @example John
      *
      * @Groups({"read","write"})
@@ -87,12 +90,12 @@ class AangaanHuwelijkPartnerschap
     // On an object level we stil want to be able to gett the id
     public function getId(): ?string
     {
-    	return $this->uuid;
+        return $this->uuid;
     }
 
     public function getUuid(): ?string
     {
-    	return $this->uuid;
+        return $this->uuid;
     }
 
     public function getDatum()

diff --git a/api/src/Entity/Geboorte.php b/api/src/Entity/Geboorte.php
@@ -2,16 +2,14 @@
 
 namespace App\Entity;
 
+use ApiPlatform\Core\Annotation\ApiResource;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
+use Gedmo\Mapping\Annotation as Gedmo;
 use Ramsey\Uuid\UuidInterface;
 use Symfony\Component\Serializer\Annotation\Groups;
-use Gedmo\Mapping\Annotation as Gedmo;
-use ApiPlatform\Core\Annotation\ApiResource;
-use ApiPlatform\Core\Annotation\ApiProperty;
 use Symfony\Component\Serializer\Annotation\MaxDepth;
-use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ApiResource(
@@ -25,6 +23,7 @@ class Geboorte
 {
     /**
      * @var UuidInterface
+     *
      * @example e2984465-190a-4562-829e-a8cca81aa35d
      *
      * @Groups({"read"})
@@ -33,10 +32,11 @@ class Geboorte
      * @ORM\GeneratedValue(strategy="CUSTOM")
      * @ORM\CustomIdGenerator(class="Ramsey\Uuid\Doctrine\UuidGenerator")
      */
-	private $uuid;
+    private $uuid;
 
     /**
-     * @var string $land Land this person is born in
+     * @var string Land this person is born in
+     *
      * @example The Netherlands
      *
      * @Groups({"read", "write"})
@@ -48,7 +48,8 @@ class Geboorte
     private $land;
 
     /**
-     * @var string $plaats Plaats this person is born in
+     * @var string Plaats this person is born in
+     *
      * @example Amsterdam
      *
      * @Groups({"read", "write"})
@@ -60,7 +61,8 @@ class Geboorte
     private $plaats;
 
     /**
-     * @var string $datum Datum this person is born at
+     * @var string Datum this person is born at
+     *
      * @example 01-01-2000
      *
      * @Groups({"read", "write"})
@@ -89,16 +91,15 @@ public function __construct()
         $this->ingeschrevenpersonen = new ArrayCollection();
     }
 
-
     // On an object level we stil want to be able to gett the id
     public function getId(): ?string
     {
-    	return $this->uuid;
+        return $this->uuid;
     }
 
     public function getUuid(): ?string
     {
-    	return $this->uuid;
+        return $this->uuid;
     }
 
     public function getDatum()
@@ -115,26 +116,26 @@ public function setDatum($datum): self
 
     public function getLand(): ?Waardetabel
     {
-    	return $this->land;
+        return $this->land;
     }
 
     public function setLand(?Waardetabel $land): self
     {
-    	$this->land = $land;
+        $this->land = $land;
 
-    	return $this;
+        return $this;
     }
 
     public function getPlaats(): ?Waardetabel
     {
-    	return $this->plaats;
+        return $this->plaats;
     }
 
     public function setPlaats(?Waardetabel $plaats): self
     {
-    	$this->plaats = $plaats;
+        $this->plaats = $plaats;
 
-    	return $this;
+        return $this;
     }
 
     public function getInOnderzoek()

diff --git a/api/src/Entity/Gezagsverhouding.php b/api/src/Entity/Gezagsverhouding.php
@@ -2,12 +2,11 @@
 
 namespace App\Entity;
 
+use ApiPlatform\Core\Annotation\ApiResource;
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
 use Ramsey\Uuid\UuidInterface;
 use Symfony\Component\Serializer\Annotation\Groups;
-use ApiPlatform\Core\Annotation\ApiResource;
-use ApiPlatform\Core\Annotation\ApiProperty;
 use Symfony\Component\Serializer\Annotation\MaxDepth;
 use Symfony\Component\Validator\Constraints as Assert;
 
@@ -23,6 +22,7 @@ class Gezagsverhouding
 {
     /**
      * @var UuidInterface
+     *
      * @example e2984465-190a-4562-829e-a8cca81aa35d
      *
      * @Groups({"read"})
@@ -31,7 +31,7 @@ class Gezagsverhouding
      * @ORM\GeneratedValue(strategy="CUSTOM")
      * @ORM\CustomIdGenerator(class="Ramsey\Uuid\Doctrine\UuidGenerator")
      */
-	private $uuid;
+    private $uuid;
 
     /**
      * @todo docblocks
@@ -74,12 +74,12 @@ class Gezagsverhouding
     // On an object level we stil want to be able to gett the id
     public function getId(): ?string
     {
-    	return $this->uuid;
+        return $this->uuid;
     }
 
     public function getUuid(): ?string
     {
-    	return $this->uuid;
+        return $this->uuid;
     }
 
     public function getIndicatieCurateleRegister(): ?bool
@@ -120,17 +120,17 @@ public function setInOnderzoek($inOnderzoek): self
 
     public function getIngeschrevenpersoon(): ?Ingeschrevenpersoon
     {
-    	return $this->ingeschrevenpersoon;
+        return $this->ingeschrevenpersoon;
     }
 
     public function setIngeschrevenpersoon(?Ingeschrevenpersoon $ingeschrevenpersoon): self
     {
-    	$this->ingeschrevenpersoon = $ingeschrevenpersoon;
+        $this->ingeschrevenpersoon = $ingeschrevenpersoon;
 
         // set (or unset) the owning side of the relation if necessary
-    	$newGezagsverhouding = $ingeschrevenpersoon=== null ? null : $this;
-    	if ($newGezagsverhouding !== $ingeschrevenpersoon->getGezagsverhouding()) {
-    		$ingeschrevenpersoon->setGezagsverhouding($newGezagsverhouding);
+        $newGezagsverhouding = $ingeschrevenpersoon === null ? null : $this;
+        if ($newGezagsverhouding !== $ingeschrevenpersoon->getGezagsverhouding()) {
+            $ingeschrevenpersoon->setGezagsverhouding($newGezagsverhouding);
         }
 
         return $this;