From 2107a436bd76335fdc4aac13805884fef344cef4 Mon Sep 17 00:00:00 2001 From: Ruben van der Linde Date: Mon, 13 Jan 2020 21:41:38 +0000 Subject: [PATCH] Apply fixes from StyleCI --- api/src/Command/ApiHelmCommand.php | 6 +- api/src/DataFixtures/AppFixtures.php | 4 +- .../Entity/AangaanHuwelijkPartnerschap.php | 23 +- api/src/Entity/Geboorte.php | 35 +-- api/src/Entity/Gezagsverhouding.php | 20 +- api/src/Entity/Ingeschrevenpersoon.php | 78 +++--- api/src/Entity/Kind.php | 24 +- api/src/Entity/NaamPersoon.php | 30 ++- api/src/Entity/Nationaliteit.php | 34 ++- api/src/Entity/OpschortingBijhouding.php | 26 +- api/src/Entity/Ouder.php | 28 +- api/src/Entity/Overlijden.php | 45 ++-- api/src/Entity/Partner.php | 24 +- api/src/Entity/Reisdocument.php | 10 +- api/src/Entity/VerblijfBuitenland.php | 27 +- api/src/Entity/Verblijfplaats.php | 66 +++-- api/src/Entity/Verblijfstitel.php | 28 +- api/src/Entity/Waardetabel.php | 8 +- api/src/Filter/LikeFilter.php | 16 +- api/src/Filter/RegexpFilter.php | 16 +- .../AangaanHuwelijkPartnerschapRepository.php | 2 +- api/src/Repository/GeboorteRepository.php | 2 +- .../Repository/GezagsverhoudingRepository.php | 2 +- .../IngeschrevenpersoonRepository.php | 11 +- api/src/Repository/KindRepository.php | 2 +- .../Repository/NLXRequestLogRepository.php | 9 +- api/src/Repository/NaamPersoonRepository.php | 2 +- .../Repository/NationaliteitRepository.php | 2 +- .../OpschortingBijhoudingRepository.php | 2 +- api/src/Repository/OuderRepository.php | 2 +- api/src/Repository/OverlijdenRepository.php | 2 +- api/src/Repository/PartnerRepository.php | 2 +- api/src/Repository/ReisdocumentRepository.php | 2 +- .../VerblijfBuitenlandRepository.php | 2 +- .../Repository/VerblijfplaatsRepository.php | 2 +- .../Repository/VerblijfstitelRepository.php | 2 +- api/src/Repository/WaardetabelRepository.php | 2 +- api/src/Service/AdressenService.php | 80 +++--- api/src/Service/BrpBotService.php | 45 ++-- api/src/Subscriber/FieldsSubscriber.php | 2 +- .../IngeschrevenpersonenSubscriber.php | 253 +++++++++--------- .../IngeschrevenpersoonSubscriber.php | 143 +++++----- api/src/Subscriber/NLXSubscriber.php | 4 +- api/src/Subscriber/ValidOnSubscriber.php | 2 +- api/src/Swagger/SwaggerDecorator.php | 120 ++++----- 45 files changed, 636 insertions(+), 611 deletions(-) diff --git a/api/src/Command/ApiHelmCommand.php b/api/src/Command/ApiHelmCommand.php index 0caa16f6..72c6793c 100644 --- 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 index c1437077..65af644f 100644 --- a/api/src/DataFixtures/AppFixtures.php +++ b/api/src/DataFixtures/AppFixtures.php @@ -206,7 +206,7 @@ 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); @@ -214,7 +214,7 @@ public function createReader() :PhpSpreadsheet\Reader\Xlsx 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 index 4775cb48..0de429ec 100644 --- 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 index 942bd4da..b5e0f640 100644 --- 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 index b152e70d..dbb52166 100644 --- 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; diff --git a/api/src/Entity/Ingeschrevenpersoon.php b/api/src/Entity/Ingeschrevenpersoon.php index c5038d35..29deae05 100644 --- a/api/src/Entity/Ingeschrevenpersoon.php +++ b/api/src/Entity/Ingeschrevenpersoon.php @@ -3,16 +3,12 @@ namespace App\Entity; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Annotation\ApiSubresource; -use ApiPlatform\Core\Annotation\ApiProperty; -use ApiPlatform\Core\Annotation\ApiFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\SearchFilter; 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 Symfony\Component\Serializer\Annotation\MaxDepth; use Symfony\Component\Validator\Constraints as Assert; @@ -229,6 +225,7 @@ class Ingeschrevenpersoon { /** * @var UuidInterface + * * @example e2984465-190a-4562-829e-a8cca81aa35d * * @Groups({"read"}) @@ -237,10 +234,11 @@ class Ingeschrevenpersoon * @ORM\GeneratedValue(strategy="CUSTOM") * @ORM\CustomIdGenerator(class="Ramsey\Uuid\Doctrine\UuidGenerator") */ - private $id; + private $id; /** - * @var string $burgerservicenummer Burgerservicenummer of this ingeschreven persoon + * @var string Burgerservicenummer of this ingeschreven persoon + * * @example 123456782 * * @Groups({"read", "write"}) @@ -251,32 +249,35 @@ class Ingeschrevenpersoon * max = 9 * ) */ - private $burgerservicenummer; + private $burgerservicenummer; - /** - * @var string $naam Naam of this ingeschreven persoon + /** + * @var string Naam of this ingeschreven persoon + * * @example John * - * @Groups({"read", "write"}) - * @ORM\ManyToOne(targetEntity="App\Entity\NaamPersoon", inversedBy="ingeschrevenpersonen", cascade={"persist", "remove"}) - * @ORM\JoinColumn(nullable=false, referencedColumnName="uuid") + * @Groups({"read", "write"}) + * @ORM\ManyToOne(targetEntity="App\Entity\NaamPersoon", inversedBy="ingeschrevenpersonen", cascade={"persist", "remove"}) + * @ORM\JoinColumn(nullable=false, referencedColumnName="uuid") * @MaxDepth(1) - */ - private $naam; + */ + private $naam; - /** - * @var Geboorte $geboorte Geboorte of this ingeschreven persoon + /** + * @var Geboorte Geboorte of this ingeschreven persoon + * * @example 01-01-2000 * - * @Groups({"read", "write"}) - * @ORM\ManyToOne(targetEntity="App\Entity\Geboorte", inversedBy="ingeschrevenpersonen", cascade={"persist", "remove"}) - * @ORM\JoinColumn(nullable=false, referencedColumnName="uuid") + * @Groups({"read", "write"}) + * @ORM\ManyToOne(targetEntity="App\Entity\Geboorte", inversedBy="ingeschrevenpersonen", cascade={"persist", "remove"}) + * @ORM\JoinColumn(nullable=false, referencedColumnName="uuid") * @MaxDepth(1) - */ - private $geboorte; + */ + private $geboorte; /** - * @var boolean $geheimhoudingPersoonsgegevens Geheim houding persoongegevens of this ingeschreven persoon + * @var bool Geheim houding persoongegevens of this ingeschreven persoon + * * @example true * * @Groups({"read", "write"}) @@ -288,7 +289,8 @@ class Ingeschrevenpersoon private $geheimhoudingPersoonsgegevens; /** - * @var string $geheimhoudingPersoonsgegevens Geslachts aanduiding of this ingeschreven persoon + * @var string Geslachts aanduiding of this ingeschreven persoon + * * @example male * * @Groups({"read", "write"}) @@ -302,7 +304,8 @@ class Ingeschrevenpersoon private $geslachtsaanduiding; /** - * @var integer $leeftijd Leeftijd of this ingeschreven persoon + * @var int Leeftijd of this ingeschreven persoon + * * @example 18 * * @Groups({"read", "write"}) @@ -313,7 +316,8 @@ class Ingeschrevenpersoon private $leeftijd; /** - * @var string $datumEersteInschrijvingGBA Datum eerste inschrijving gba of this ingeschreven persoon + * @var string Datum eerste inschrijving gba of this ingeschreven persoon + * * @example 01-01-2000 * * @Groups({"read", "write"}) @@ -338,7 +342,8 @@ class Ingeschrevenpersoon private $inOnderzoek; /** - * @var string $nationaliteit Nationaliteit of this ingeschreven persoon + * @var string Nationaliteit of this ingeschreven persoon + * * @example Dutch * * @Groups({"read", "write"}) @@ -356,7 +361,8 @@ class Ingeschrevenpersoon private $opschortingBijhouding; /** - * @var Overlijden $overlijden Checks if ingeschreven persoon is overlijden + * @var Overlijden Checks if ingeschreven persoon is overlijden + * * @example false * * @Groups({"read", "write"}) @@ -367,7 +373,8 @@ class Ingeschrevenpersoon private $overlijden; /** - * @var Overlijden $overlijden Checks if ingeschreven persoon is overlijden + * @var Overlijden Checks if ingeschreven persoon is overlijden + * * @example false * * @Groups({"read", "write"}) @@ -389,7 +396,7 @@ class Ingeschrevenpersoon /** * @todo docblocks - * + * * @Groups({"read", "write"}) * @ORM\OneToOne(targetEntity="App\Entity\Verblijfstitel", inversedBy="ingeschrevenpersoon", cascade={"persist", "remove"}) * @ORM\JoinColumn(nullable=true, referencedColumnName="uuid") @@ -398,7 +405,8 @@ class Ingeschrevenpersoon private $verblijfstitel; /** - * @var Ouder $ouders Ouders of ingeschreven persoon + * @var Ouder Ouders of ingeschreven persoon + * * @example James, Jessica * * @ORM\OneToMany(targetEntity="App\Entity\Ouder", mappedBy="ingeschrevenpersoon", orphanRemoval=true, cascade={"persist", "remove"}) @@ -407,7 +415,8 @@ class Ingeschrevenpersoon private $ouders; /** - * @var Kind $kinderen Kinderen of ingeschreven persoon + * @var Kind Kinderen of ingeschreven persoon + * * @example John * * @ORM\OneToMany(targetEntity="App\Entity\Kind", mappedBy="ingeschrevenpersoon", orphanRemoval=true, cascade={"persist", "remove"}) @@ -416,7 +425,8 @@ class Ingeschrevenpersoon private $kinderen; /** - * @var Partner $partners Partner of ingeschreven persoon + * @var Partner Partner of ingeschreven persoon + * * @example Mike * * @ORM\OneToMany(targetEntity="App\Entity\Partner", mappedBy="ingeschrevenpersoon", orphanRemoval=true, cascade={"persist", "remove"}) @@ -435,7 +445,7 @@ public function __construct() // On an object level we stil want to be able to gett the id public function getId(): ?string { - return $this->id; + return $this->id; } public function getBurgerservicenummer(): ?string diff --git a/api/src/Entity/Kind.php b/api/src/Entity/Kind.php index 59bbe18d..b0d5b008 100644 --- a/api/src/Entity/Kind.php +++ b/api/src/Entity/Kind.php @@ -3,11 +3,10 @@ namespace App\Entity; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Annotation\ApiProperty; 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 Symfony\Component\Serializer\Annotation\MaxDepth; use Symfony\Component\Validator\Constraints as Assert; @@ -27,6 +26,7 @@ class Kind { /** * @var UuidInterface + * * @example e2984465-190a-4562-829e-a8cca81aa35d * * @Groups({"read"}) @@ -38,7 +38,8 @@ class Kind private $uuid; /** - * @var string $burgerservicenummer Burgerservicenummer of this kind + * @var string Burgerservicenummer of this kind + * * @example 123456782 * * @ORM\Column(type="string", length=9) @@ -50,7 +51,8 @@ class Kind private $burgerservicenummer; /** - * @var integer $leeftijd Leeftijd of this kind + * @var int Leeftijd of this kind + * * @example 14 * * @Groups({"read", "write"}) @@ -67,7 +69,8 @@ class Kind private $inOnderzoek; /** - * @var NaamPersoon $naam NaamPersoon of this kind + * @var NaamPersoon NaamPersoon of this kind + * * @example Michael * * @Groups({"read", "write"}) @@ -79,7 +82,8 @@ class Kind private $naam; /** - * @var Geboorte $geboorte Geboorte of this kind + * @var Geboorte Geboorte of this kind + * * @example 01-01-2000 * * @Groups({"read", "write"}) @@ -103,12 +107,12 @@ class Kind // 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 getBurgerservicenummer(): ?string @@ -173,12 +177,12 @@ public function setGeboorte(Geboorte $geboorte): self public function getIngeschrevenpersoon(): ?Ingeschrevenpersoon { - return $this->ingeschrevenpersoon; + return $this->ingeschrevenpersoon; } public function setIngeschrevenpersoon(?Ingeschrevenpersoon $ingeschrevenpersoon): self { - $this->ingeschrevenpersoon = $ingeschrevenpersoon; + $this->ingeschrevenpersoon = $ingeschrevenpersoon; return $this; } diff --git a/api/src/Entity/NaamPersoon.php b/api/src/Entity/NaamPersoon.php index 86d040e7..7266eb7f 100644 --- a/api/src/Entity/NaamPersoon.php +++ b/api/src/Entity/NaamPersoon.php @@ -2,14 +2,13 @@ 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; @@ -25,6 +24,7 @@ class NaamPersoon { /** * @var UuidInterface + * * @example e2984465-190a-4562-829e-a8cca81aa35d * * @Groups({"read"}) @@ -33,10 +33,11 @@ class NaamPersoon * @ORM\GeneratedValue(strategy="CUSTOM") * @ORM\CustomIdGenerator(class="Ramsey\Uuid\Doctrine\UuidGenerator") */ - private $uuid; + private $uuid; /** - * @var string $geslachtsnaam Geslachtsnaam of this NaamPersoon + * @var string Geslachtsnaam of this NaamPersoon + * * @example male * * @Groups({"read", "write"}) @@ -50,7 +51,8 @@ class NaamPersoon private $geslachtsnaam; /** - * @var string $voorletters Voorletters of this NaamPersoon + * @var string Voorletters of this NaamPersoon + * * @example A * * @Groups({"read", "write"}) @@ -64,7 +66,8 @@ class NaamPersoon private $voorletters; /** - * @var string $voornamen Voornamen of this NaamPersoon + * @var string Voornamen of this NaamPersoon + * * @example Michael Smith * * @Groups({"read", "write"}) @@ -78,7 +81,8 @@ class NaamPersoon private $voornamen; /** - * @var string $voorvoegsel Voorvoegsel of this NaamPersoon + * @var string Voorvoegsel of this NaamPersoon + * * @example van der * * @Groups({"read", "write"}) @@ -101,7 +105,8 @@ class NaamPersoon private $inOnderzoek; /** - * @var string $aanhef Aanhef of this NaamPersoon + * @var string Aanhef of this NaamPersoon + * * @example Dhr * * @Groups({"read", "write"}) @@ -124,7 +129,8 @@ class NaamPersoon private $aanschrijfwijze; /** - * @var string $geslachtsnaam Geslachtsnaam of this NaamPersoon + * @var string Geslachtsnaam of this NaamPersoon + * * @example male * * @Groups({"read", "write"}) @@ -153,12 +159,12 @@ public function __construct() // 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 getGeslachtsnaam(): ?string diff --git a/api/src/Entity/Nationaliteit.php b/api/src/Entity/Nationaliteit.php index e2454fee..b7c4e1ed 100644 --- a/api/src/Entity/Nationaliteit.php +++ b/api/src/Entity/Nationaliteit.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 Nationaliteit { /** * @var UuidInterface + * * @example e2984465-190a-4562-829e-a8cca81aa35d * * @Groups({"read"}) @@ -31,36 +30,35 @@ class Nationaliteit * @ORM\GeneratedValue(strategy="CUSTOM") * @ORM\CustomIdGenerator(class="Ramsey\Uuid\Doctrine\UuidGenerator") */ - private $uuid; + private $uuid; /** - * * @Groups({"read","write"}) * @ORM\ManyToOne(targetEntity="App\Entity\Ingeschrevenpersoon", inversedBy="nationaliteit") * @ORM\JoinColumn(nullable=false) * @MaxDepth(1) */ - private $ingeschrevenpersoon; + private $ingeschrevenpersoon; - // On an object level we stil want to be able to gett the id - public function getId(): ?string - { - return $this->uuid; - } + // On an object level we stil want to be able to gett the id + public function getId(): ?string + { + return $this->uuid; + } - public function getUuid(): ?string - { - return $this->uuid; - } + public function getUuid(): ?string + { + return $this->uuid; + } - public function getIngeschrevenpersoon(): ?Ingeschrevenpersoon + public function getIngeschrevenpersoon(): ?Ingeschrevenpersoon { - return $this->ingeschrevenpersoon; + return $this->ingeschrevenpersoon; } public function setIngeschrevenpersoon(?Ingeschrevenpersoon $ingeschrevenpersoon): self { - $this->ingeschrevenpersoon = $ingeschrevenpersoon; + $this->ingeschrevenpersoon = $ingeschrevenpersoon; return $this; } diff --git a/api/src/Entity/OpschortingBijhouding.php b/api/src/Entity/OpschortingBijhouding.php index dd80a05c..434cc07c 100644 --- a/api/src/Entity/OpschortingBijhouding.php +++ b/api/src/Entity/OpschortingBijhouding.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 OpschortingBijhouding { /** * @var UuidInterface + * * @example e2984465-190a-4562-829e-a8cca81aa35d * * @Groups({"read"}) @@ -31,10 +31,11 @@ class OpschortingBijhouding * @ORM\GeneratedValue(strategy="CUSTOM") * @ORM\CustomIdGenerator(class="Ramsey\Uuid\Doctrine\UuidGenerator") */ - private $uuid; + private $uuid; /** - * @var string $reden Reden of this OpschortingBijhouding + * @var string Reden of this OpschortingBijhouding + * * @example * * @Groups({"read","write"}) @@ -48,7 +49,8 @@ class OpschortingBijhouding private $reden; /** - * @var string $datum Datum of this NaamPersoon + * @var string Datum of this NaamPersoon + * * @example 01-01-2000 * * @Groups({"read","write"}) @@ -68,12 +70,12 @@ class OpschortingBijhouding // 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 getReden(): ?string @@ -102,17 +104,17 @@ public function setDatum($datum): 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 - $newOpschortingBijhouding = $ingeschrevenpersoon=== null ? null : $this; - if ($newOpschortingBijhouding !== $ingeschrevenpersoon->getOpschortingBijhouding()) { - $ingeschrevenpersoon->setOpschortingBijhouding($newOpschortingBijhouding); + $newOpschortingBijhouding = $ingeschrevenpersoon === null ? null : $this; + if ($newOpschortingBijhouding !== $ingeschrevenpersoon->getOpschortingBijhouding()) { + $ingeschrevenpersoon->setOpschortingBijhouding($newOpschortingBijhouding); } return $this; diff --git a/api/src/Entity/Ouder.php b/api/src/Entity/Ouder.php index 1a9e760a..d4327228 100644 --- a/api/src/Entity/Ouder.php +++ b/api/src/Entity/Ouder.php @@ -3,11 +3,10 @@ namespace App\Entity; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Annotation\ApiProperty; 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 Symfony\Component\Serializer\Annotation\MaxDepth; use Symfony\Component\Validator\Constraints as Assert; @@ -27,6 +26,7 @@ class Ouder { /** * @var UuidInterface + * * @example e2984465-190a-4562-829e-a8cca81aa35d * * @Groups({"read"}) @@ -35,10 +35,11 @@ class Ouder * @ORM\GeneratedValue(strategy="CUSTOM") * @ORM\CustomIdGenerator(class="Ramsey\Uuid\Doctrine\UuidGenerator") */ - private $uuid; + private $uuid; /** - * @var string $burgerservicenummer Burgerservicenummer of this Ouder + * @var string Burgerservicenummer of this Ouder + * * @example 123456782 * * @Groups({"read", "write"}) @@ -51,7 +52,8 @@ class Ouder private $burgerservicenummer; /** - * @var string $geslachtsaanduiding Geslachts aanduiding of this Ouder + * @var string Geslachts aanduiding of this Ouder + * * @example female * * @Groups({"read", "write"}) @@ -77,8 +79,8 @@ class Ouder private $ouderAanduiding; /** + * @var string Burgerservicenummer of this Ouder * - * @var string $burgerservicenummer Burgerservicenummer of this Ouder * @example 123456782 * * @Groups({"read", "write"}) @@ -88,8 +90,8 @@ class Ouder private $datumIngangFamilierechtelijkeBetreking; /** + * @var NaamPersoon Naam of this Ouder * - * @var NaamPersoon $naam Naam of this Ouder * @example Joe * * @Groups({"read", "write"}) @@ -109,8 +111,8 @@ class Ouder private $inOnderzoek; /** + * @var Geboorte Geboorte of this Ouder * - * @var Geboorte $geboorte Geboorte of this Ouder * @example 01-01-2000 * * @Groups({"read", "write"}) @@ -122,8 +124,8 @@ class Ouder private $geboorte; /** + * @var Ingeschrevenpersoon IngeschrevenPersoon of this Ouder * - * @var Ingeschrevenpersoon $ingeschrevenpersoon IngeschrevenPersoon of this Ouder * @example Joe * * @Gedmo\Versioned @@ -136,12 +138,12 @@ class Ouder // 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 getBurgerservicenummer(): ?string @@ -230,12 +232,12 @@ public function setGeboorte(Geboorte $geboorte): self public function getIngeschrevenpersoon(): ?Ingeschrevenpersoon { - return $this->ingeschrevenpersoon; + return $this->ingeschrevenpersoon; } public function setIngeschrevenpersoon(?Ingeschrevenpersoon $ingeschrevenpersoon): self { - $this->ingeschrevenpersoon = $ingeschrevenpersoon; + $this->ingeschrevenpersoon = $ingeschrevenpersoon; return $this; } diff --git a/api/src/Entity/Overlijden.php b/api/src/Entity/Overlijden.php index a27d21ba..8c557c54 100644 --- a/api/src/Entity/Overlijden.php +++ b/api/src/Entity/Overlijden.php @@ -2,12 +2,12 @@ namespace App\Entity; +use ApiPlatform\Core\Annotation\ApiProperty; +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 +23,7 @@ class Overlijden { /** * @var UuidInterface + * * @example e2984465-190a-4562-829e-a8cca81aa35d * * @Groups({"read"}) @@ -31,10 +32,11 @@ class Overlijden * @ORM\GeneratedValue(strategy="CUSTOM") * @ORM\CustomIdGenerator(class="Ramsey\Uuid\Doctrine\UuidGenerator") */ - private $uuid; + private $uuid; /** - * @var boolean $indicatieOverleden Indicatie overleden of this Overlijden + * @var bool Indicatie overleden of this Overlijden + * * @example false * * @Groups({"read","write"}) @@ -46,7 +48,8 @@ class Overlijden private $indicatieOverleden; /** - * @var string $datum Datum of this Overlijden + * @var string Datum of this Overlijden + * * @example 01-01-2000 * * @Groups({"read","write"}) @@ -56,7 +59,8 @@ class Overlijden private $datum; /** - * @var string $land Land of this Overlijden + * @var string Land of this Overlijden + * * @example The Netherlands * * @ApiProperty( @@ -76,7 +80,8 @@ class Overlijden private $land; /** - * @var string $plaats Plaats of this Overlijden + * @var string Plaats of this Overlijden + * * @example Amsterdam * * @ApiProperty( @@ -114,12 +119,12 @@ class Overlijden // 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 getIndicatieOverleden(): ?bool @@ -148,26 +153,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() @@ -184,17 +189,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 - $newOverlijden = $ingeschrevenpersoon === null ? null : $this; - if ($newOverlijden !== $ingeschrevenpersoon->getOverlijden()) { - $ingeschrevenpersoon->setOverlijden($newOverlijden); + $newOverlijden = $ingeschrevenpersoon === null ? null : $this; + if ($newOverlijden !== $ingeschrevenpersoon->getOverlijden()) { + $ingeschrevenpersoon->setOverlijden($newOverlijden); } return $this; diff --git a/api/src/Entity/Partner.php b/api/src/Entity/Partner.php index 48d927a1..758e9e5f 100644 --- a/api/src/Entity/Partner.php +++ b/api/src/Entity/Partner.php @@ -3,11 +3,10 @@ namespace App\Entity; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Annotation\ApiProperty; 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 Symfony\Component\Serializer\Annotation\MaxDepth; use Symfony\Component\Validator\Constraints as Assert; @@ -28,6 +27,7 @@ class Partner { /** * @var UuidInterface + * * @example e2984465-190a-4562-829e-a8cca81aa35d * * @Groups({"read"}) @@ -39,7 +39,8 @@ class Partner private $uuid; /** - * @var string $burgerservicenummer Burgerservicenummer of this Partner + * @var string Burgerservicenummer of this Partner + * * @example 123456782 * * @Groups({"read", "write"}) @@ -52,7 +53,8 @@ class Partner private $burgerservicenummer; /** - * @var string $geslachtsaanduiding Geslachts aanduiding of this Partner + * @var string Geslachts aanduiding of this Partner + * * @example female * * @Groups({"read", "write"}) @@ -66,7 +68,8 @@ class Partner private $geslachtsaanduiding; /** - * @var NaamPersoon $naam Naam of this Partner + * @var NaamPersoon Naam of this Partner + * * @example Jessica * * @Groups({"read", "write"}) @@ -77,7 +80,8 @@ class Partner private $naam; /** - * @var Geboorte $geboorte Geboorte of this Partner + * @var Geboorte Geboorte of this Partner + * * @example 01-01-2000 * * @Groups({"read", "write"}) @@ -106,12 +110,12 @@ class Partner // 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 getBurgerservicenummer(): ?string @@ -176,12 +180,12 @@ public function setAangaanHuwelijkPartnerschap(AangaanHuwelijkPartnerschap $aang public function getIngeschrevenpersoon(): ?Ingeschrevenpersoon { - return $this->ingeschrevenpersoon; + return $this->ingeschrevenpersoon; } public function setIngeschrevenpersoon(?Ingeschrevenpersoon $ingeschrevenpersoon): self { - $this->ingeschrevenpersoon= $ingeschrevenpersoon; + $this->ingeschrevenpersoon = $ingeschrevenpersoon; return $this; } diff --git a/api/src/Entity/Reisdocument.php b/api/src/Entity/Reisdocument.php index f04ccbec..5facbe54 100644 --- a/api/src/Entity/Reisdocument.php +++ b/api/src/Entity/Reisdocument.php @@ -3,12 +3,10 @@ namespace App\Entity; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Annotation\ApiProperty; use Doctrine\ORM\Mapping as ORM; use Gedmo\Mapping\Annotation as Gedmo; use Ramsey\Uuid\UuidInterface; use Symfony\Component\Serializer\Annotation\Groups; -use Symfony\Component\Serializer\Annotation\MaxDepth; use Symfony\Component\Validator\Constraints as Assert; /** @@ -23,6 +21,7 @@ class Reisdocument { /** * @var UuidInterface + * * @example e2984465-190a-4562-829e-a8cca81aa35d * * @Groups({"read"}) @@ -46,7 +45,8 @@ class Reisdocument private $aanduidingInhoudingOfVermissing; /** - * @var string $reisdocumentnummer Reisdocumentnummer of this Reisdocument + * @var string Reisdocumentnummer of this Reisdocument + * * @example AB1234CD0 * * @Groups({"read","write"}) @@ -62,12 +62,12 @@ class Reisdocument // 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 setAanduidingInhoudingOfVermissing(string $aanduidingInhoudingOfVermissing): self diff --git a/api/src/Entity/VerblijfBuitenland.php b/api/src/Entity/VerblijfBuitenland.php index 732c17ae..20293a27 100644 --- a/api/src/Entity/VerblijfBuitenland.php +++ b/api/src/Entity/VerblijfBuitenland.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 VerblijfBuitenland { /** * @var UuidInterface + * * @example e2984465-190a-4562-829e-a8cca81aa35d * * @Groups({"read"}) @@ -31,7 +31,7 @@ class VerblijfBuitenland * @ORM\GeneratedValue(strategy="CUSTOM") * @ORM\CustomIdGenerator(class="Ramsey\Uuid\Doctrine\UuidGenerator") */ - private $uuid; + private $uuid; /** * @todo docblocks @@ -79,7 +79,8 @@ class VerblijfBuitenland private $vertrokkenOnbekendWaarheen; /** - * @var string $land Land of this VerblijfBuitenland + * @var string Land of this VerblijfBuitenland + * * @example Spain * * @Gedmo\Versioned @@ -89,7 +90,8 @@ class VerblijfBuitenland private $land; /** - * @var string $plaats Plaats of this VerblijfBuitenland + * @var string Plaats of this VerblijfBuitenland + * * @example Barcelona * * @Gedmo\Versioned @@ -99,7 +101,8 @@ class VerblijfBuitenland private $plaats; /** - * @var Verblijfplaats $verblijfplaats Verblijfplaats of this VerblijfBuitenland + * @var Verblijfplaats Verblijfplaats of this VerblijfBuitenland + * * @example Passeig de Sant Joan 21 * * @ORM\OneToOne(targetEntity="App\Entity\Verblijfplaats", mappedBy="verblijfBuitenland", cascade={"persist", "remove"}) @@ -157,26 +160,26 @@ public function setVertrokkenOnbekendWaarheen(bool $vertrokkenOnbekendWaarheen): 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 getVerblijfplaats(): ?Verblijfplaats diff --git a/api/src/Entity/Verblijfplaats.php b/api/src/Entity/Verblijfplaats.php index 86de55c1..50b1b8e3 100644 --- a/api/src/Entity/Verblijfplaats.php +++ b/api/src/Entity/Verblijfplaats.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 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; @@ -23,6 +22,7 @@ class Verblijfplaats { /** * @var UuidInterface + * * @example e2984465-190a-4562-829e-a8cca81aa35d * * @Groups({"read"}) @@ -31,7 +31,7 @@ class Verblijfplaats * @ORM\GeneratedValue(strategy="CUSTOM") * @ORM\CustomIdGenerator(class="Ramsey\Uuid\Doctrine\UuidGenerator") */ - private $uuid; + private $uuid; /** * @todo docblocks @@ -58,7 +58,8 @@ class Verblijfplaats private $funtieAdres; /** - * @var string $huisletter Huisletter of this Verblijfplaats + * @var string Huisletter of this Verblijfplaats + * * @example B * * @Groups({"read", "write"}) @@ -71,7 +72,8 @@ class Verblijfplaats private $huisletter; /** - * @var integer $huisnummer Huisnummer of this Verblijfplaats + * @var int Huisnummer of this Verblijfplaats + * * @example 21 * * @Groups({"read", "write"}) @@ -82,7 +84,8 @@ class Verblijfplaats private $huisnummer; /** - * @var string $huisnummertoevoeging Huisnummertoevoeging of this Verblijfplaats + * @var string Huisnummertoevoeging of this Verblijfplaats + * * @example B * * @Groups({"read", "write"}) @@ -126,10 +129,11 @@ class Verblijfplaats * @ORM\Column(type="boolean") * @Assert\Type("boolean") */ - private $indentificatieVestigingVanuitBuitenland = false; + private $indentificatieVestigingVanuitBuitenland = false; /** - * @var string $locatiebeschrijving Locatiebeschrijving of this Verblijfplaats + * @var string Locatiebeschrijving of this Verblijfplaats + * * @example Appartment * * @Groups({"read", "write"}) @@ -154,7 +158,8 @@ class Verblijfplaats private $naamOpenbareRuimte; /** - * @var string $postcode Postcode of this Verblijfplaats + * @var string Postcode of this Verblijfplaats + * * @example 08040 * * @Groups({"read", "write"}) @@ -167,7 +172,8 @@ class Verblijfplaats private $postcode; /** - * @var string $straatnaam Straatnaam of this Verblijfplaats + * @var string Straatnaam of this Verblijfplaats + * * @example Passeig de Sant Joan * * @Groups({"read", "write"}) @@ -190,7 +196,8 @@ class Verblijfplaats private $vanuitVertrokkenOnbekendWaarheen = false; /** - * @var string $woonplaatsnaam Woonplaatsnaam of this Verblijfplaats + * @var string Woonplaatsnaam of this Verblijfplaats + * * @example Barcelona * * @Groups({"read", "write"}) @@ -203,7 +210,8 @@ class Verblijfplaats private $woonplaatsnaam; /** - * @var string $datumAanvangAdreshouding Datum aanvang adreshouding of this Verblijfplaats + * @var string Datum aanvang adreshouding of this Verblijfplaats + * * @example 2005-01-01 * * @Groups({"read", "write"}) @@ -212,7 +220,8 @@ class Verblijfplaats private $datumAanvangAdreshouding; /** - * @var string $datumIngangGeldigheid Datum ingang geldigheid of this Verblijfplaats + * @var string Datum ingang geldigheid of this Verblijfplaats + * * @example 01-01-2005 * * @Groups({"read", "write"}) @@ -222,7 +231,8 @@ class Verblijfplaats private $datumIngangGeldigheid; /** - * @var string $datumInschrijvingInGemeente Datum inschrijving in gemeente of this Verblijfplaats + * @var string Datum inschrijving in gemeente of this Verblijfplaats + * * @example 01-01-2005 * * @Groups({"read", "write"}) @@ -232,7 +242,8 @@ class Verblijfplaats private $datumInschrijvingInGemeente; /** - * @var string $datumVestigingInNederland Datum vestiging in Nederland of this Verblijfplaats + * @var string Datum vestiging in Nederland of this Verblijfplaats + * * @example 01-01-2005 * * @Groups({"read", "write"}) @@ -242,7 +253,8 @@ class Verblijfplaats private $datumVestigingInNederland; /** - * @var string $gemeenteVanInschrijving Gemeente van inschrijving of this Verblijfplaats + * @var string Gemeente van inschrijving of this Verblijfplaats + * * @example Barcelona * * @Groups({"read", "write"}) @@ -252,7 +264,8 @@ class Verblijfplaats private $gemeenteVanInschrijving; /** - * @var string $landVanwaarIngeschreven Land van waar ingeschreven of this Verblijfplaats + * @var string Land van waar ingeschreven of this Verblijfplaats + * * @example Spain * * @Groups({"read", "write"}) @@ -263,7 +276,8 @@ class Verblijfplaats private $landVanwaarIngeschreven; /** - * @var VerblijfBuitenland $verblijfBuitenland VerblijfBuitenland of this Verblijfplaats + * @var VerblijfBuitenland VerblijfBuitenland of this Verblijfplaats + * * @example Spain * * @Groups({"read", "write"}) @@ -305,12 +319,12 @@ class Verblijfplaats // 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 getAanduidingBijHuisnummer(): ?string @@ -579,16 +593,16 @@ public function setInOnderzoek($inOnderzoek): self public function getIngeschrevenpersoon(): ?Ingeschrevenpersoon { - return $this->ingeschrevenpersoon; + return $this->ingeschrevenpersoon; } - public function setIngeschrevenpersoon(Ingeschrevenpersoon$ingeschrevenpersoon): self + public function setIngeschrevenpersoon(Ingeschrevenpersoon $ingeschrevenpersoon): self { - $this->ingeschrevenpersoon= $ingeschrevenpersoon; + $this->ingeschrevenpersoon = $ingeschrevenpersoon; // set the owning side of the relation if necessary - if ($this !== $ingeschrevenpersoon->getVerblijfplaats()) { - $ingeschrevenpersoon->setVerblijfplaats($this); + if ($this !== $ingeschrevenpersoon->getVerblijfplaats()) { + $ingeschrevenpersoon->setVerblijfplaats($this); } return $this; diff --git a/api/src/Entity/Verblijfstitel.php b/api/src/Entity/Verblijfstitel.php index 277affc5..398cd432 100644 --- a/api/src/Entity/Verblijfstitel.php +++ b/api/src/Entity/Verblijfstitel.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 Verblijfstitel { /** * @var UuidInterface + * * @example e2984465-190a-4562-829e-a8cca81aa35d * * @Groups({"read"}) @@ -31,7 +30,7 @@ class Verblijfstitel * @ORM\GeneratedValue(strategy="CUSTOM") * @ORM\CustomIdGenerator(class="Ramsey\Uuid\Doctrine\UuidGenerator") */ - private $uuid; + private $uuid; /** * @todo docblocks @@ -43,7 +42,8 @@ class Verblijfstitel private $aanduiding; /** - * @var string $datumEinde Datum einde of this Verblijftitel + * @var string Datum einde of this Verblijftitel + * * @example 01-01-2005 * * @Groups({"read","write"}) @@ -53,7 +53,8 @@ class Verblijfstitel private $datumEinde; /** - * @var string $datumIngang Datum ingang of this Verblijftitel + * @var string Datum ingang of this Verblijftitel + * * @example 01-01-2004 * * @Groups({"read","write"}) @@ -79,16 +80,15 @@ class Verblijfstitel */ private $ingeschrevenpersoon; - // On an object level we stil want to be able to gett the id public function getId(): ?string { - return $this->id; + return $this->id; } public function getUuid(): ?string { - return $this->id; + return $this->id; } public function getAanduiding(): ?Waardetabel @@ -141,17 +141,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 - $newVerblijfstitel = $ingeschrevenpersoon=== null ? null : $this; - if ($newVerblijfstitel !== $ingeschrevenpersoon->getVerblijfstitel()) { - $ingeschrevenpersoon->setVerblijfstitel($newVerblijfstitel); + $newVerblijfstitel = $ingeschrevenpersoon === null ? null : $this; + if ($newVerblijfstitel !== $ingeschrevenpersoon->getVerblijfstitel()) { + $ingeschrevenpersoon->setVerblijfstitel($newVerblijfstitel); } return $this; diff --git a/api/src/Entity/Waardetabel.php b/api/src/Entity/Waardetabel.php index e290052d..9e59bc90 100644 --- a/api/src/Entity/Waardetabel.php +++ b/api/src/Entity/Waardetabel.php @@ -3,11 +3,9 @@ namespace App\Entity; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Annotation\ApiProperty; use Doctrine\ORM\Mapping as ORM; use Ramsey\Uuid\UuidInterface; use Symfony\Component\Serializer\Annotation\Groups; -use Symfony\Component\Serializer\Annotation\MaxDepth; use Symfony\Component\Validator\Constraints as Assert; /** @@ -21,6 +19,7 @@ class Waardetabel { /** * @var UuidInterface + * * @example e2984465-190a-4562-829e-a8cca81aa35d * * @Groups({"read"}) @@ -29,7 +28,7 @@ class Waardetabel * @ORM\GeneratedValue(strategy="CUSTOM") * @ORM\CustomIdGenerator(class="Ramsey\Uuid\Doctrine\UuidGenerator") */ - private $id; + private $id; /** * @todo docblocks @@ -54,11 +53,10 @@ class Waardetabel */ private $omschrijving; - // On an object level we stil want to be able to gett the id public function getId(): ?string { - return $this->id; + return $this->id; } public function getCode(): ?string diff --git a/api/src/Filter/LikeFilter.php b/api/src/Filter/LikeFilter.php index 029c73e9..0bff7b42 100644 --- a/api/src/Filter/LikeFilter.php +++ b/api/src/Filter/LikeFilter.php @@ -36,14 +36,14 @@ public function getDescription(string $resourceClass): array $description = []; foreach ($this->properties as $property => $strategy) { $description["like_$property"] = [ - 'property' => $property, - 'type' => 'string', - 'required' => false, - 'swagger' => [ - 'description' => 'This filter narows your result using the * and _ wildcards, where * is assumed to be one or more characters and _ is assumed to be a single character', - 'name' => $property, - 'type' => 'string', - ], + 'property' => $property, + 'type' => 'string', + 'required' => false, + 'swagger' => [ + 'description' => 'This filter narows your result using the * and _ wildcards, where * is assumed to be one or more characters and _ is assumed to be a single character', + 'name' => $property, + 'type' => 'string', + ], ]; } diff --git a/api/src/Filter/RegexpFilter.php b/api/src/Filter/RegexpFilter.php index da1f747e..257b8f7b 100644 --- a/api/src/Filter/RegexpFilter.php +++ b/api/src/Filter/RegexpFilter.php @@ -36,14 +36,14 @@ public function getDescription(string $resourceClass): array $description = []; foreach ($this->properties as $property => $strategy) { $description["regexp_$property"] = [ - 'property' => $property, - 'type' => 'string', - 'required' => false, - 'swagger' => [ - 'description' => 'Filter for an exact match using a [Regular expression](https://en.wikipedia.org/wiki/Regular_expression).', - 'name' => $property, - 'type' => 'string', - ], + 'property' => $property, + 'type' => 'string', + 'required' => false, + 'swagger' => [ + 'description' => 'Filter for an exact match using a [Regular expression](https://en.wikipedia.org/wiki/Regular_expression).', + 'name' => $property, + 'type' => 'string', + ], ]; } diff --git a/api/src/Repository/AangaanHuwelijkPartnerschapRepository.php b/api/src/Repository/AangaanHuwelijkPartnerschapRepository.php index c258b22d..93b89c65 100644 --- a/api/src/Repository/AangaanHuwelijkPartnerschapRepository.php +++ b/api/src/Repository/AangaanHuwelijkPartnerschapRepository.php @@ -14,7 +14,7 @@ */ class AangaanHuwelijkPartnerschapRepository extends ServiceEntityRepository { - public function __construct(ManagerRegistry $registry) + public function __construct(ManagerRegistry $registry) { parent::__construct($registry, AangaanHuwelijkPartnerschap::class); } diff --git a/api/src/Repository/GeboorteRepository.php b/api/src/Repository/GeboorteRepository.php index 959fc924..7ba6bbc8 100644 --- a/api/src/Repository/GeboorteRepository.php +++ b/api/src/Repository/GeboorteRepository.php @@ -14,7 +14,7 @@ */ class GeboorteRepository extends ServiceEntityRepository { - public function __construct(ManagerRegistry $registry) + public function __construct(ManagerRegistry $registry) { parent::__construct($registry, Geboorte::class); } diff --git a/api/src/Repository/GezagsverhoudingRepository.php b/api/src/Repository/GezagsverhoudingRepository.php index da6d6863..b51b7774 100644 --- a/api/src/Repository/GezagsverhoudingRepository.php +++ b/api/src/Repository/GezagsverhoudingRepository.php @@ -14,7 +14,7 @@ */ class GezagsverhoudingRepository extends ServiceEntityRepository { - public function __construct(ManagerRegistry $registry) + public function __construct(ManagerRegistry $registry) { parent::__construct($registry, Gezagsverhouding::class); } diff --git a/api/src/Repository/IngeschrevenpersoonRepository.php b/api/src/Repository/IngeschrevenpersoonRepository.php index c7d1e143..982c5b12 100644 --- a/api/src/Repository/IngeschrevenpersoonRepository.php +++ b/api/src/Repository/IngeschrevenpersoonRepository.php @@ -14,11 +14,11 @@ */ class IngeschrevenpersoonRepository extends ServiceEntityRepository { - public function __construct(ManagerRegistry $registry) + public function __construct(ManagerRegistry $registry) { - parent::__construct($registry, Ingeschrevenpersoon::class); + parent::__construct($registry, Ingeschrevenpersoon::class); } - + public function getFamilly($bsn) { return $this->createQueryBuilder('i') @@ -31,10 +31,9 @@ public function getFamilly($bsn) $qb->expr()->eq('o.burgerservicenummer', $bsn) )) ->getQuery() - ->getResult() - ; + ->getResult(); } - + // /** // * @return NatuurlijkPersoon[] Returns an array of NatuurlijkPersoon objects // */ diff --git a/api/src/Repository/KindRepository.php b/api/src/Repository/KindRepository.php index 8bf62fea..a28bfe0e 100644 --- a/api/src/Repository/KindRepository.php +++ b/api/src/Repository/KindRepository.php @@ -14,7 +14,7 @@ */ class KindRepository extends ServiceEntityRepository { - public function __construct(ManagerRegistry $registry) + public function __construct(ManagerRegistry $registry) { parent::__construct($registry, Kind::class); } diff --git a/api/src/Repository/NLXRequestLogRepository.php b/api/src/Repository/NLXRequestLogRepository.php index 69add53c..33986f87 100644 --- a/api/src/Repository/NLXRequestLogRepository.php +++ b/api/src/Repository/NLXRequestLogRepository.php @@ -6,7 +6,6 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Common\Persistence\ManagerRegistry; - /** * @method NLXRequestLog|null find($id, $lockMode = null, $lockVersion = null) * @method NLXRequestLog|null findOneBy(array $criteria, array $orderBy = null) @@ -15,10 +14,10 @@ */ class NLXRequestLogRepository extends ServiceEntityRepository { - public function __construct(ManagerRegistry $registry) - { - parent::__construct($registry, ExampleEntity::class); - } + public function __construct(ManagerRegistry $registry) + { + parent::__construct($registry, ExampleEntity::class); + } /** * @return NLXRequestLog[] Returns an array of NLXRequestLog objects diff --git a/api/src/Repository/NaamPersoonRepository.php b/api/src/Repository/NaamPersoonRepository.php index 4f394cb7..8ff19f09 100644 --- a/api/src/Repository/NaamPersoonRepository.php +++ b/api/src/Repository/NaamPersoonRepository.php @@ -14,7 +14,7 @@ */ class NaamPersoonRepository extends ServiceEntityRepository { - public function __construct(ManagerRegistry $registry) + public function __construct(ManagerRegistry $registry) { parent::__construct($registry, NaamPersoon::class); } diff --git a/api/src/Repository/NationaliteitRepository.php b/api/src/Repository/NationaliteitRepository.php index 8144a67c..1bfe0f30 100644 --- a/api/src/Repository/NationaliteitRepository.php +++ b/api/src/Repository/NationaliteitRepository.php @@ -14,7 +14,7 @@ */ class NationaliteitRepository extends ServiceEntityRepository { - public function __construct(ManagerRegistry $registry) + public function __construct(ManagerRegistry $registry) { parent::__construct($registry, Nationaliteit::class); } diff --git a/api/src/Repository/OpschortingBijhoudingRepository.php b/api/src/Repository/OpschortingBijhoudingRepository.php index 73c7e87a..8ac1fc58 100644 --- a/api/src/Repository/OpschortingBijhoudingRepository.php +++ b/api/src/Repository/OpschortingBijhoudingRepository.php @@ -14,7 +14,7 @@ */ class OpschortingBijhoudingRepository extends ServiceEntityRepository { - public function __construct(ManagerRegistry $registry) + public function __construct(ManagerRegistry $registry) { parent::__construct($registry, OpschortingBijhouding::class); } diff --git a/api/src/Repository/OuderRepository.php b/api/src/Repository/OuderRepository.php index ec77b9a3..e8bc6617 100644 --- a/api/src/Repository/OuderRepository.php +++ b/api/src/Repository/OuderRepository.php @@ -14,7 +14,7 @@ */ class OuderRepository extends ServiceEntityRepository { - public function __construct(ManagerRegistry $registry) + public function __construct(ManagerRegistry $registry) { parent::__construct($registry, Ouder::class); } diff --git a/api/src/Repository/OverlijdenRepository.php b/api/src/Repository/OverlijdenRepository.php index d6c053f6..c9ce3fcc 100644 --- a/api/src/Repository/OverlijdenRepository.php +++ b/api/src/Repository/OverlijdenRepository.php @@ -14,7 +14,7 @@ */ class OverlijdenRepository extends ServiceEntityRepository { - public function __construct(ManagerRegistry $registry) + public function __construct(ManagerRegistry $registry) { parent::__construct($registry, Overlijden::class); } diff --git a/api/src/Repository/PartnerRepository.php b/api/src/Repository/PartnerRepository.php index db8a8d48..274e4f26 100644 --- a/api/src/Repository/PartnerRepository.php +++ b/api/src/Repository/PartnerRepository.php @@ -14,7 +14,7 @@ */ class PartnerRepository extends ServiceEntityRepository { - public function __construct(ManagerRegistry $registry) + public function __construct(ManagerRegistry $registry) { parent::__construct($registry, Partner::class); } diff --git a/api/src/Repository/ReisdocumentRepository.php b/api/src/Repository/ReisdocumentRepository.php index 18e8c661..94d1fa03 100644 --- a/api/src/Repository/ReisdocumentRepository.php +++ b/api/src/Repository/ReisdocumentRepository.php @@ -14,7 +14,7 @@ */ class ReisdocumentRepository extends ServiceEntityRepository { - public function __construct(ManagerRegistry $registry) + public function __construct(ManagerRegistry $registry) { parent::__construct($registry, Reisdocument::class); } diff --git a/api/src/Repository/VerblijfBuitenlandRepository.php b/api/src/Repository/VerblijfBuitenlandRepository.php index d6f73cea..e916deec 100644 --- a/api/src/Repository/VerblijfBuitenlandRepository.php +++ b/api/src/Repository/VerblijfBuitenlandRepository.php @@ -14,7 +14,7 @@ */ class VerblijfBuitenlandRepository extends ServiceEntityRepository { - public function __construct(ManagerRegistry $registry) + public function __construct(ManagerRegistry $registry) { parent::__construct($registry, VerblijfBuitenland::class); } diff --git a/api/src/Repository/VerblijfplaatsRepository.php b/api/src/Repository/VerblijfplaatsRepository.php index 9485e360..31c352af 100644 --- a/api/src/Repository/VerblijfplaatsRepository.php +++ b/api/src/Repository/VerblijfplaatsRepository.php @@ -14,7 +14,7 @@ */ class VerblijfplaatsRepository extends ServiceEntityRepository { - public function __construct(ManagerRegistry $registry) + public function __construct(ManagerRegistry $registry) { parent::__construct($registry, Verblijfplaats::class); } diff --git a/api/src/Repository/VerblijfstitelRepository.php b/api/src/Repository/VerblijfstitelRepository.php index 82dc68cf..2e78b253 100644 --- a/api/src/Repository/VerblijfstitelRepository.php +++ b/api/src/Repository/VerblijfstitelRepository.php @@ -14,7 +14,7 @@ */ class VerblijfstitelRepository extends ServiceEntityRepository { - public function __construct(ManagerRegistry $registry) + public function __construct(ManagerRegistry $registry) { parent::__construct($registry, Verblijfstitel::class); } diff --git a/api/src/Repository/WaardetabelRepository.php b/api/src/Repository/WaardetabelRepository.php index f9fd4c80..2b6560a9 100644 --- a/api/src/Repository/WaardetabelRepository.php +++ b/api/src/Repository/WaardetabelRepository.php @@ -14,7 +14,7 @@ */ class WaardetabelRepository extends ServiceEntityRepository { - public function __construct(ManagerRegistry $registry) + public function __construct(ManagerRegistry $registry) { parent::__construct($registry, Waardetabel::class); } diff --git a/api/src/Service/AdressenService.php b/api/src/Service/AdressenService.php index 7a84fbce..7f7c19f2 100644 --- a/api/src/Service/AdressenService.php +++ b/api/src/Service/AdressenService.php @@ -1,4 +1,5 @@ params = $params; - $this->cash = $cache; - - $this->client= new Client([ - // Base URI is used with relative requests - //'base_uri' => $this->params->get('common_ground.bag.location'), - 'base_uri' => 'http://adressen.zaakonline.nl/', - // You can set any number of default request options. - 'timeout' => 4000.0, - // This api key needs to go into params - 'headers' => ['X-Api-Key' => $this->params->get('common_ground.bag.apikey')] - ]); - } - - public function getNummeraanduiding($postcode, $huisnummer, $huisnummerToevoeging) - { - // Lets first try the cach - $item = $this->cash->getItem('nummeraanduiding_'.md5($postcode.$huisnummer.$huisnummerToevoeging)); - if ($item->isHit()) { - return $item->get(); - } - - $response = $this->client->request('GET','/adressen', ['query' => 'postcode=$postcode&huisnummer=$huisnummer&huisnummer_toevoeging=$huisnummerToevoeging',]); - $response = json_decode($response->getBody(), true); - $response = $response; - $item->set($response); - $item->expiresAt(new \DateTime('tomorrow')); - $this->cash->save($item); - - return $item->get(); - } + private $params; + private $cash; + private $client; + + public function __construct(ParameterBagInterface $params, CacheInterface $cache) + { + $this->params = $params; + $this->cash = $cache; + + $this->client = new Client([ + // Base URI is used with relative requests + //'base_uri' => $this->params->get('common_ground.bag.location'), + 'base_uri' => 'http://adressen.zaakonline.nl/', + // You can set any number of default request options. + 'timeout' => 4000.0, + // This api key needs to go into params + 'headers' => ['X-Api-Key' => $this->params->get('common_ground.bag.apikey')], + ]); + } + + public function getNummeraanduiding($postcode, $huisnummer, $huisnummerToevoeging) + { + // Lets first try the cach + $item = $this->cash->getItem('nummeraanduiding_'.md5($postcode.$huisnummer.$huisnummerToevoeging)); + if ($item->isHit()) { + return $item->get(); + } + + $response = $this->client->request('GET', '/adressen', ['query' => 'postcode=$postcode&huisnummer=$huisnummer&huisnummer_toevoeging=$huisnummerToevoeging']); + $response = json_decode($response->getBody(), true); + $response = $response; + $item->set($response); + $item->expiresAt(new \DateTime('tomorrow')); + $this->cash->save($item); + + return $item->get(); + } } diff --git a/api/src/Service/BrpBotService.php b/api/src/Service/BrpBotService.php index 4de864ae..31498f6b 100644 --- a/api/src/Service/BrpBotService.php +++ b/api/src/Service/BrpBotService.php @@ -1,4 +1,5 @@ * * The main focus of this service to to provide craweler bot behavior for the BRP in order to make up for the uther and complete lack of proper data connections - * + * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ - namespace App\Service; -use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; +use App\Entity\Request; use Doctrine\ORM\EntityManagerInterface; use GuzzleHttp\Client; use Symfony\Component\Cache\Adapter\AdapterInterface as CacheInterface; - -use App\Entity\Request; +use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; class BrpBotService { @@ -28,24 +27,22 @@ class BrpBotService private $params; private $cash; private $client; - + public function __construct(EntityManagerInterface $em, ParameterBagInterface $params, CacheInterface $cache) - { - $this->em = $em; - $this->params = $params; - $this->cash = $cache; - - $this->client= new Client([ - // Base URI is used with relative requests - /*@todo we need to make this configurable */ - //'base_uri' => $this->params->get('common_ground.bag.location'), - 'base_uri' => 'http://brp.zaakonline.nl/', - // You can set any number of default request options. - 'timeout' => 4000.0, - // This api key needs to go into params - 'headers' => ['X-Api-Key' => $this->params->get('common_ground.bag.apikey')] - ]); - } - - + { + $this->em = $em; + $this->params = $params; + $this->cash = $cache; + + $this->client = new Client([ + // Base URI is used with relative requests + /*@todo we need to make this configurable */ + //'base_uri' => $this->params->get('common_ground.bag.location'), + 'base_uri' => 'http://brp.zaakonline.nl/', + // You can set any number of default request options. + 'timeout' => 4000.0, + // This api key needs to go into params + 'headers' => ['X-Api-Key' => $this->params->get('common_ground.bag.apikey')], + ]); + } } diff --git a/api/src/Subscriber/FieldsSubscriber.php b/api/src/Subscriber/FieldsSubscriber.php index f842a8e2..9a60b376 100644 --- a/api/src/Subscriber/FieldsSubscriber.php +++ b/api/src/Subscriber/FieldsSubscriber.php @@ -24,7 +24,7 @@ public function __construct(ParameterBagInterface $params, SerializerInterface $ public static function getSubscribedEvents() { return [ - KernelEvents::VIEW => ['FilterFields', EventPriorities::PRE_SERIALIZE], + KernelEvents::VIEW => ['FilterFields', EventPriorities::PRE_SERIALIZE], ]; } diff --git a/api/src/Subscriber/IngeschrevenpersonenSubscriber.php b/api/src/Subscriber/IngeschrevenpersonenSubscriber.php index 4945a242..09ff0e7d 100644 --- a/api/src/Subscriber/IngeschrevenpersonenSubscriber.php +++ b/api/src/Subscriber/IngeschrevenpersonenSubscriber.php @@ -2,149 +2,136 @@ namespace App\Subscriber; -use ApiPlatform\Core\Exception\InvalidArgumentException; use ApiPlatform\Core\EventListener\EventPriorities; +use App\Entity\Ingeschrevenpersoon; +use Doctrine\ORM\EntityManagerInterface; +use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent; use Symfony\Component\HttpKernel\KernelEvents; -use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\Serializer\SerializerInterface; -use Doctrine\ORM\EntityManagerInterface; -use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; - -Use App\Entity\Ingeschrevenpersoon; // We intercept the call here so the we can build our own query for the database, that might be a bit over the top now but we need to make a stuf question out of this at a latter moment. class IngeschrevenpersonenSubscriber implements EventSubscriberInterface { - private $params; - private $em; - private $serializer; - - public function __construct(ParameterBagInterface $params, EntityManagerInterface $em, SerializerInterface $serializer) - { - $this->params = $params; - $this->em= $em; - $this->serializer= $serializer; - } - - public static function getSubscribedEvents() - { - return [ - KernelEvents::VIEW => ['IngeschrevenpersonenQuery', EventPriorities::PRE_VALIDATE], - ]; - - } - - public function IngeschrevenpersonenQuery(GetResponseForControllerResultEvent $event) - { - $result = $event->getControllerResult(); - $method = $event->getRequest()->getMethod(); - - $contentType= $event->getRequest()->headers->get('accept'); - - if(!$contentType){ - $contentType= $event->getRequest()->headers->get('Accept'); - } - - //var_dump( $event->getRequest()->get('_route')); dsadds adsaadsaadsa - - // Lats make sure that some one posts correctly - if (Request::METHOD_GET !== $method || $event->getRequest()->get('_route') != 'api_ingeschrevenpersoons_get_collection') { - return; - } - - $expand = $event->getRequest()->query->get('expand'); - $fields = $event->getRequest()->query->get('fields'); - $burgerservicenummer = strval ($event->getRequest()->query->get('burgerservicenummer')); - $familieEerstegraad = strval ($event->getRequest()->query->get('familie_eerstegraad')); - //$familieTweedegraad = strval ($event->getRequest()->query->get('familie_tweedegraad')); - //$familieDerdegraad = strval ($event->getRequest()->query->get('familie_derdegraad')); - //$familieVierdegraad = strval ($event->getRequest()->query->get('familie_vierdegraad')); - $geboorteDatum = $event->getRequest()->query->get('geboorte__datum'); - $geslachtsaanduiding = $event->getRequest()->query->get('geslachtsaanduiding'); - $inclusiefoverledenpersonen = $event->getRequest()->query->get('inclusiefoverledenpersonen'); - $naamGeslachtsnaam = $event->getRequest()->query->get('naam__geslachtsnaam'); - $naamVoornamen = $event->getRequest()->query->get('naam__voornamen'); - $naamVoorvoegsel = $event->getRequest()->query->get('naam__voorvoegsel'); - $verblijfplaatsGemeentevaninschrijving = $event->getRequest()->query->get('verblijfplaats__gemeentevaninschrijving'); - $verblijfplaatsHuisletter = $event->getRequest()->query->get('verblijfplaats__huisletter'); - $verblijfplaatsHuisnummer = $event->getRequest()->query->get('verblijfplaats__huisnummer'); - $verblijfplaatsHuisnummertoevoeging = $event->getRequest()->query->get('verblijfplaats__huisnummertoevoeging'); - $verblijfplaatsIdentificatiecodenummeraanduiding = $event->getRequest()->query->get('verblijfplaats__identificatiecodenummeraanduiding'); - $verblijfplaatsNaamopenbareruimte = $event->getRequest()->query->get('verblijfplaats__naamopenbareruimte'); - $verblijfplaatsPostcode = $event->getRequest()->query->get('verblijfplaats__postcode'); - - $qb = $this->em->getRepository(Ingeschrevenpersoon::class)->createQueryBuilder('i') - ->leftJoin('i.naam', 'n') - ->leftJoin('i.verblijfplaats', 'v'); - - if($burgerservicenummer){ - $qb->andWhere('i.burgerservicenummer = :burgerservicenummer') - ->setParameter('burgerservicenummer', $burgerservicenummer); - - } - - if($verblijfplaatsIdentificatiecodenummeraanduiding){ - - $qb - ->andWhere('v.bagId = :verblijfplaatsIdentificatiecodenummeraanduiding') - ->setParameter('verblijfplaatsIdentificatiecodenummeraanduiding', $verblijfplaatsIdentificatiecodenummeraanduiding); - - } - - if($familieEerstegraad){ - $qb->leftJoin('i.kinderen', 'k') - ->leftJoin('i.partners', 'p') - ->leftJoin('i.ouders', 'o') - ->andWhere($qb->expr()->orX( - $qb->expr()->eq('k.burgerservicenummer', ':familieEerstegraad'), - $qb->expr()->eq('p.burgerservicenummer', ':familieEerstegraad'), - $qb->expr()->eq('o.burgerservicenummer', ':familieEerstegraad') - )) - ->setParameter('familieEerstegraad', $familieEerstegraad); - } - - // Lets set a return content type - switch ($contentType) { - case 'application/json': - $renderType = "json"; - break; - case 'application/ld+json': - $renderType= "jsonld"; - break; - case 'application/hal+json': - $renderType= "jsonhal"; - break; - default: - $contentType = 'application/json'; - $renderType = "json"; - } - - // - $results = $qb->getQuery()->getResult(); - - - - // now we need to overide the normal subscriber - $json = $this->serializer->serialize( - $results, - $renderType, ['enable_max_depth' => true] - ); - - - $response = new Response( - $json, - Response::HTTP_OK, - ['content-type' => $contentType] - ); - - $event->setResponse($response); - - - return; - } + private $params; + private $em; + private $serializer; + + public function __construct(ParameterBagInterface $params, EntityManagerInterface $em, SerializerInterface $serializer) + { + $this->params = $params; + $this->em = $em; + $this->serializer = $serializer; + } + + public static function getSubscribedEvents() + { + return [ + KernelEvents::VIEW => ['IngeschrevenpersonenQuery', EventPriorities::PRE_VALIDATE], + ]; + } + + public function IngeschrevenpersonenQuery(GetResponseForControllerResultEvent $event) + { + $result = $event->getControllerResult(); + $method = $event->getRequest()->getMethod(); + + $contentType = $event->getRequest()->headers->get('accept'); + + if (!$contentType) { + $contentType = $event->getRequest()->headers->get('Accept'); + } + + //var_dump( $event->getRequest()->get('_route')); dsadds adsaadsaadsa + + // Lats make sure that some one posts correctly + if (Request::METHOD_GET !== $method || $event->getRequest()->get('_route') != 'api_ingeschrevenpersoons_get_collection') { + return; + } + + $expand = $event->getRequest()->query->get('expand'); + $fields = $event->getRequest()->query->get('fields'); + $burgerservicenummer = strval($event->getRequest()->query->get('burgerservicenummer')); + $familieEerstegraad = strval($event->getRequest()->query->get('familie_eerstegraad')); + //$familieTweedegraad = strval ($event->getRequest()->query->get('familie_tweedegraad')); + //$familieDerdegraad = strval ($event->getRequest()->query->get('familie_derdegraad')); + //$familieVierdegraad = strval ($event->getRequest()->query->get('familie_vierdegraad')); + $geboorteDatum = $event->getRequest()->query->get('geboorte__datum'); + $geslachtsaanduiding = $event->getRequest()->query->get('geslachtsaanduiding'); + $inclusiefoverledenpersonen = $event->getRequest()->query->get('inclusiefoverledenpersonen'); + $naamGeslachtsnaam = $event->getRequest()->query->get('naam__geslachtsnaam'); + $naamVoornamen = $event->getRequest()->query->get('naam__voornamen'); + $naamVoorvoegsel = $event->getRequest()->query->get('naam__voorvoegsel'); + $verblijfplaatsGemeentevaninschrijving = $event->getRequest()->query->get('verblijfplaats__gemeentevaninschrijving'); + $verblijfplaatsHuisletter = $event->getRequest()->query->get('verblijfplaats__huisletter'); + $verblijfplaatsHuisnummer = $event->getRequest()->query->get('verblijfplaats__huisnummer'); + $verblijfplaatsHuisnummertoevoeging = $event->getRequest()->query->get('verblijfplaats__huisnummertoevoeging'); + $verblijfplaatsIdentificatiecodenummeraanduiding = $event->getRequest()->query->get('verblijfplaats__identificatiecodenummeraanduiding'); + $verblijfplaatsNaamopenbareruimte = $event->getRequest()->query->get('verblijfplaats__naamopenbareruimte'); + $verblijfplaatsPostcode = $event->getRequest()->query->get('verblijfplaats__postcode'); + + $qb = $this->em->getRepository(Ingeschrevenpersoon::class)->createQueryBuilder('i') + ->leftJoin('i.naam', 'n') + ->leftJoin('i.verblijfplaats', 'v'); + + if ($burgerservicenummer) { + $qb->andWhere('i.burgerservicenummer = :burgerservicenummer') + ->setParameter('burgerservicenummer', $burgerservicenummer); + } + + if ($verblijfplaatsIdentificatiecodenummeraanduiding) { + $qb + ->andWhere('v.bagId = :verblijfplaatsIdentificatiecodenummeraanduiding') + ->setParameter('verblijfplaatsIdentificatiecodenummeraanduiding', $verblijfplaatsIdentificatiecodenummeraanduiding); + } + + if ($familieEerstegraad) { + $qb->leftJoin('i.kinderen', 'k') + ->leftJoin('i.partners', 'p') + ->leftJoin('i.ouders', 'o') + ->andWhere($qb->expr()->orX( + $qb->expr()->eq('k.burgerservicenummer', ':familieEerstegraad'), + $qb->expr()->eq('p.burgerservicenummer', ':familieEerstegraad'), + $qb->expr()->eq('o.burgerservicenummer', ':familieEerstegraad') + )) + ->setParameter('familieEerstegraad', $familieEerstegraad); + } + + // Lets set a return content type + switch ($contentType) { + case 'application/json': + $renderType = 'json'; + break; + case 'application/ld+json': + $renderType = 'jsonld'; + break; + case 'application/hal+json': + $renderType = 'jsonhal'; + break; + default: + $contentType = 'application/json'; + $renderType = 'json'; + } + + // + $results = $qb->getQuery()->getResult(); + + // now we need to overide the normal subscriber + $json = $this->serializer->serialize( + $results, + $renderType, ['enable_max_depth' => true] + ); + + $response = new Response( + $json, + Response::HTTP_OK, + ['content-type' => $contentType] + ); + + $event->setResponse($response); + } } diff --git a/api/src/Subscriber/IngeschrevenpersoonSubscriber.php b/api/src/Subscriber/IngeschrevenpersoonSubscriber.php index 8a30216d..8cf38b39 100644 --- a/api/src/Subscriber/IngeschrevenpersoonSubscriber.php +++ b/api/src/Subscriber/IngeschrevenpersoonSubscriber.php @@ -2,89 +2,82 @@ namespace App\Subscriber; -use ApiPlatform\Core\Exception\InvalidArgumentException; use ApiPlatform\Core\EventListener\EventPriorities; +use App\Entity\Ingeschrevenpersoon; +use Doctrine\ORM\EntityManagerInterface; +use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent; use Symfony\Component\HttpKernel\KernelEvents; -use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\Serializer\SerializerInterface; -use Doctrine\ORM\EntityManagerInterface; -use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; - -Use App\Entity\Ingeschrevenpersoon; class IngeschrevenpersoonSubscriber implements EventSubscriberInterface { - private $params; - private $em; - private $serializer; - - public function __construct(ParameterBagInterface $params, EntityManagerInterface $em, SerializerInterface $serializer) - { - $this->params = $params; - $this->em= $em; - $this->serializer= $serializer; - } - - public static function getSubscribedEvents() - { - return [ - KernelEvents::VIEW => ['IngeschrevenpersoonOnBsn', EventPriorities::PRE_VALIDATE], - ]; - - } - - public function IngeschrevenpersoonOnBsn(GetResponseForControllerResultEvent $event) - { - $result = $event->getControllerResult(); - $burgerservicenummer= $event->getRequest()->attributes->get('burgerservicenummer'); - $contentType= $event->getRequest()->headers->get('accept'); - if(!$contentType){ - $contentType= $event->getRequest()->headers->get('Accept'); - } - $method = $event->getRequest()->getMethod(); - - - // Lats make sure that some one posts correctly - if (Request::METHOD_GET !== $method || $event->getRequest()->get('_route') != 'api_ingeschrevenpersoons_get_on_bsn_collection') { - return; - } - - // Lets set a return content type - switch ($contentType) { - case 'application/json': - $renderType = "json"; - break; - case 'application/ld+json': - $renderType= "jsonld"; - break; - case 'application/hal+json': - $renderType= "jsonhal"; - break; - default: - $contentType = 'application/json'; - $renderType = "json"; - } - - $result = $this->em->getRepository(Ingeschrevenpersoon::class)->findOneBy(array('burgerservicenummer' => $burgerservicenummer)); - - // now we need to overide the normal subscriber - $json = $this->serializer->serialize( - $result, - $renderType,['enable_max_depth' => true] - ); - - $response = new Response( - $json, - Response::HTTP_OK, - ['content-type' => $contentType] - ); - - $event->setResponse($response); - - return; - } + private $params; + private $em; + private $serializer; + + public function __construct(ParameterBagInterface $params, EntityManagerInterface $em, SerializerInterface $serializer) + { + $this->params = $params; + $this->em = $em; + $this->serializer = $serializer; + } + + public static function getSubscribedEvents() + { + return [ + KernelEvents::VIEW => ['IngeschrevenpersoonOnBsn', EventPriorities::PRE_VALIDATE], + ]; + } + + public function IngeschrevenpersoonOnBsn(GetResponseForControllerResultEvent $event) + { + $result = $event->getControllerResult(); + $burgerservicenummer = $event->getRequest()->attributes->get('burgerservicenummer'); + $contentType = $event->getRequest()->headers->get('accept'); + if (!$contentType) { + $contentType = $event->getRequest()->headers->get('Accept'); + } + $method = $event->getRequest()->getMethod(); + + // Lats make sure that some one posts correctly + if (Request::METHOD_GET !== $method || $event->getRequest()->get('_route') != 'api_ingeschrevenpersoons_get_on_bsn_collection') { + return; + } + + // Lets set a return content type + switch ($contentType) { + case 'application/json': + $renderType = 'json'; + break; + case 'application/ld+json': + $renderType = 'jsonld'; + break; + case 'application/hal+json': + $renderType = 'jsonhal'; + break; + default: + $contentType = 'application/json'; + $renderType = 'json'; + } + + $result = $this->em->getRepository(Ingeschrevenpersoon::class)->findOneBy(['burgerservicenummer' => $burgerservicenummer]); + + // now we need to overide the normal subscriber + $json = $this->serializer->serialize( + $result, + $renderType, ['enable_max_depth' => true] + ); + + $response = new Response( + $json, + Response::HTTP_OK, + ['content-type' => $contentType] + ); + + $event->setResponse($response); + } } diff --git a/api/src/Subscriber/NLXSubscriber.php b/api/src/Subscriber/NLXSubscriber.php index 5411001e..09cd5e55 100644 --- a/api/src/Subscriber/NLXSubscriber.php +++ b/api/src/Subscriber/NLXSubscriber.php @@ -33,8 +33,8 @@ public function __construct(ParameterBagInterface $params, EntityManagerInterfac public static function getSubscribedEvents() { return [ - KernelEvents::VIEW => ['NLXLog', EventPriorities::PRE_VALIDATE], - KernelEvents::VIEW => ['NLXAudit', EventPriorities::PRE_SERIALIZE], + KernelEvents::VIEW => ['NLXLog', EventPriorities::PRE_VALIDATE], + KernelEvents::VIEW => ['NLXAudit', EventPriorities::PRE_SERIALIZE], ]; } diff --git a/api/src/Subscriber/ValidOnSubscriber.php b/api/src/Subscriber/ValidOnSubscriber.php index 4aac9f15..dd237ae9 100644 --- a/api/src/Subscriber/ValidOnSubscriber.php +++ b/api/src/Subscriber/ValidOnSubscriber.php @@ -29,7 +29,7 @@ public function __construct(ParameterBagInterface $params, EntityManagerInterfac public static function getSubscribedEvents() { return [ - KernelEvents::VIEW => ['validOn', EventPriorities::PRE_SERIALIZE], + KernelEvents::VIEW => ['validOn', EventPriorities::PRE_SERIALIZE], ]; } diff --git a/api/src/Swagger/SwaggerDecorator.php b/api/src/Swagger/SwaggerDecorator.php index b0610232..6d9b5de2 100644 --- a/api/src/Swagger/SwaggerDecorator.php +++ b/api/src/Swagger/SwaggerDecorator.php @@ -63,17 +63,17 @@ public function normalize($object, $format = null, array $context = []) // Lets add JWT-Oauth $docs['securityDefinitions']['JWT-Oauth'] = [ - 'type' => 'oauth2', - 'authorizationUrl'=> 'http://petstore.swagger.io/api/oauth/dialog', - 'flow' => 'implicit', - 'scopes' => [], //scopes will be filled later autmaticly + 'type' => 'oauth2', + 'authorizationUrl'=> 'http://petstore.swagger.io/api/oauth/dialog', + 'flow' => 'implicit', + 'scopes' => [], //scopes will be filled later autmaticly ]; $docs['securityDefinitions']['JWT-Token'] = [ - 'type' => 'apiKey', - 'in' => 'header', // can be "header", "query" or "cookie" - 'name' => 'Authorization', // name of the header, query parameter or cookie - 'scopes'=> [], //scopes will be filled later autmaticly + 'type' => 'apiKey', + 'in' => 'header', // can be "header", "query" or "cookie" + 'name' => 'Authorization', // name of the header, query parameter or cookie + 'scopes'=> [], //scopes will be filled later autmaticly ]; // Lets get al the entities known to doctrine @@ -114,8 +114,8 @@ public function normalize($object, $format = null, array $context = []) //$additionalEntityDocs = $this->getAdditionalEntityDocs($entity); $entityDocs = $this->getAdditionalEntityDocs($entity); // Only run if we have aditional docs - if(array_key_exists('properties',$entityDocs)){ - $additionalDocs = array_merge($additionalDocs, $entityDocs['properties']); + if (array_key_exists('properties', $entityDocs)) { + $additionalDocs = array_merge($additionalDocs, $entityDocs['properties']); } // Security @@ -196,16 +196,16 @@ public function normalize($object, $format = null, array $context = []) // NLX loging headers $call['parameters'][] = [ - 'name' => 'Authorization', - 'description' => 'The JWT of the entity performing the request', - 'in' => 'header', + 'name' => 'Authorization', + 'description' => 'The JWT of the entity performing the request', + 'in' => 'header', ]; // NLX loging headers $call['parameters'][] = [ - 'name' => 'API-Version', - 'description' => 'The version of the API conform [Landelijke API-strategie.](https://geonovum.github.io/KP-APIs/#versioning)', - 'example' => '1.0.1', - 'in' => 'header', + 'name' => 'API-Version', + 'description' => 'The version of the API conform [Landelijke API-strategie.](https://geonovum.github.io/KP-APIs/#versioning)', + 'example' => '1.0.1', + 'in' => 'header', ]; /* // NLX loging headers @@ -223,33 +223,33 @@ public function normalize($object, $format = null, array $context = []) */ // NLX loging headers $call['parameters'][] = [ - 'name' => 'X-NLX-Logrecord-ID', - 'description' => 'A globally unique id of the request, which makes a request traceable throughout the network.', - 'in' => 'header', + 'name' => 'X-NLX-Logrecord-ID', + 'description' => 'A globally unique id of the request, which makes a request traceable throughout the network.', + 'in' => 'header', ]; // NLX loging headers $call['parameters'][] = [ - 'name' => 'X-NLX-Request-Process-Id', - 'description' => 'A process id for purpose registration (doelbinding)', - 'in' => 'header', + 'name' => 'X-NLX-Request-Process-Id', + 'description' => 'A process id for purpose registration (doelbinding)', + 'in' => 'header', ]; // NLX loging headers $call['parameters'][] = [ - 'name' => 'X-NLX-Request-Data-Elements', - 'description' => 'A list of requested data elements', - 'in' => 'header', + 'name' => 'X-NLX-Request-Data-Elements', + 'description' => 'A list of requested data elements', + 'in' => 'header', ]; // NLX loging headers $call['parameters'][] = [ - 'name' => 'X-NLX-Request-Data-Subject', - 'description' => 'A key-value list of data subjects related to this request. e.g. `bsn=12345678, kenteken=ab-12-fg`', - 'in' => 'header', + 'name' => 'X-NLX-Request-Data-Subject', + 'description' => 'A key-value list of data subjects related to this request. e.g. `bsn=12345678, kenteken=ab-12-fg`', + 'in' => 'header', ]; // NLX loging headers $call['parameters'][] = [ - 'name' => 'X-NLX-Audit-Clarification', - 'description' => 'A clarification as to why a request has been made (doelbinding)', - 'in' => 'header', + 'name' => 'X-NLX-Audit-Clarification', + 'description' => 'A clarification as to why a request has been made (doelbinding)', + 'in' => 'header', ]; if ($method == 'get') { @@ -259,48 +259,48 @@ public function normalize($object, $format = null, array $context = []) // WEBSUB header $call['parameters'][] = [ - 'name' => 'Link', - 'description' => 'A [websub](https://www.w3.org/TR/websub/#discovery) header like ; rel="hub"', - 'in' => 'header', + 'name' => 'Link', + 'description' => 'A [websub](https://www.w3.org/TR/websub/#discovery) header like ; rel="hub"', + 'in' => 'header', ]; // Lets add the extend functionality $call['parameters'][] = [ - 'name' => 'extend[]', - 'required' => false, - 'description' => 'An array of nested objects to include in the return object', - 'in' => 'query', - 'schema' => ['type'=>'array'], + 'name' => 'extend[]', + 'required' => false, + 'description' => 'An array of nested objects to include in the return object', + 'in' => 'query', + 'schema' => ['type'=>'array'], ]; // Lets add the fields functionality $call['parameters'][] = [ - 'name' => 'fields[]', - 'required' => false, - 'description' => 'An array of fields to return in output, wil return all fields is not supplied', - 'in' => 'query', - 'schema' => ['type'=>'array'], + 'name' => 'fields[]', + 'required' => false, + 'description' => 'An array of fields to return in output, wil return all fields is not supplied', + 'in' => 'query', + 'schema' => ['type'=>'array'], ]; // Lets add some time travel $call['parameters'][] = [ - 'name' => 'validOn', - 'required' => false, - 'description' => 'Returns object as valid on a given date time', - 'schema' => ['type'=>'string', 'format' => 'date-time'], - 'in' => 'query', + 'name' => 'validOn', + 'required' => false, + 'description' => 'Returns object as valid on a given date time', + 'schema' => ['type'=>'string', 'format' => 'date-time'], + 'in' => 'query', ]; $call['parameters'][] = [ - 'name' => 'validFrom', - 'required' => false, - 'description' => 'Returns objects valid from a given date time', - 'schema' => ['type'=>'string', 'format' => 'date-time'], - 'in' => 'query', + 'name' => 'validFrom', + 'required' => false, + 'description' => 'Returns objects valid from a given date time', + 'schema' => ['type'=>'string', 'format' => 'date-time'], + 'in' => 'query', ]; $call['parameters'][] = [ - 'name' => 'validUntil', - 'required' => false, - 'description' => 'Returns objects valid until a given date time', - 'schema' => ['type'=>'string', 'format' => 'date-time'], - 'in' => 'query', + 'name' => 'validUntil', + 'required' => false, + 'description' => 'Returns objects valid until a given date time', + 'schema' => ['type'=>'string', 'format' => 'date-time'], + 'in' => 'query', ]; } }