+ */
+ private function getEntityChangeSet($entity, EntityManagerInterface $entityManager)
+ {
+ $unitOfWork = $entityManager->getUnitOfWork();
+ $unitOfWork->computeChangeSets();
+
+ return $unitOfWork->getEntityChangeSet($entity);
+ }
+
+ /**
+ * Processes the schuldenChangeSet array to replace proxy objects for all organisation types
+ * (e.g., 'schuldeiser' and 'incassant') with their respective data arrays.
+ *
+ * @param array $schuldenChangeSet The change set containing potential proxy objects for organisations.
+ *
+ * @return array The updated change set with proxy objects replaced by arrays containing organisation data.
+ */
+ private function loadProxyEntityForSchuldeiserOrganisations(array $schuldenChangeSet)
+ {
+ $SchuldeiserOrganisationTypes = SchuldeiserOrganisationType::TYPES;
+
+ foreach ($SchuldeiserOrganisationTypes as $organisationType) {
+ $schuldenChangeSet = $this->loadProxyEntityForOrganisationType($organisationType, $schuldenChangeSet);
+ }
+
+ return $schuldenChangeSet;
+ }
+
+ /**
+ * Replaces proxy objects for a specific organisation type in the schuldenChangeSet array
+ * with arrays containing the organisation's ID and bedrijfsnaam.
+ *
+ * @param string $organisationType The type of organisation (e.g., 'schuldeiser' or 'incassant').
+ * @param array $schuldenChangeSet The change set containing potential proxy objects for the given organisation type.
+ *
+ * @return array The updated change set with proxy objects for the specified organisation type replaced by arrays.
+ */
+ private function loadProxyEntityForOrganisationType($organisationType, array $schuldenChangeSet)
+ {
+ if (!array_key_exists($organisationType, $schuldenChangeSet)) {
+ return $schuldenChangeSet;
+ }
+ foreach ([0, 1] as $index) {
+ if (!empty($schuldenChangeSet[$organisationType][$index])) {
+ $schuldenChangeSet[$organisationType][$index] = [
+ 'id' => $schuldenChangeSet[$organisationType][$index]->getId(),
+ 'naam' => $schuldenChangeSet[$organisationType][$index]->getBedrijfsnaam()
+ ];
+ }
+ }
+ return $schuldenChangeSet;
+ }
+
+ /**
+ * Formats date values in a specified key of a change set array.
+ *
+ * Checks if the given key exists in the array. If found, formats the DateTime
+ * objects in the key's values to 'd-m-Y' and returns the updated array.
+ *
+ * @param array $changeSet The array containing the change set data.
+ * @param string $key The key in the array whose date values need formatting.
+ *
+ * @return array The updated array with formatted date values for the specified key.
+ */
+ private function formatDateChangeSet(array $changeSet, string $key): array
+ {
+ if (array_key_exists($key, $changeSet)) {
+ foreach ($changeSet[$key] as $index => $date) {
+ if (!empty($date)) {
+ $changeSet[$key][$index] = $date->format('d-m-Y');
+ }
+ }
+ }
+
+ return $changeSet;
+ }
+
+ /**
+ * Processes the change set of a schuld item and appends the updated data to the update array.
+ *
+ * @param object $schuldItem The schuld item entity to process.
+ * @param EntityManagerInterface $entityManager The entity manager to retrieve the change set.
+ * @param array $schuldItemUpdate The array to append the updated schuld item data.
+ *
+ * @return array The updated schuld item update array.
+ */
+ private function getSchuldItemUpdate(object $schuldItem, EntityManagerInterface $entityManager, array $schuldItemUpdate)
+ {
+ $schuldenChangeSet = $this->getEntityChangeSet($schuldItem, $entityManager);
+
+ if (empty($schuldenChangeSet)) {
+ return $schuldItemUpdate;
+ }
+
+ $schuldenChangeSet = $this->loadProxyEntityForSchuldeiserOrganisations($schuldenChangeSet);
+ $schuldenChangeSet = $this->formatDateChangeSet($schuldenChangeSet, 'vaststelDatum');
+ $schuldenChangeSet = $this->formatDateChangeSet($schuldenChangeSet, 'ontstaansDatum');
+
+ // Remove keys that are already stored in the action-event object to avoid duplication.
+ $keysToRemove = ['aanmaker', 'bewerker', 'dossier', 'verwijderd', 'aanmaakDatumTijd', 'bewerkDatumTijd'];
+ $schuldenChangeSet = array_diff_key($schuldenChangeSet, array_flip($keysToRemove));
+
+ $schuldItemUpdate[] = [
+ 'id' => $schuldItem->getId(),
+ 'schuldeiserNaam' => $schuldItem->getSchuldeiser()->getBedrijfsnaam(),
+ 'bedrag' => $schuldItem->getBedrag(),
+ 'schuldenChangeSet' => $schuldenChangeSet
+ ];
+ return $schuldItemUpdate;
+ }
+}
diff --git a/src/Controller/AppGebruikerController.php b/src/Controller/AppGebruikerController.php
index 348b5d91..9b4594a4 100644
--- a/src/Controller/AppGebruikerController.php
+++ b/src/Controller/AppGebruikerController.php
@@ -87,19 +87,20 @@ public function createAction(Request $request, EntityManagerInterface $em)
* @ParamConverter("gebruiker", options={"id"="gebruikerId"})
*/
public function updateAction(
- Request $request,
- EntityManagerInterface $em,
- Gebruiker $gebruiker,
+ Request $request,
+ EntityManagerInterface $em,
+ Gebruiker $gebruiker,
EventDispatcherInterface $eventDispatcher
- )
- {
+ ) {
if ($this->getUser()->getType() === Gebruiker::TYPE_SHV_KEYUSER) {
- if (!$gebruiker->getOrganisaties()->isEmpty() && empty(
- array_intersect(
- $this->getUser()->getOrganisaties()->toArray(),
- $gebruiker->getOrganisaties()->toArray()
+ if (
+ !$gebruiker->getOrganisaties()->isEmpty() && empty(
+ array_intersect(
+ $this->getUser()->getOrganisaties()->toArray(),
+ $gebruiker->getOrganisaties()->toArray()
+ )
)
- )) {
+ ) {
throw $this->createAccessDeniedException();
}
}
@@ -132,12 +133,11 @@ public function updateAction(
* @ParamConverter("gebruiker", options={"id"="gebruikerId"})
*/
public function deleteAction(
- Request $request,
- EntityManagerInterface $em,
- Gebruiker $gebruiker,
+ Request $request,
+ EntityManagerInterface $em,
+ Gebruiker $gebruiker,
EventDispatcherInterface $eventDispatcher
- )
- {
+ ) {
// TODO Dit punt is in opverleg met de kredietbank uitgeschakeld om te refinen welke gegevens er moeten worden geanonimiseerd
// TODO Weergave is ook weg gehaald in schulddossier/templates/Gebruiker/update.html.twig
throw $this->createAccessDeniedException('Deze functionaliteit is uitgeschakeld');
@@ -180,7 +180,6 @@ public function getGebruikersCsv(GebruikerRepository $repository): StreamedRespo
fputcsv($handle, ['e-mail', 'naam', 'organisatie', 'rol', 'laatste login datum', 'enabled/disabled'], ';');
foreach ($gebruikers as $gebruiker) {
-
$lastLogin = $gebruiker->getLastLogin() !== null
? $gebruiker->getLastLogin()->format('Y-m-d H:i:s')
: 'Nooit';
@@ -205,4 +204,4 @@ public function getGebruikersCsv(GebruikerRepository $repository): StreamedRespo
return $response;
}
-}
\ No newline at end of file
+}
diff --git a/src/Controller/AppSecurityController.php b/src/Controller/AppSecurityController.php
index 0feb4ace..211bf6b2 100644
--- a/src/Controller/AppSecurityController.php
+++ b/src/Controller/AppSecurityController.php
@@ -1,4 +1,5 @@
redirectToRoute('gemeenteamsterdam_fixxxschuldhulp_appdossier_index');
}
-
+
/**
* @Route("/app/debug")
* @Security("is_granted('ROLE_USER')")
@@ -46,6 +46,6 @@ public function debugAction(Request $request)
*/
public function pingAction()
{
- return new JsonResponse(['status'=>'OK']);
+ return new JsonResponse(['status' => 'OK']);
}
}
diff --git a/src/Controller/HelpController.php b/src/Controller/HelpController.php
index e565c1e1..52d2575c 100644
--- a/src/Controller/HelpController.php
+++ b/src/Controller/HelpController.php
@@ -1,4 +1,5 @@
directories()->in($this->getParameter('kernel.project_dir') . '/templates/UserReleaseNotes/');
- $finder->sort(function ($a, $b) { return strcmp($b->getRelativePathname(), $a->getRelativePathname()); });
-
+ $finder->sort(function ($a, $b) {
+ return strcmp($b->getRelativePathname(), $a->getRelativePathname());
+ });
+
$templates = [];
foreach ($finder as $dir) {
diff --git a/src/DataFixtures/AantekeningFixtures.php b/src/DataFixtures/AantekeningFixtures.php
index d252b40c..8adcf781 100644
--- a/src/DataFixtures/AantekeningFixtures.php
+++ b/src/DataFixtures/AantekeningFixtures.php
@@ -11,7 +11,6 @@
class AantekeningFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements DependentFixtureInterface
{
-
/**
* @inheritDoc
*/
diff --git a/src/DataFixtures/DossierFixtures.php b/src/DataFixtures/DossierFixtures.php
index 4483b542..336b6ab0 100644
--- a/src/DataFixtures/DossierFixtures.php
+++ b/src/DataFixtures/DossierFixtures.php
@@ -48,11 +48,11 @@ public function load(ObjectManager $manager): void
$dossier->setEersteKeerVerzondenAanGKA($dossiers[$i]['verzondenGka']);
$dossier->setInPrullenbak($dossiers[$i]['inPrullenbak']);
- if($dossiers[$i]['verzondenGka']) {
- $dossier->setAllegroNummer(834 . ($i-1) . 3879 . $i);
+ if ($dossiers[$i]['verzondenGka']) {
+ $dossier->setAllegroNummer(834 . ($i - 1) . 3879 . $i);
}
- $this->addReference($i === 0 ? 'dossier' : 'dossier'.$i, $dossier);
+ $this->addReference($i === 0 ? 'dossier' : 'dossier' . $i, $dossier);
$manager->persist($dossier);
}
diff --git a/src/DataFixtures/DossierTimelineFixtures.php b/src/DataFixtures/DossierTimelineFixtures.php
index 07e7af1c..a21e1519 100644
--- a/src/DataFixtures/DossierTimelineFixtures.php
+++ b/src/DataFixtures/DossierTimelineFixtures.php
@@ -7,7 +7,6 @@
use GemeenteAmsterdam\FixxxSchuldhulp\Entity\Dossier;
use GemeenteAmsterdam\FixxxSchuldhulp\Entity\DossierTimeline;
-
class DossierTimelineFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements DependentFixtureInterface
{
public const TIMELINE_JSON_FILENAME = 'timeline.json';
diff --git a/src/DataFixtures/SchuldItemFixtures.php b/src/DataFixtures/SchuldItemFixtures.php
index d7ef638c..54a84dec 100644
--- a/src/DataFixtures/SchuldItemFixtures.php
+++ b/src/DataFixtures/SchuldItemFixtures.php
@@ -11,7 +11,6 @@
class SchuldItemFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements DependentFixtureInterface
{
-
/**
* @inheritDoc
*/
diff --git a/src/DataFixtures/SchuldeiserFixtures.php b/src/DataFixtures/SchuldeiserFixtures.php
index 068dd0f0..7ba2858e 100644
--- a/src/DataFixtures/SchuldeiserFixtures.php
+++ b/src/DataFixtures/SchuldeiserFixtures.php
@@ -7,7 +7,6 @@
class SchuldeiserFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture
{
-
/**
* @inheritDoc
*/
diff --git a/src/Doctrine/DynamicConnection.php b/src/Doctrine/DynamicConnection.php
index 4a07862b..7e57e63e 100644
--- a/src/Doctrine/DynamicConnection.php
+++ b/src/Doctrine/DynamicConnection.php
@@ -12,14 +12,13 @@
class DynamicConnection extends Connection
{
public function __construct(
- array $params,
- Driver $driver,
- ?Configuration $config = null,
- ?EventManager $eventManager = null,
- private readonly ?AzureDatabase $azureDatabase = null,
+ array $params,
+ Driver $driver,
+ ?Configuration $config = null,
+ ?EventManager $eventManager = null,
+ private readonly ?AzureDatabase $azureDatabase = null,
private readonly ?LoggerInterface $logger = null,
- )
- {
+ ) {
if ($azureDatabase && $this->logger && isset($params['password'])) {
$newPassword = $azureDatabase->getPassword($params['password']);
$params = $this->addNewPasswordToParams($params, $newPassword);
@@ -50,5 +49,4 @@ private function addNewPasswordToParams(array $params, string $newPassword): arr
return $params;
}
-
-}
\ No newline at end of file
+}
diff --git a/src/Doctrine/DynamicConnectionFactory.php b/src/Doctrine/DynamicConnectionFactory.php
index 2aa1fc58..545ce55f 100644
--- a/src/Doctrine/DynamicConnectionFactory.php
+++ b/src/Doctrine/DynamicConnectionFactory.php
@@ -13,20 +13,18 @@ class DynamicConnectionFactory extends BaseConnectionFactory
{
public function __construct(
private readonly ContainerInterface $container,
- private readonly AzureDatabase $azureDatabase,
- private readonly LoggerInterface $logger
- )
- {
+ private readonly AzureDatabase $azureDatabase,
+ private readonly LoggerInterface $logger
+ ) {
parent::__construct($container->getParameter('doctrine.dbal.connection_factory.types'));
}
public function createConnection(
- array $params,
+ array $params,
?Configuration $config = null,
- ?EventManager $eventManager = null,
- array $mappingTypes = []
- ): DynamicConnection
- {
+ ?EventManager $eventManager = null,
+ array $mappingTypes = []
+ ): DynamicConnection {
$defaultConnection = parent::createConnection($params, $config, $eventManager, $mappingTypes);
$driver = $defaultConnection->getDriver();
@@ -40,4 +38,4 @@ public function createConnection(
$this->logger,
);
}
-}
\ No newline at end of file
+}
diff --git a/src/Doctrine/ORM/Query/AST/Functions/FulltextSearch.php b/src/Doctrine/ORM/Query/AST/Functions/FulltextSearch.php
index 7d1b8194..817c1dc4 100644
--- a/src/Doctrine/ORM/Query/AST/Functions/FulltextSearch.php
+++ b/src/Doctrine/ORM/Query/AST/Functions/FulltextSearch.php
@@ -87,4 +87,4 @@ public function getSql(SqlWalker $sqlWalker): string
return \vsprintf($this->functionPrototype, $dispatched);
}
-}
\ No newline at end of file
+}
diff --git a/src/Doctrine/ORM/Query/AST/Functions/Ilike.php b/src/Doctrine/ORM/Query/AST/Functions/Ilike.php
index 77210f3d..41e74909 100644
--- a/src/Doctrine/ORM/Query/AST/Functions/Ilike.php
+++ b/src/Doctrine/ORM/Query/AST/Functions/Ilike.php
@@ -88,4 +88,4 @@ public function getSql(SqlWalker $sqlWalker): string
return \vsprintf($this->functionPrototype, $dispatched);
}
-}
\ No newline at end of file
+}
diff --git a/src/Doctrine/ORM/Query/AST/Functions/JsonbArrayContains.php b/src/Doctrine/ORM/Query/AST/Functions/JsonbArrayContains.php
index 999eba6d..f3b5e315 100644
--- a/src/Doctrine/ORM/Query/AST/Functions/JsonbArrayContains.php
+++ b/src/Doctrine/ORM/Query/AST/Functions/JsonbArrayContains.php
@@ -33,4 +33,4 @@ public function getSql(SqlWalker $sqlWalker): string
{
return 'jsonb_exists(' . $this->expressions[0]->dispatch($sqlWalker) . ', ' . $this->expressions[1]->dispatch($sqlWalker) . ')';
}
-}
\ No newline at end of file
+}
diff --git a/src/Doctrine/ORM/Query/AST/Functions/JsonbMultiArrayContains.php b/src/Doctrine/ORM/Query/AST/Functions/JsonbMultiArrayContains.php
index a28c77f1..d5ec3d25 100644
--- a/src/Doctrine/ORM/Query/AST/Functions/JsonbMultiArrayContains.php
+++ b/src/Doctrine/ORM/Query/AST/Functions/JsonbMultiArrayContains.php
@@ -35,4 +35,4 @@ public function getSql(SqlWalker $sqlWalker): string
{
return 'jsonb_exists(' . $this->expressions[0]->dispatch($sqlWalker) . '->' . $this->expressions[1]->dispatch($sqlWalker) . ', ' . $this->expressions[2]->dispatch($sqlWalker) . ')';
}
-}
\ No newline at end of file
+}
diff --git a/src/Doctrine/ORM/QueryBuilder/QueryBuilderHelper.php b/src/Doctrine/ORM/QueryBuilder/QueryBuilderHelper.php
index 63e8a934..25440b73 100644
--- a/src/Doctrine/ORM/QueryBuilder/QueryBuilderHelper.php
+++ b/src/Doctrine/ORM/QueryBuilder/QueryBuilderHelper.php
@@ -12,4 +12,4 @@ public function applyFilterPersonRelated(QueryBuilder $qb, Person $person, int $
$qb->andWhere('JSONB_ARRAY_CONTAINS(note.personUuids, :person_' . $counter . '_uuid) = TRUE');
$qb->setParameter('person_' . $counter . '_uuid', $person->getUuid());
}
-}
\ No newline at end of file
+}
diff --git a/src/Entity/Aantekening.php b/src/Entity/Aantekening.php
index 776bb105..0312d42f 100644
--- a/src/Entity/Aantekening.php
+++ b/src/Entity/Aantekening.php
@@ -13,6 +13,7 @@
class Aantekening
{
use ExportAble;
+
/**
* @var integer
* @ORM\Id
diff --git a/src/Entity/Document.php b/src/Entity/Document.php
index 2acbd8de..e19cacc3 100644
--- a/src/Entity/Document.php
+++ b/src/Entity/Document.php
@@ -236,4 +236,4 @@ public function setInPrullenbak($inPrullenbak)
{
$this->inPrullenbak = $inPrullenbak;
}
-}
\ No newline at end of file
+}
diff --git a/src/Entity/Dossier.php b/src/Entity/Dossier.php
index 8ad4ee38..acdab6eb 100644
--- a/src/Entity/Dossier.php
+++ b/src/Entity/Dossier.php
@@ -840,8 +840,10 @@ public function getNietVerwijderdeDocumentenByOnderwerp($onderwerp, $zonderSchul
public function getNietVerwijderdeDocumentenByOnderwerpen($onderwerpen)
{
return $this->documenten->filter(function (DossierDocument $dossierDocument) use ($onderwerpen) {
- return in_array($dossierDocument->getOnderwerp(),
- $onderwerpen) && $dossierDocument->getDocument()->isInPrullenbak() === false;
+ return in_array(
+ $dossierDocument->getOnderwerp(),
+ $onderwerpen
+ ) && $dossierDocument->getDocument()->isInPrullenbak() === false;
});
}
diff --git a/src/Entity/DossierDocument.php b/src/Entity/DossierDocument.php
index 37115cf7..52aad477 100644
--- a/src/Entity/DossierDocument.php
+++ b/src/Entity/DossierDocument.php
@@ -106,4 +106,4 @@ public function setSchuldItem(SchuldItem $schuldItem = null)
$schuldItem->addDossierDocumenten($this);
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Entity/DossierTimeline.php b/src/Entity/DossierTimeline.php
index 0d79dc1b..7c72355b 100644
--- a/src/Entity/DossierTimeline.php
+++ b/src/Entity/DossierTimeline.php
@@ -144,6 +144,4 @@ public function setData($data)
{
$this->data = $data;
}
-
-
-}
\ No newline at end of file
+}
diff --git a/src/Entity/SchuldItem.php b/src/Entity/SchuldItem.php
index a3d62c0c..d435a62a 100644
--- a/src/Entity/SchuldItem.php
+++ b/src/Entity/SchuldItem.php
@@ -277,7 +277,7 @@ public function setType($type)
public function getBedrag()
{
- return $this->bedrag;
+ return (float) $this->bedrag;
}
public function setBedrag($bedrag)
@@ -287,7 +287,7 @@ public function setBedrag($bedrag)
public function getBedragOorspronkelijk()
{
- return $this->bedragOorspronkelijk;
+ return (float) $this->bedragOorspronkelijk;
}
public function setBedragOorspronkelijk($bedragOorspronkelijk = null)
@@ -378,7 +378,7 @@ public function removeAantekening(Aantekening $aantekening)
public function isVerlopen(): bool
{
- if ($this->getVaststelDatum() instanceof \DateTime){
+ if ($this->getVaststelDatum() instanceof \DateTime) {
$gracePeriod = (new \DateTime())->modify('-6 months');
return $this->getVaststelDatum() < $gracePeriod;
}
diff --git a/src/Entity/SchuldItemHistorie.php b/src/Entity/SchuldItemHistorie.php
index 9fa38f97..d363f1e7 100644
--- a/src/Entity/SchuldItemHistorie.php
+++ b/src/Entity/SchuldItemHistorie.php
@@ -129,4 +129,4 @@ public function __construct()
$this->vaststelDatum = new \DateTime();
$this->verwijderd = false;
}
-}
\ No newline at end of file
+}
diff --git a/src/Entity/Team.php b/src/Entity/Team.php
index 1247eea1..2ca04aaf 100644
--- a/src/Entity/Team.php
+++ b/src/Entity/Team.php
@@ -65,4 +65,4 @@ public function __toString()
{
return $this->naam;
}
-}
\ No newline at end of file
+}
diff --git a/src/Entity/Voorlegger.php b/src/Entity/Voorlegger.php
index 3dc14626..945da111 100644
--- a/src/Entity/Voorlegger.php
+++ b/src/Entity/Voorlegger.php
@@ -1189,7 +1189,7 @@ public function getVtlbOntvangenGka()
public function getVtlbBedrag()
{
- return $this->vtlbBedrag;
+ return (float) $this->vtlbBedrag;
}
public function getInkomstenspecificatieOntvangenShv()
@@ -1710,7 +1710,7 @@ public function isGereserveerdeGeldenNvt()
public function getGereserveerdeGelden()
{
- return $this->gereserveerdeGelden;
+ return (float) $this->gereserveerdeGelden;
}
public function getOndertekendAanvraagFormulierOntvangenShv()
diff --git a/src/EnvVarProcessors/DatabaseUrlEnvVarProcessor.php b/src/EnvVarProcessors/DatabaseUrlEnvVarProcessor.php
index 5ed5ff97..ef64a169 100644
--- a/src/EnvVarProcessors/DatabaseUrlEnvVarProcessor.php
+++ b/src/EnvVarProcessors/DatabaseUrlEnvVarProcessor.php
@@ -7,7 +7,9 @@
class DatabaseUrlEnvVarProcessor implements EnvVarProcessorInterface
{
- public function __construct(private AzureDatabase $azureDatabase){}
+ public function __construct(private AzureDatabase $azureDatabase)
+ {
+ }
public function getEnv(string $prefix, string $name, \Closure $getEnv)
{
@@ -26,4 +28,4 @@ public static function getProvidedTypes()
'dburl' => 'string',
];
}
-}
\ No newline at end of file
+}
diff --git a/src/Event/ActionEvent.php b/src/Event/ActionEvent.php
index 9d1f6332..32c10078 100644
--- a/src/Event/ActionEvent.php
+++ b/src/Event/ActionEvent.php
@@ -36,6 +36,9 @@ class ActionEvent extends Event
const GEBRUIKER_INGELOGD = 'gebruiker_ingelogd';
const DOSSIER_GEWIJZIGD = 'dossier_gewijzigd';
const DOSSIER_STATUS_GEWIJZIGD = 'dossier_status_gewijzigd';
+ const DOSSIER_VOORLEGGER_GEWIJZIGD = 'dossier_voorlegger_gewijzigd';
+ const DOSSIER_SCHULDITEMS_GEWIJZIGD = 'dossier_schulditems_gewijzigd';
+ const DOSSIER_SCHULDITEM_AANGEMAAKT = 'dossier_schulditem_aangemaakt';
const GEBRUIKER_GEWIJZIGD = 'gebruiker_gewijzigd';
const GEBRUIKER_VERWIJDERD = 'gebruiker_verwijderd';
const GEBRUIKER_DISABLED_SYSTEM = 'gebruiker_disabled_door_systeem';
@@ -47,7 +50,6 @@ class ActionEvent extends Event
const DOSSIER_HERSTELD = 'dossier_hersteld';
const DOSSIER_SEND_TO_ALLEGRO = 'dossier_send_to_allegro';
-// public function __construct(string $actionName, array $data = [])
public function __construct(string $actionName, array $data = [], Dossier $dossier = null)
{
$this->action = $actionName;
@@ -218,6 +220,76 @@ public static function registerDossierStatusGewijzigd(
return new self(self::DOSSIER_STATUS_GEWIJZIGD, $data, $dossier);
}
+ /**
+ * @param Gebruiker $gebruiker
+ * @param Dossier $dossier
+ * @param array $voorleggerChangeSet,
+ *
+ * @return ActionEvent
+ */
+ public static function registerDossierVoorleggerGewijzigd(
+ Gebruiker $gebruiker,
+ Dossier $dossier,
+ $voorleggerChangeSet,
+ ) {
+
+ $data = array_merge(
+ self::getGebruikerData($gebruiker),
+ [
+ "voorleggerChangeSet" => $voorleggerChangeSet,
+ ]
+ );
+
+ return new self(self::DOSSIER_VOORLEGGER_GEWIJZIGD, $data, $dossier);
+ }
+
+
+ /**
+ * @param Gebruiker $gebruiker
+ * @param Dossier $dossier
+ * @param array $schuldItemUpdates,
+ *
+ * @return ActionEvent
+ */
+ public static function registerSchuldItemsGewijzigd(
+ Gebruiker $gebruiker,
+ Dossier $dossier,
+ $schuldItemUpdates,
+ ) {
+
+ $data = array_merge(
+ self::getGebruikerData($gebruiker),
+ [
+ "schuldItemUpdates" => $schuldItemUpdates,
+ ]
+ );
+
+ return new self(self::DOSSIER_SCHULDITEMS_GEWIJZIGD, $data, $dossier);
+ }
+
+ /**
+ * @param Gebruiker $gebruiker
+ * @param Dossier $dossier
+ * @param array $schulditemUpdates,
+ *
+ * @return ActionEvent
+ */
+ public static function registerSchuldItemAangemaakt(
+ Gebruiker $gebruiker,
+ Dossier $dossier,
+ $schulditemUpdates,
+ ) {
+
+ $data = array_merge(
+ self::getGebruikerData($gebruiker),
+ [
+ "schulditemUpdates" => $schulditemUpdates,
+ ]
+ );
+
+ return new self(self::DOSSIER_SCHULDITEM_AANGEMAAKT, $data, $dossier);
+ }
+
/**
* @param Gebruiker|UserInterface $gebruiker
* @param Gebruiker $verwijderdeGebruiker
diff --git a/src/Event/DossierChangedEvent.php b/src/Event/DossierChangedEvent.php
index 4809228a..ddd452ba 100644
--- a/src/Event/DossierChangedEvent.php
+++ b/src/Event/DossierChangedEvent.php
@@ -46,9 +46,9 @@ public function getGebruiker()
{
return $this->gebruiker;
}
-
+
public function getForceType(): ?string
{
return $this->forceType;
}
-}
\ No newline at end of file
+}
diff --git a/src/EventListener/ActionEventSubscriber.php b/src/EventListener/ActionEventSubscriber.php
index f1152a84..b1b1eeba 100644
--- a/src/EventListener/ActionEventSubscriber.php
+++ b/src/EventListener/ActionEventSubscriber.php
@@ -84,7 +84,6 @@ public function registerLoginAction(InteractiveLoginEvent $event): void
$action->setDatumTijd($dateTime);
$action->setData(
ActionEvent::getGebruikerData($gebruiker)
-
);
$this->entityManager->persist($action);
diff --git a/src/EventListener/DocumentUploadSubscriber.php b/src/EventListener/DocumentUploadSubscriber.php
index 694beba7..44cf4b3e 100644
--- a/src/EventListener/DocumentUploadSubscriber.php
+++ b/src/EventListener/DocumentUploadSubscriber.php
@@ -22,9 +22,9 @@ class DocumentUploadSubscriber implements EventSubscriberInterface
*/
public function __construct(
protected FileStorageSelector $fileStorageSelector,
- protected LoggerInterface $logger,
- )
- {}
+ protected LoggerInterface $logger,
+ ) {
+ }
public function getSubscribedEvents(): array
{
@@ -75,11 +75,9 @@ public function prePersist(PrePersistEventArgs $args): void
fclose($stream);
} catch (\Exception $e) {
$this->logger->error(__CLASS__ . ":" . __METHOD__ . ": Failed to store file, errormessage: " . $e->getMessage());
- }
- catch (\Throwable $e) {
+ } catch (\Throwable $e) {
$this->logger->error(__CLASS__ . ":" . __METHOD__ . ": Failed fclose, errormessage: " . $e->getMessage());
}
-
}
/**
diff --git a/src/EventListener/DossierTimelineWorkflowSubscriber.php b/src/EventListener/DossierTimelineWorkflowSubscriber.php
index 303348c6..49e3d71f 100644
--- a/src/EventListener/DossierTimelineWorkflowSubscriber.php
+++ b/src/EventListener/DossierTimelineWorkflowSubscriber.php
@@ -50,4 +50,4 @@ public static function getSubscribedEvents()
'workflow.dossier_flow.completed' => 'onComplete'
];
}
-}
\ No newline at end of file
+}
diff --git a/src/EventListener/GebruikerPasswordSubscriber.php b/src/EventListener/GebruikerPasswordSubscriber.php
index 2c576a6a..7ebb7283 100644
--- a/src/EventListener/GebruikerPasswordSubscriber.php
+++ b/src/EventListener/GebruikerPasswordSubscriber.php
@@ -56,4 +56,4 @@ protected function updatePassword(Gebruiker $object)
$object->setPassword($this->encoder->encodePassword($object, $object->getClearPassword()));
}
}
-}
\ No newline at end of file
+}
diff --git a/src/EventListener/MailNotitificationSubscriber.php b/src/EventListener/MailNotitificationSubscriber.php
index d93c0c4e..36f69753 100644
--- a/src/EventListener/MailNotitificationSubscriber.php
+++ b/src/EventListener/MailNotitificationSubscriber.php
@@ -142,10 +142,12 @@ public function notifyAboutAantekening(DossierAddedAantekeningEvent $event): voi
$this->mail(
$this->fromNotificiatieAdres,
$event->getDossier()->getMedewerkerOrganisatie()->getEmail(),
- 'mails/notifyAddedAantekening.html.twig', [
+ 'mails/notifyAddedAantekening.html.twig',
+ [
'dossier' => $event->getDossier(),
'tokenStorage' => $this->tokenStorage
- ]);
+ ]
+ );
}
if (
@@ -156,10 +158,12 @@ public function notifyAboutAantekening(DossierAddedAantekeningEvent $event): voi
$this->mail(
$this->fromNotificiatieAdres,
$event->getDossier()->getTeamGka()->getEmail(),
- 'mails/notifyAddedAantekening.html.twig', [
+ 'mails/notifyAddedAantekening.html.twig',
+ [
'dossier' => $event->getDossier(),
'tokenStorage' => $this->tokenStorage
- ]);
+ ]
+ );
}
}
@@ -224,19 +228,19 @@ public function notifyAfkeurenDossierGka(Event $event)
}
public function notifyGoedkeurenDossierGka(Event $event)
- {
+ {
/** @var $dossier Dossier */
$dossier = $event->getSubject();
- if ($dossier->getMedewerkerOrganisatie() !== null && empty($dossier->getMedewerkerOrganisatie()->getEmail()) === false) {
- $this->mail($this->fromNotificiatieAdres, $dossier->getMedewerkerOrganisatie()->getEmail(), 'mails/notifyGoedkeurenGka.html.twig', [
- 'dossier' => $dossier,
- 'tokenStorage' => $this->tokenStorage
- ]);
- } else {
- $this->logger->notice('Kan geen notifificatie sturen omdat er geen organisatie opgegeven is of er is voor de medewerker van dit dossier geen e-mailadres ingevuld', ['dossierId' => $dossier->getId(), 'gebruikerId' => $dossier->getMedewerkerOrganisatie() ? $dossier->getMedewerkerOrganisatie()->getId() : 'n/a']);
- }
+ if ($dossier->getMedewerkerOrganisatie() !== null && empty($dossier->getMedewerkerOrganisatie()->getEmail()) === false) {
+ $this->mail($this->fromNotificiatieAdres, $dossier->getMedewerkerOrganisatie()->getEmail(), 'mails/notifyGoedkeurenGka.html.twig', [
+ 'dossier' => $dossier,
+ 'tokenStorage' => $this->tokenStorage
+ ]);
+ } else {
+ $this->logger->notice('Kan geen notifificatie sturen omdat er geen organisatie opgegeven is of er is voor de medewerker van dit dossier geen e-mailadres ingevuld', ['dossierId' => $dossier->getId(), 'gebruikerId' => $dossier->getMedewerkerOrganisatie() ? $dossier->getMedewerkerOrganisatie()->getId() : 'n/a']);
}
+ }
protected function mail($from, $to, $template, $data)
{
@@ -269,7 +273,8 @@ private function getTestEmailsAdresses()
return json_decode($jsonString, true);
}
- private function composeEmail($from, $to, $template, $data): Email {
+ private function composeEmail($from, $to, $template, $data): Email
+ {
$message = new Email();
$message->getHeaders()->addTextHeader('X-Application', 'Schuldhulp');
$message->addFrom($from);
@@ -282,7 +287,8 @@ private function composeEmail($from, $to, $template, $data): Email {
return $message;
}
- private function sendEmail(Email $message, $from, $to) {
+ private function sendEmail(Email $message, $from, $to)
+ {
try {
$this->logger->info('Mail: start sending', ['from' => $from, 'to' => $to, 'subject' => $message->getSubject()]);
$this->mailer->send($message);
diff --git a/src/Exception/AllegroServiceException.php b/src/Exception/AllegroServiceException.php
index c67170c4..6da40d11 100644
--- a/src/Exception/AllegroServiceException.php
+++ b/src/Exception/AllegroServiceException.php
@@ -19,51 +19,63 @@ class AllegroServiceException extends \Exception
const TYPE_MISSING_PARTNER_BSN = 'MISSING_PARTNER_BSN';
const TYPE_MISSING_PARTNER_INITIALS = 'MISSING_PARTNER_INITIALS';
- public static function missingClientBirthdate(): AllegroServiceException {
+ public static function missingClientBirthdate(): AllegroServiceException
+ {
return new self(self::TYPE_MISSING_CLIENT_BIRTHDATE);
}
- public static function missingClientGender(): AllegroServiceException {
+ public static function missingClientGender(): AllegroServiceException
+ {
return new self(self::TYPE_MISSING_CLIENT_GENDER);
}
- public static function missingClientBSN(): AllegroServiceException {
+ public static function missingClientBSN(): AllegroServiceException
+ {
return new self(self::TYPE_MISSING_CLIENT_BSN);
}
- public static function missingClientInitials(): AllegroServiceException {
+ public static function missingClientInitials(): AllegroServiceException
+ {
return new self(self::TYPE_MISSING_CLIENT_INITIALS);
}
- public static function missingClientStreet(): AllegroServiceException {
+ public static function missingClientStreet(): AllegroServiceException
+ {
return new self(self::TYPE_MISSING_CLIENT_STREET);
}
- public static function missingClientHousenumber(): AllegroServiceException {
+ public static function missingClientHousenumber(): AllegroServiceException
+ {
return new self(self::TYPE_MISSING_CLIENT_HOUSENUMBER);
}
- public static function missingClientPostalcode(): AllegroServiceException {
+ public static function missingClientPostalcode(): AllegroServiceException
+ {
return new self(self::TYPE_MISSING_CLIENT_POSTALCODE);
}
- public static function missingClientResidence(): AllegroServiceException {
+ public static function missingClientResidence(): AllegroServiceException
+ {
return new self(self::TYPE_MISSING_CLIENT_RESIDENCE);
}
- public static function missingPartnerBirthdate(): AllegroServiceException {
+ public static function missingPartnerBirthdate(): AllegroServiceException
+ {
return new self(self::TYPE_MISSING_PARTNER_BIRTHDATE);
}
- public static function missingPartnerGender(): AllegroServiceException {
+ public static function missingPartnerGender(): AllegroServiceException
+ {
return new self(self::TYPE_MISSING_PARTNER_GENDER);
}
- public static function missingPartnerBSN(): AllegroServiceException {
+ public static function missingPartnerBSN(): AllegroServiceException
+ {
return new self(self::TYPE_MISSING_PARTNER_BSN);
}
- public static function missingPartnerInitials(): AllegroServiceException {
+ public static function missingPartnerInitials(): AllegroServiceException
+ {
return new self(self::TYPE_MISSING_PARTNER_INITIALS);
}
}
diff --git a/src/Form/ChangeDossierClientType.php b/src/Form/ChangeDossierClientType.php
index 79e0373d..fd9aabc2 100644
--- a/src/Form/ChangeDossierClientType.php
+++ b/src/Form/ChangeDossierClientType.php
@@ -175,10 +175,9 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
'required' => false,
'help' => 'DB: dossier.client_kinderen'
]);
-
-
}
- public function configureOptions(OptionsResolver $resolver) {
+ public function configureOptions(OptionsResolver $resolver)
+ {
$resolver->setDefaults([
'data_class' => Dossier::class,
]);
diff --git a/src/Form/ChangeDossierStatusType.php b/src/Form/ChangeDossierStatusType.php
index 4dc8930c..f3e810c1 100644
--- a/src/Form/ChangeDossierStatusType.php
+++ b/src/Form/ChangeDossierStatusType.php
@@ -20,7 +20,6 @@
*/
class ChangeDossierStatusType extends AbstractType
{
-
/**
* @var Gebruiker $user
*/
@@ -79,32 +78,32 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
});
}
- public function getTransitionChoices(Gebruiker $user, Dossier $dossier, Workflow $workflow)
+ public function getTransitionChoices(Gebruiker $user, Dossier $dossier, Workflow $workflow)
{
$transitionChoices = [];
- if ($workflow->can($dossier, 'afkeuren_shv') & !$user->isGka()){
+ if ($workflow->can($dossier, 'afkeuren_shv') & !$user->isGka()) {
$transitionChoices['Afkeuren'] = 'afkeuren_shv';
}
- if ($workflow->can($dossier, 'afkeuren_dossier_gka') & !$user->isSchuldhulpverlener()){
+ if ($workflow->can($dossier, 'afkeuren_dossier_gka') & !$user->isSchuldhulpverlener()) {
$transitionChoices['Dossier afwijzen (terug naar SHV-er/Bewindvoerder)'] = 'afkeuren_dossier_gka';
}
- if ($workflow->can($dossier, 'opgevoerd_shv') & !$user->isGka()){
+ if ($workflow->can($dossier, 'opgevoerd_shv') & !$user->isGka()) {
$transitionChoices['Ter controle aanbieden'] = 'opgevoerd_shv';
}
- if ($workflow->can($dossier, 'goedkeuren_shv') & !$user->isGka()){
+ if ($workflow->can($dossier, 'goedkeuren_shv') & !$user->isGka()) {
$transitionChoices['Goedkeuren'] = 'goedkeuren_shv';
}
- if ($workflow->can($dossier, 'verzenden_shv') & !$user->isGka()){
+ if ($workflow->can($dossier, 'verzenden_shv') & !$user->isGka()) {
$transitionChoices['Verzenden naar GKA'] = 'verzenden_shv';
}
- if ($workflow->can($dossier, 'gestart_gka') & !$user->isSchuldhulpverlener()){
+ if ($workflow->can($dossier, 'gestart_gka') & !$user->isSchuldhulpverlener()) {
$transitionChoices['Start proces GKA'] = 'gestart_gka';
}
- if ($workflow->can($dossier, 'goedkeuren_dossier_gka') & !$user->isSchuldhulpverlener()){
+ if ($workflow->can($dossier, 'goedkeuren_dossier_gka') & !$user->isSchuldhulpverlener()) {
$transitionChoices['Dossier akkoord'] = 'goedkeuren_dossier_gka';
}
- if ($workflow->can($dossier, 'afsluiten_gka') & !$user->isSchuldhulpverlener()){
+ if ($workflow->can($dossier, 'afsluiten_gka') & !$user->isSchuldhulpverlener()) {
$transitionChoices['Afsluiten GKA'] = 'afsluiten_gka';
}
diff --git a/src/Form/DataTransformer/IdToSchuldeiserTransformer.php b/src/Form/DataTransformer/IdToSchuldeiserTransformer.php
index e6849801..7724bd9d 100644
--- a/src/Form/DataTransformer/IdToSchuldeiserTransformer.php
+++ b/src/Form/DataTransformer/IdToSchuldeiserTransformer.php
@@ -60,4 +60,4 @@ public function reverseTransform($id): ?Schuldeiser
return $schuldeiser;
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/CreateAantekeningFormType.php b/src/Form/Type/CreateAantekeningFormType.php
index 205ef793..6b70b183 100644
--- a/src/Form/Type/CreateAantekeningFormType.php
+++ b/src/Form/Type/CreateAantekeningFormType.php
@@ -1,12 +1,16 @@
true,
'label' => 'Aantekening maken *'
]);
+
+ $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
+ $data = $event->getData();
+
+ if (isset($data['tekst'])) {
+ $data['tekst'] = str_replace('#', '', $data['tekst']);
+ $data['tekst'] = strip_tags($data['tekst']);
+ }
+
+ $event->setData($data);
+ });
}
public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Form/Type/DetailDossierAdditionalFormType.php b/src/Form/Type/DetailDossierAdditionalFormType.php
index 8fb1af2e..0a2b6688 100644
--- a/src/Form/Type/DetailDossierAdditionalFormType.php
+++ b/src/Form/Type/DetailDossierAdditionalFormType.php
@@ -13,7 +13,6 @@
class DetailDossierAdditionalFormType extends AbstractType
{
-
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder->add('clientTelefoonnummer', TextType::class, [
diff --git a/src/Form/Type/DocumentFormType.php b/src/Form/Type/DocumentFormType.php
index 003bbadd..2ab9d7cc 100644
--- a/src/Form/Type/DocumentFormType.php
+++ b/src/Form/Type/DocumentFormType.php
@@ -1,4 +1,5 @@
setDefault('data_class', Document::class);
$resolver->setDefault('choice_translation_domain', false);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/DossierDocumentFormType.php b/src/Form/Type/DossierDocumentFormType.php
index 3e347282..c08fb6bb 100644
--- a/src/Form/Type/DossierDocumentFormType.php
+++ b/src/Form/Type/DossierDocumentFormType.php
@@ -1,4 +1,5 @@
setDefault('data_class', DossierDocument::class);
$resolver->setDefault('choice_translation_domain', false);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/GebruikerChangePasswordFormType.php b/src/Form/Type/GebruikerChangePasswordFormType.php
index 474be389..86928fa8 100644
--- a/src/Form/Type/GebruikerChangePasswordFormType.php
+++ b/src/Form/Type/GebruikerChangePasswordFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('validation_groups', ['password']);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/GebruikerFormType.php b/src/Form/Type/GebruikerFormType.php
index 5e4e6116..2b456abb 100644
--- a/src/Form/Type/GebruikerFormType.php
+++ b/src/Form/Type/GebruikerFormType.php
@@ -63,7 +63,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
'help' => 'DB: gebruiker_organisatie.gebruiker_id gebruiker_organisatie.organisatie_id',
'query_builder' => function (EntityRepository $repository) use ($user) {
$qb = $repository->createQueryBuilder('organisatie');
- if($user->getType() === Gebruiker::TYPE_SHV_KEYUSER){
+ if ($user->getType() === Gebruiker::TYPE_SHV_KEYUSER) {
$qb->andWhere('organisatie IN (:organisaties)');
$qb->setParameter('organisaties', $user->getOrganisaties());
}
diff --git a/src/Form/Type/GkaStatusFormType.php b/src/Form/Type/GkaStatusFormType.php
index e78234d9..f0115922 100644
--- a/src/Form/Type/GkaStatusFormType.php
+++ b/src/Form/Type/GkaStatusFormType.php
@@ -1,4 +1,5 @@
setDefault('data_class', Organisatie::class);
$resolver->setDefault('choice_translation_domain', false);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/OrganisatieMedewerkerType.php b/src/Form/Type/OrganisatieMedewerkerType.php
index 98f78f84..a77989bb 100644
--- a/src/Form/Type/OrganisatieMedewerkerType.php
+++ b/src/Form/Type/OrganisatieMedewerkerType.php
@@ -59,8 +59,8 @@ public function __construct(TokenStorageInterface $tokenStorage, EntityManagerIn
*/
private function transformCollectionToChoices(Collection $collection): array
{
- if($collection->isEmpty()){
- return [];
+ if ($collection->isEmpty()) {
+ return [];
}
return array_merge(...$collection->map(function (Organisatie $organisatie) {
diff --git a/src/Form/Type/SchuldItemFormType.php b/src/Form/Type/SchuldItemFormType.php
index 744bf9b7..72e650c3 100644
--- a/src/Form/Type/SchuldItemFormType.php
+++ b/src/Form/Type/SchuldItemFormType.php
@@ -23,7 +23,6 @@
class SchuldItemFormType extends AbstractType
{
-
private $logger;
protected $em;
/**
diff --git a/src/Form/Type/SchuldenFormType.php b/src/Form/Type/SchuldenFormType.php
index c99d926b..9c3c8d51 100644
--- a/src/Form/Type/SchuldenFormType.php
+++ b/src/Form/Type/SchuldenFormType.php
@@ -1,4 +1,5 @@
false,
'expanded' => false,
'query_builder' => function (GebruikerRepository $repository) {
- if ($this->user->getType() === Gebruiker::TYPE_SHV || $this->user->getType() === Gebruiker::TYPE_SHV_KEYUSER){
+ if ($this->user->getType() === Gebruiker::TYPE_SHV || $this->user->getType() === Gebruiker::TYPE_SHV_KEYUSER) {
return $repository->findAllByTypeAndOrganisatieRaw([Gebruiker::TYPE_SHV, Gebruiker::TYPE_SHV_KEYUSER, Gebruiker::TYPE_ONBEKEND], $this->user->getOrganisaties());
- }else{
+ } else {
return $repository->findAllRaw();
-
}
},
'placeholder' => 'Alle medewerkers'
]);
-
});
}
diff --git a/src/Form/Type/ShvStatusFormType.php b/src/Form/Type/ShvStatusFormType.php
index f3df108d..516b8093 100644
--- a/src/Form/Type/ShvStatusFormType.php
+++ b/src/Form/Type/ShvStatusFormType.php
@@ -1,4 +1,5 @@
setDefault('data_class', Team::class);
$resolver->setDefault('choice_translation_domain', false);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerAlimentatieEchtscheidingsconvenantFormType.php b/src/Form/Type/VoorleggerAlimentatieEchtscheidingsconvenantFormType.php
index bd9b5882..fa2f5087 100644
--- a/src/Form/Type/VoorleggerAlimentatieEchtscheidingsconvenantFormType.php
+++ b/src/Form/Type/VoorleggerAlimentatieEchtscheidingsconvenantFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerAlimentatieFormType.php b/src/Form/Type/VoorleggerAlimentatieFormType.php
index d8a8a44a..8c61069a 100644
--- a/src/Form/Type/VoorleggerAlimentatieFormType.php
+++ b/src/Form/Type/VoorleggerAlimentatieFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerArbeidsovereenkomstFormType.php b/src/Form/Type/VoorleggerArbeidsovereenkomstFormType.php
index 500db2cf..8a957630 100644
--- a/src/Form/Type/VoorleggerArbeidsovereenkomstFormType.php
+++ b/src/Form/Type/VoorleggerArbeidsovereenkomstFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerAutoTaxatieFormType.php b/src/Form/Type/VoorleggerAutoTaxatieFormType.php
index 05712950..118ffc04 100644
--- a/src/Form/Type/VoorleggerAutoTaxatieFormType.php
+++ b/src/Form/Type/VoorleggerAutoTaxatieFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerAutolastenKmWoonwerkverkeerFormType.php b/src/Form/Type/VoorleggerAutolastenKmWoonwerkverkeerFormType.php
index c41496b9..80ebde6c 100644
--- a/src/Form/Type/VoorleggerAutolastenKmWoonwerkverkeerFormType.php
+++ b/src/Form/Type/VoorleggerAutolastenKmWoonwerkverkeerFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerBelastingFormType.php b/src/Form/Type/VoorleggerBelastingFormType.php
index b843af0c..4f8193bf 100644
--- a/src/Form/Type/VoorleggerBelastingFormType.php
+++ b/src/Form/Type/VoorleggerBelastingFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerBeschikkingOnderBewindstellingFormType.php b/src/Form/Type/VoorleggerBeschikkingOnderBewindstellingFormType.php
index 93dcbe61..73cfec01 100644
--- a/src/Form/Type/VoorleggerBeschikkingOnderBewindstellingFormType.php
+++ b/src/Form/Type/VoorleggerBeschikkingOnderBewindstellingFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerBeschikkingUwvFormType.php b/src/Form/Type/VoorleggerBeschikkingUwvFormType.php
index d91efca1..c5a9aba9 100644
--- a/src/Form/Type/VoorleggerBeschikkingUwvFormType.php
+++ b/src/Form/Type/VoorleggerBeschikkingUwvFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerBewindstellingOfBudgetbeheerFormType.php b/src/Form/Type/VoorleggerBewindstellingOfBudgetbeheerFormType.php
index 9367e378..94269fd6 100644
--- a/src/Form/Type/VoorleggerBewindstellingOfBudgetbeheerFormType.php
+++ b/src/Form/Type/VoorleggerBewindstellingOfBudgetbeheerFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerBudgetbeheerFormType.php b/src/Form/Type/VoorleggerBudgetbeheerFormType.php
index adfc6f6e..d5498911 100644
--- a/src/Form/Type/VoorleggerBudgetbeheerFormType.php
+++ b/src/Form/Type/VoorleggerBudgetbeheerFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerCjibFormType.php b/src/Form/Type/VoorleggerCjibFormType.php
index ae71de4c..1668d558 100644
--- a/src/Form/Type/VoorleggerCjibFormType.php
+++ b/src/Form/Type/VoorleggerCjibFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerCorrespondentieFormType.php b/src/Form/Type/VoorleggerCorrespondentieFormType.php
index 0ffac730..e7e0e940 100644
--- a/src/Form/Type/VoorleggerCorrespondentieFormType.php
+++ b/src/Form/Type/VoorleggerCorrespondentieFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerDwangakkoordFormType.php b/src/Form/Type/VoorleggerDwangakkoordFormType.php
index b3889388..22da075d 100644
--- a/src/Form/Type/VoorleggerDwangakkoordFormType.php
+++ b/src/Form/Type/VoorleggerDwangakkoordFormType.php
@@ -1,4 +1,5 @@
getDossier();
$user = $this->tokenStorage->getToken()->getUser();
$gebruikers = $this->em->getRepository(Gebruiker::class)->findAllByTypeAndOrganisatieRaw(
- [Gebruiker::TYPE_SHV, Gebruiker::TYPE_SHV_KEYUSER],
- [$dossier->getOrganisatie()]
- );
+ [Gebruiker::TYPE_SHV, Gebruiker::TYPE_SHV_KEYUSER],
+ [$dossier->getOrganisatie()]
+ );
if ($this->tokenStorage->getToken() === null || $this->tokenStorage->getToken()->getUser() === null) {
return;
}
@@ -94,11 +95,11 @@ public function buildForm(FormBuilderInterface $builder, array $options)
$choices = [];
$data = null;
foreach ($gebruikers->getQuery()->getResult() as $key => $value) {
- if ($value != $user && $value->isEnabled()){
- $choices[$value->getEmail()] = $value->getNaam() . ' (' .$value->getEmail() . ')';
+ if ($value != $user && $value->isEnabled()) {
+ $choices[$value->getEmail()] = $value->getNaam() . ' (' . $value->getEmail() . ')';
}
}
- if (empty($dossier->getOrganisatie()->getEmailAdresControle()) === false){
+ if (empty($dossier->getOrganisatie()->getEmailAdresControle()) === false) {
$data = $dossier->getOrganisatie()->getEmailAdresControle();
$choices = array($dossier->getOrganisatie()->getEmailAdresControle() => 'Controle e-mailadres (' . $dossier->getOrganisatie()->getEmailAdresControle() . ')') + $choices;
}
@@ -125,7 +126,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
'data' => $dossier,
'disabled' => $dossier->isInPrullenbak() === true
]);
-
});
}
diff --git a/src/Form/Type/VoorleggerGereserveerdeGeldenFormType.php b/src/Form/Type/VoorleggerGereserveerdeGeldenFormType.php
index f15cfd02..436ec93e 100644
--- a/src/Form/Type/VoorleggerGereserveerdeGeldenFormType.php
+++ b/src/Form/Type/VoorleggerGereserveerdeGeldenFormType.php
@@ -1,4 +1,5 @@
false
]);
$builder->add('gereserveerdeGelden', NumberType::class, [
+ 'scale' => 2,
'required' => false,
'help' => 'DB: voorlegger.gereserveerde_gelden'
]);
@@ -74,4 +76,4 @@ public function configureOptions(OptionsResolver $resolver)
$resolver->setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerHuurspecificatieFormType.php b/src/Form/Type/VoorleggerHuurspecificatieFormType.php
index 381958ae..38596435 100644
--- a/src/Form/Type/VoorleggerHuurspecificatieFormType.php
+++ b/src/Form/Type/VoorleggerHuurspecificatieFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerInkomstenspecificatieFormType.php b/src/Form/Type/VoorleggerInkomstenspecificatieFormType.php
index b4f80e0a..48464154 100644
--- a/src/Form/Type/VoorleggerInkomstenspecificatieFormType.php
+++ b/src/Form/Type/VoorleggerInkomstenspecificatieFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerInzageToetsingBkrFormType.php b/src/Form/Type/VoorleggerInzageToetsingBkrFormType.php
index 9b75e7c7..2f78f98a 100644
--- a/src/Form/Type/VoorleggerInzageToetsingBkrFormType.php
+++ b/src/Form/Type/VoorleggerInzageToetsingBkrFormType.php
@@ -1,4 +1,5 @@
setDefault('data_class', Voorlegger::class);
$resolver->setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
- }
-}
\ No newline at end of file
+ }
+}
diff --git a/src/Form/Type/VoorleggerKostgeldFormType.php b/src/Form/Type/VoorleggerKostgeldFormType.php
index cfea4697..d75d9b81 100644
--- a/src/Form/Type/VoorleggerKostgeldFormType.php
+++ b/src/Form/Type/VoorleggerKostgeldFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerKwijtscheldingGemeenteBelastingFormType.php b/src/Form/Type/VoorleggerKwijtscheldingGemeenteBelastingFormType.php
index ffa35061..0764fcfa 100644
--- a/src/Form/Type/VoorleggerKwijtscheldingGemeenteBelastingFormType.php
+++ b/src/Form/Type/VoorleggerKwijtscheldingGemeenteBelastingFormType.php
@@ -1,4 +1,5 @@
'nvt',
];
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerLegitimatieFormType.php b/src/Form/Type/VoorleggerLegitimatieFormType.php
index f0edc46a..1a24cd03 100644
--- a/src/Form/Type/VoorleggerLegitimatieFormType.php
+++ b/src/Form/Type/VoorleggerLegitimatieFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerMeterstandenEnergieFormType.php b/src/Form/Type/VoorleggerMeterstandenEnergieFormType.php
index c311959e..8b97052c 100644
--- a/src/Form/Type/VoorleggerMeterstandenEnergieFormType.php
+++ b/src/Form/Type/VoorleggerMeterstandenEnergieFormType.php
@@ -1,4 +1,5 @@
false,
'label' => 'Jongeren Schuldenvrije Start (JSS)',
'help' => 'DB: voorlegger.jongeren_schuldenvrije_start',
- 'constraints' => [new Callback(function($value, ExecutionContextInterface $executionContext) {
+ 'constraints' => [new Callback(function ($value, ExecutionContextInterface $executionContext) {
/**
* @var Voorlegger $voorlegger
*/
diff --git a/src/Form/Type/VoorleggerOvereenkomstKinderopvangFormType.php b/src/Form/Type/VoorleggerOvereenkomstKinderopvangFormType.php
index 3f9fdf18..3fe7d5ae 100644
--- a/src/Form/Type/VoorleggerOvereenkomstKinderopvangFormType.php
+++ b/src/Form/Type/VoorleggerOvereenkomstKinderopvangFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerOverigeDocumentenFormType.php b/src/Form/Type/VoorleggerOverigeDocumentenFormType.php
index a94b5ae3..aad0b165 100644
--- a/src/Form/Type/VoorleggerOverigeDocumentenFormType.php
+++ b/src/Form/Type/VoorleggerOverigeDocumentenFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerPolisbladZorgverzekeringFormType.php b/src/Form/Type/VoorleggerPolisbladZorgverzekeringFormType.php
index db103f8c..d3091f12 100644
--- a/src/Form/Type/VoorleggerPolisbladZorgverzekeringFormType.php
+++ b/src/Form/Type/VoorleggerPolisbladZorgverzekeringFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerRetourbewijsModemFormType.php b/src/Form/Type/VoorleggerRetourbewijsModemFormType.php
index e14c6cca..02d48977 100644
--- a/src/Form/Type/VoorleggerRetourbewijsModemFormType.php
+++ b/src/Form/Type/VoorleggerRetourbewijsModemFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerSchuldenoverzichtFormType.php b/src/Form/Type/VoorleggerSchuldenoverzichtFormType.php
index bf3d55f1..dd74d475 100644
--- a/src/Form/Type/VoorleggerSchuldenoverzichtFormType.php
+++ b/src/Form/Type/VoorleggerSchuldenoverzichtFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerStabilisatieovereenkomstFormType.php b/src/Form/Type/VoorleggerStabilisatieovereenkomstFormType.php
index 97b0e0a1..6576e494 100644
--- a/src/Form/Type/VoorleggerStabilisatieovereenkomstFormType.php
+++ b/src/Form/Type/VoorleggerStabilisatieovereenkomstFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerToelichtingAanvraagSchuldsaneringClientFormType.php b/src/Form/Type/VoorleggerToelichtingAanvraagSchuldsaneringClientFormType.php
index c8bb0b81..cf9d891f 100644
--- a/src/Form/Type/VoorleggerToelichtingAanvraagSchuldsaneringClientFormType.php
+++ b/src/Form/Type/VoorleggerToelichtingAanvraagSchuldsaneringClientFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerToelichtingAanvraagSchuldsaneringShvFormType.php b/src/Form/Type/VoorleggerToelichtingAanvraagSchuldsaneringShvFormType.php
index b70db8ad..4f5d2e21 100644
--- a/src/Form/Type/VoorleggerToelichtingAanvraagSchuldsaneringShvFormType.php
+++ b/src/Form/Type/VoorleggerToelichtingAanvraagSchuldsaneringShvFormType.php
@@ -1,4 +1,5 @@
setDefault('disable_group', null);
}
- private function getOntstaanVanSchuldenOptions() {
+ private function getOntstaanVanSchuldenOptions()
+ {
return [
'Overlevingsschulden' => 'OVERLEVING',
'Compensatieschulden' => 'COMPENSATIE',
@@ -93,7 +95,8 @@ private function getOntstaanVanSchuldenOptions() {
];
}
- private function getInspanningsverplichting() {
+ private function getInspanningsverplichting()
+ {
return [
'Naar maximaal vermogen werkzaam' => 'MAXIMAAL_VERMOGEN',
'Niet naar maximaal vermogen werkzaam, sollicitatieplicht, hogere aflossingscapaciteit verwacht' => 'HOGE_CAPACITEIT',
@@ -101,4 +104,4 @@ private function getInspanningsverplichting() {
'Niet in staat om werk te verrichten voor de looptijd van de schuldregeling' => 'GEEN_WERK',
];
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerToeslagenFormType.php b/src/Form/Type/VoorleggerToeslagenFormType.php
index 694f7323..8c1ffbc2 100644
--- a/src/Form/Type/VoorleggerToeslagenFormType.php
+++ b/src/Form/Type/VoorleggerToeslagenFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerVerklaringWerkgeverFormType.php b/src/Form/Type/VoorleggerVerklaringWerkgeverFormType.php
index 83ed3ac8..cbba7a9f 100644
--- a/src/Form/Type/VoorleggerVerklaringWerkgeverFormType.php
+++ b/src/Form/Type/VoorleggerVerklaringWerkgeverFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerVoorlopigeTeruggaafBelastingdienstFormType.php b/src/Form/Type/VoorleggerVoorlopigeTeruggaafBelastingdienstFormType.php
index 2a9262ae..0dcb4d00 100644
--- a/src/Form/Type/VoorleggerVoorlopigeTeruggaafBelastingdienstFormType.php
+++ b/src/Form/Type/VoorleggerVoorlopigeTeruggaafBelastingdienstFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerVrijwaringsbewijsFormType.php b/src/Form/Type/VoorleggerVrijwaringsbewijsFormType.php
index 5618f321..2f098b55 100644
--- a/src/Form/Type/VoorleggerVrijwaringsbewijsFormType.php
+++ b/src/Form/Type/VoorleggerVrijwaringsbewijsFormType.php
@@ -1,4 +1,5 @@
setDefault('choice_translation_domain', false);
$resolver->setDefault('disable_group', null);
}
-}
\ No newline at end of file
+}
diff --git a/src/Form/Type/VoorleggerVtlbFormType.php b/src/Form/Type/VoorleggerVtlbFormType.php
index 0d42f692..e02f04f9 100644
--- a/src/Form/Type/VoorleggerVtlbFormType.php
+++ b/src/Form/Type/VoorleggerVtlbFormType.php
@@ -1,4 +1,5 @@
add('vtlbBedrag', NumberType::class, [
'required' => false,
+ 'scale' => 2,
'label' => 'Maandelijkse afloscapaciteit',
'help' => 'DB: voorlegger.vtlb_bedrag'
]);
diff --git a/src/Form/Type/VoorleggerWaternetFormType.php b/src/Form/Type/VoorleggerWaternetFormType.php
index 875512dd..0e5033e3 100644
--- a/src/Form/Type/VoorleggerWaternetFormType.php
+++ b/src/Form/Type/VoorleggerWaternetFormType.php
@@ -1,4 +1,5 @@
getProjectDir().'/var/cache/'.$this->environment;
+ return $this->getProjectDir() . '/var/cache/' . $this->environment;
}
public function getLogDir()
{
- return $this->getProjectDir().'/var/log';
+ return $this->getProjectDir() . '/var/log';
}
public function registerBundles()
{
- $contents = require $this->getProjectDir().'/config/bundles.php';
+ $contents = require $this->getProjectDir() . '/config/bundles.php';
foreach ($contents as $class => $envs) {
if (isset($envs['all']) || isset($envs[$this->environment])) {
yield new $class();
@@ -40,20 +40,20 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
// if you are using symfony/dependency-injection 4.0+ as it's the default behavior
$container->setParameter('container.autowiring.strict_mode', true);
$container->setParameter('container.dumper.inline_class_loader', true);
- $confDir = $this->getProjectDir().'/config';
+ $confDir = $this->getProjectDir() . '/config';
- $loader->load($confDir.'/{packages}/*'.self::CONFIG_EXTS, 'glob');
- $loader->load($confDir.'/{packages}/'.$this->environment.'/**/*'.self::CONFIG_EXTS, 'glob');
- $loader->load($confDir.'/{services}'.self::CONFIG_EXTS, 'glob');
- $loader->load($confDir.'/{services}_'.$this->environment.self::CONFIG_EXTS, 'glob');
+ $loader->load($confDir . '/{packages}/*' . self::CONFIG_EXTS, 'glob');
+ $loader->load($confDir . '/{packages}/' . $this->environment . '/**/*' . self::CONFIG_EXTS, 'glob');
+ $loader->load($confDir . '/{services}' . self::CONFIG_EXTS, 'glob');
+ $loader->load($confDir . '/{services}_' . $this->environment . self::CONFIG_EXTS, 'glob');
}
protected function configureRoutes(RouteCollectionBuilder $routes)
{
- $confDir = $this->getProjectDir().'/config';
+ $confDir = $this->getProjectDir() . '/config';
- $routes->import($confDir.'/{routes}/*'.self::CONFIG_EXTS, '/', 'glob');
- $routes->import($confDir.'/{routes}/'.$this->environment.'/**/*'.self::CONFIG_EXTS, '/', 'glob');
- $routes->import($confDir.'/{routes}'.self::CONFIG_EXTS, '/', 'glob');
+ $routes->import($confDir . '/{routes}/*' . self::CONFIG_EXTS, '/', 'glob');
+ $routes->import($confDir . '/{routes}/' . $this->environment . '/**/*' . self::CONFIG_EXTS, '/', 'glob');
+ $routes->import($confDir . '/{routes}' . self::CONFIG_EXTS, '/', 'glob');
}
}
diff --git a/src/LogFormatter/CSPLogFormatter.php b/src/LogFormatter/CSPLogFormatter.php
index a2ec8f9b..2e2403f7 100644
--- a/src/LogFormatter/CSPLogFormatter.php
+++ b/src/LogFormatter/CSPLogFormatter.php
@@ -1,21 +1,21 @@
-getUri(),
- $report->getData()['blocked-uri']
- );
- }
-}
\ No newline at end of file
+getUri(),
+ $report->getData()['blocked-uri']
+ );
+ }
+}
diff --git a/src/Migrations/Version20180228142615.php b/src/Migrations/Version20180228142615.php
index ca6b8803..8f460b99 100644
--- a/src/Migrations/Version20180228142615.php
+++ b/src/Migrations/Version20180228142615.php
@@ -1,4 +1,6 @@
-addSql('UPDATE dossier SET status = \'compleet_gka\' WHERE status = \'bezig_gka\'');
-
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
-
}
}
diff --git a/src/Migrations/Version20180419115946.php b/src/Migrations/Version20180419115946.php
index 71478c7b..03428e70 100644
--- a/src/Migrations/Version20180419115946.php
+++ b/src/Migrations/Version20180419115946.php
@@ -1,4 +1,6 @@
-addSql('ALTER TABLE voorlegger ADD toeslagen_zorg BOOLEAN DEFAULT NULL');
$this->addSql('ALTER TABLE voorlegger ADD toeslagen_kinderopvang BOOLEAN DEFAULT NULL');
$this->addSql('ALTER TABLE voorlegger ADD toeslagen_kindgebonden_budget BOOLEAN DEFAULT NULL');
-
+
$this->addSql('UPDATE voorlegger SET toeslagen_ontvangen_madi = 1');
$this->addSql('UPDATE voorlegger SET toeslagen_ontvangen_gka = 0');
$this->addSql('UPDATE voorlegger SET toeslagen_huur = (SELECT COUNT(dd.id) FROM dossier_document AS dd WHERE dd.onderwerp = \'huurtoeslag\' AND dd.dossier_id = voorlegger.dossier_id) > 0');
@@ -31,7 +33,7 @@ public function up(Schema $schema): void
$this->addSql('UPDATE voorlegger SET toeslagen_kindgebonden_budget = (SELECT COUNT(dd.id) FROM dossier_document AS dd WHERE dd.onderwerp = \'kindgebondenBudget\' AND dd.dossier_id = voorlegger.dossier_id) > 0');
$this->addSql('UPDATE voorlegger SET toeslagen_nvt = false');
$this->addSql('UPDATE voorlegger SET toeslagen_nvt = true WHERE toeslagen_huur = false AND toeslagen_zorg = false AND toeslagen_kinderopvang = false AND toeslagen_kindgebonden_budget = false');
-
+
$this->addSql('UPDATE dossier_document SET onderwerp = \'toeslagen\' WHERE onderwerp =\'huurtoeslag\'');
$this->addSql('UPDATE dossier_document SET onderwerp = \'toeslagen\' WHERE onderwerp =\'zorgtoeslag\'');
$this->addSql('UPDATE dossier_document SET onderwerp = \'toeslagen\' WHERE onderwerp =\'kinderopvangtoeslag\'');
diff --git a/src/Migrations/Version20180430143437.php b/src/Migrations/Version20180430143437.php
index 55590e16..861f0b6e 100644
--- a/src/Migrations/Version20180430143437.php
+++ b/src/Migrations/Version20180430143437.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -18,7 +20,7 @@ public function up(Schema $schema) : void
$this->addSql('ALTER TABLE schuld_item ALTER bedrag TYPE NUMERIC(9, 2)');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20181119121437.php b/src/Migrations/Version20181119121437.php
index 68df1fc0..3999cce6 100644
--- a/src/Migrations/Version20181119121437.php
+++ b/src/Migrations/Version20181119121437.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -20,7 +22,7 @@ public function up(Schema $schema) : void
$this->addSql('CREATE INDEX IDX_28D92139296CD8AE ON schuldhulpbureau (team_id)');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20181126143355.php b/src/Migrations/Version20181126143355.php
index 5b1c8c50..63ac4c42 100644
--- a/src/Migrations/Version20181126143355.php
+++ b/src/Migrations/Version20181126143355.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -27,7 +29,7 @@ public function up(Schema $schema) : void
$this->addSql('UPDATE dossier_timeline SET subtype = \'afsluiten_gka\' WHERE type =\'workflow\' AND subtype IS NULL AND data::json->>\'transition\' = \'afsluiten_gka\' ');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20181218132305.php b/src/Migrations/Version20181218132305.php
index 42496366..aa9847b4 100644
--- a/src/Migrations/Version20181218132305.php
+++ b/src/Migrations/Version20181218132305.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -19,7 +21,7 @@ public function up(Schema $schema) : void
$this->addSql('CREATE TABLE action_event (id BIGINT NOT NULL, name VARCHAR(255) NOT NULL, ip VARCHAR(45) NOT NULL, data JSON DEFAULT NULL, datum_tijd TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, PRIMARY KEY(id))');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20190121130249.php b/src/Migrations/Version20190121130249.php
index a0127952..65ae4f47 100644
--- a/src/Migrations/Version20190121130249.php
+++ b/src/Migrations/Version20190121130249.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -18,7 +20,7 @@ public function up(Schema $schema) : void
$this->addSql('ALTER TABLE gebruiker ALTER naam DROP NOT NULL');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20190121143103.php b/src/Migrations/Version20190121143103.php
index b39fcea8..be978746 100644
--- a/src/Migrations/Version20190121143103.php
+++ b/src/Migrations/Version20190121143103.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -28,7 +30,7 @@ public function up(Schema $schema) : void
$this->addSql('ALTER TABLE gebruiker DROP schuldhulpbureau_id');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20190121160949.php b/src/Migrations/Version20190121160949.php
index 31162e74..f0f054a9 100644
--- a/src/Migrations/Version20190121160949.php
+++ b/src/Migrations/Version20190121160949.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -20,7 +22,7 @@ public function up(Schema $schema) : void
$this->addSql('CREATE INDEX IDX_DC60C61B611C0C56 ON action_event (dossier_id)');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20190211151259.php b/src/Migrations/Version20190211151259.php
index c1e786b2..8b5c3de4 100644
--- a/src/Migrations/Version20190211151259.php
+++ b/src/Migrations/Version20190211151259.php
@@ -1,4 +1,6 @@
-addSql('INSERT INTO schuldeiser (id, bedrijfsnaam, rekening) VALUES (nextval(\'schuldeiser_id_seq\'), \'`onbekende schuldeiser\', \'0\')');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
$this->addSql('DELETE FROM schuldeiser WHERE bedrijfsnaam = \'`onbekende schuldeiser\';');
}
-
}
diff --git a/src/Migrations/Version20190217170132.php b/src/Migrations/Version20190217170132.php
index fb5c9bcf..6b8d7f5b 100644
--- a/src/Migrations/Version20190217170132.php
+++ b/src/Migrations/Version20190217170132.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -45,7 +47,7 @@ public function up(Schema $schema) : void
$this->addSql('ALTER TABLE voorlegger ADD beschikking_gemeente_amsterdam_ioaw BOOLEAN DEFAULT NULL');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20190318132708.php b/src/Migrations/Version20190318132708.php
index 5453236f..1e3ff869 100644
--- a/src/Migrations/Version20190318132708.php
+++ b/src/Migrations/Version20190318132708.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -18,7 +20,7 @@ public function up(Schema $schema) : void
$this->addSql('ALTER TABLE gebruiker ADD telefoonnummer VARCHAR(12) DEFAULT NULL');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20190331182322.php b/src/Migrations/Version20190331182322.php
index 68feb264..6d6ed073 100644
--- a/src/Migrations/Version20190331182322.php
+++ b/src/Migrations/Version20190331182322.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -18,7 +20,7 @@ public function up(Schema $schema) : void
$this->addSql('ALTER TABLE schuld_item ADD bedrag_oorspronkelijk NUMERIC(9, 2) DEFAULT NULL');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20190401121634.php b/src/Migrations/Version20190401121634.php
index e6263dc9..e0aae813 100644
--- a/src/Migrations/Version20190401121634.php
+++ b/src/Migrations/Version20190401121634.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -18,7 +20,7 @@ public function up(Schema $schema) : void
$this->addSql('ALTER TABLE dossier ADD eerste_keer_verzonden_aan_gka BOOLEAN DEFAULT \'true\'');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20190410080729.php b/src/Migrations/Version20190410080729.php
index 475df3ee..32ef915c 100644
--- a/src/Migrations/Version20190410080729.php
+++ b/src/Migrations/Version20190410080729.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -18,7 +20,7 @@ public function up(Schema $schema) : void
$this->addSql('ALTER TABLE schuldeiser ADD enabled BOOLEAN DEFAULT \'true\' NOT NULL');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20190412081149.php b/src/Migrations/Version20190412081149.php
index 80ee33b6..590d75b5 100644
--- a/src/Migrations/Version20190412081149.php
+++ b/src/Migrations/Version20190412081149.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -19,7 +21,7 @@ public function up(Schema $schema) : void
$this->addSql('ALTER TABLE gebruiker ALTER password DROP NOT NULL');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20191209131812.php b/src/Migrations/Version20191209131812.php
index fc10557b..ed853b07 100644
--- a/src/Migrations/Version20191209131812.php
+++ b/src/Migrations/Version20191209131812.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -21,7 +23,7 @@ public function up(Schema $schema) : void
$this->addSql('ALTER TABLE schuldhulpbureau ADD allegro_session_age TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20191211095758.php b/src/Migrations/Version20191211095758.php
index b93fb5e8..6c583eda 100644
--- a/src/Migrations/Version20191211095758.php
+++ b/src/Migrations/Version20191211095758.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -21,7 +23,7 @@ public function up(Schema $schema) : void
$this->addSql('ALTER TABLE dossier ADD allegro_eind_status VARCHAR(1) DEFAULT NULL');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20191211105548.php b/src/Migrations/Version20191211105548.php
index fa11d847..a287da14 100644
--- a/src/Migrations/Version20191211105548.php
+++ b/src/Migrations/Version20191211105548.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -18,7 +20,7 @@ public function up(Schema $schema) : void
$this->addSql('ALTER TABLE dossier DROP allegro_eind_status');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20200127055756.php b/src/Migrations/Version20200127055756.php
index 8b2486f6..fe4d0087 100644
--- a/src/Migrations/Version20200127055756.php
+++ b/src/Migrations/Version20200127055756.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -19,7 +21,7 @@ public function up(Schema $schema) : void
$this->addSql('ALTER TABLE voorlegger ADD arbeidsovereenkomst_partner_einddatum DATE DEFAULT NULL');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20200128123450.php b/src/Migrations/Version20200128123450.php
index 1c6aad04..c2f201ca 100644
--- a/src/Migrations/Version20200128123450.php
+++ b/src/Migrations/Version20200128123450.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -18,7 +20,7 @@ public function up(Schema $schema) : void
$this->addSql('ALTER TABLE dossier ADD aangifte_belastingdienst BOOLEAN DEFAULT \'false\'');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20200128123706.php b/src/Migrations/Version20200128123706.php
index fe188feb..4a4ba220 100644
--- a/src/Migrations/Version20200128123706.php
+++ b/src/Migrations/Version20200128123706.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -19,7 +21,7 @@ public function up(Schema $schema) : void
$this->addSql('ALTER TABLE voorlegger ADD aangifte_belastingdienst BOOLEAN DEFAULT \'false\'');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20200131120407.php b/src/Migrations/Version20200131120407.php
index ff7fac49..ae6d3ab5 100644
--- a/src/Migrations/Version20200131120407.php
+++ b/src/Migrations/Version20200131120407.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -18,7 +20,7 @@ public function up(Schema $schema) : void
$this->addSql('ALTER TABLE dossier ADD client_huwelijksdatum DATE DEFAULT NULL');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20200420074620.php b/src/Migrations/Version20200420074620.php
index 49a7c803..d1b18652 100644
--- a/src/Migrations/Version20200420074620.php
+++ b/src/Migrations/Version20200420074620.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -18,7 +20,7 @@ public function up(Schema $schema) : void
$this->addSql('ALTER TABLE dossier ADD send_to_allegro TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20200818095526.php b/src/Migrations/Version20200818095526.php
index b46e0374..953b3b81 100644
--- a/src/Migrations/Version20200818095526.php
+++ b/src/Migrations/Version20200818095526.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -22,7 +24,7 @@ public function up(Schema $schema) : void
$this->addSql('CREATE UNIQUE INDEX uq_email ON gebruiker (email)');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20200915083734.php b/src/Migrations/Version20200915083734.php
index 5682776e..7752ecdb 100644
--- a/src/Migrations/Version20200915083734.php
+++ b/src/Migrations/Version20200915083734.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -19,7 +21,7 @@ public function up(Schema $schema) : void
$this->addSql('ALTER TABLE voorlegger ADD aangifte_belastingdienst_ontvangen_gka SMALLINT DEFAULT NULL');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20200915084350.php b/src/Migrations/Version20200915084350.php
index 2b2ec924..614b0923 100644
--- a/src/Migrations/Version20200915084350.php
+++ b/src/Migrations/Version20200915084350.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -22,7 +24,7 @@ public function up(Schema $schema) : void
$this->addSql('ALTER TABLE voorlegger DROP aangifte_belastingdienst_ontvangen_gka');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20200915092230.php b/src/Migrations/Version20200915092230.php
index ca15fc4a..52966687 100644
--- a/src/Migrations/Version20200915092230.php
+++ b/src/Migrations/Version20200915092230.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -18,7 +20,7 @@ public function up(Schema $schema) : void
$this->addSql('ALTER TABLE dossier ADD client_burgelijke_staat_sinds TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20200915110221.php b/src/Migrations/Version20200915110221.php
index 321ea6e7..1c423575 100644
--- a/src/Migrations/Version20200915110221.php
+++ b/src/Migrations/Version20200915110221.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -18,7 +20,7 @@ public function up(Schema $schema) : void
$this->addSql('ALTER TABLE voorlegger ADD jongeren_schuldenvrije_start BOOLEAN DEFAULT NULL');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20201103132553.php b/src/Migrations/Version20201103132553.php
index 4ab0ccce..24279bbd 100644
--- a/src/Migrations/Version20201103132553.php
+++ b/src/Migrations/Version20201103132553.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -18,7 +20,7 @@ public function up(Schema $schema) : void
$this->addSql('ALTER TABLE schuld_item ADD toevoeging_onbekende_schuldeiser TEXT DEFAULT NULL');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20201110084131.php b/src/Migrations/Version20201110084131.php
index e830fcae..86b3b864 100644
--- a/src/Migrations/Version20201110084131.php
+++ b/src/Migrations/Version20201110084131.php
@@ -1,4 +1,6 @@
-abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -18,7 +20,7 @@ public function up(Schema $schema) : void
$this->addSql('ALTER TABLE gebruiker ADD last_login TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
diff --git a/src/Migrations/Version20210119104219.php b/src/Migrations/Version20210119104219.php
index 49ae0673..8676bae6 100644
--- a/src/Migrations/Version20210119104219.php
+++ b/src/Migrations/Version20210119104219.php
@@ -12,19 +12,19 @@
*/
final class Version20210119104219 extends AbstractMigration
{
- public function getDescription() : string
+ public function getDescription(): string
{
return '';
}
- public function up(Schema $schema) : void
+ public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE voorlegger ADD schuldenrust_lening BOOLEAN DEFAULT NULL');
$this->addSql('ALTER TABLE voorlegger ADD sanerings_krediet BOOLEAN DEFAULT NULL');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE SCHEMA public');
diff --git a/src/Migrations/Version20221018123429.php b/src/Migrations/Version20221018123429.php
index 57c4fcaa..7ac9ed09 100644
--- a/src/Migrations/Version20221018123429.php
+++ b/src/Migrations/Version20221018123429.php
@@ -12,18 +12,18 @@
*/
final class Version20221018123429 extends AbstractMigration
{
- public function getDescription() : string
+ public function getDescription(): string
{
return '';
}
- public function up(Schema $schema) : void
+ public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE voorlegger ADD verlonings_dag INT DEFAULT NULL');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE voorlegger DROP verlonings_dag');
diff --git a/src/Migrations/Version20221018141015.php b/src/Migrations/Version20221018141015.php
index 25d24d12..bf3bbdae 100644
--- a/src/Migrations/Version20221018141015.php
+++ b/src/Migrations/Version20221018141015.php
@@ -12,18 +12,18 @@
*/
final class Version20221018141015 extends AbstractMigration
{
- public function getDescription() : string
+ public function getDescription(): string
{
return '';
}
- public function up(Schema $schema) : void
+ public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE dossier ADD client_email VARCHAR(255) DEFAULT NULL');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE dossier DROP client_email');
diff --git a/src/Migrations/Version20221020083425.php b/src/Migrations/Version20221020083425.php
index f057c4bf..629f059c 100644
--- a/src/Migrations/Version20221020083425.php
+++ b/src/Migrations/Version20221020083425.php
@@ -12,12 +12,12 @@
*/
final class Version20221020083425 extends AbstractMigration
{
- public function getDescription() : string
+ public function getDescription(): string
{
return '';
}
- public function up(Schema $schema) : void
+ public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE voorlegger ADD jss_adviseur_naam VARCHAR(25) DEFAULT NULL');
@@ -25,7 +25,7 @@ public function up(Schema $schema) : void
$this->addSql('ALTER TABLE voorlegger ADD jss_adviseur_email VARCHAR(25) DEFAULT NULL');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE voorlegger DROP jss_adviseur_naam');
diff --git a/src/Migrations/Version20221124142100.php b/src/Migrations/Version20221124142100.php
index a58ec96f..1639fc15 100644
--- a/src/Migrations/Version20221124142100.php
+++ b/src/Migrations/Version20221124142100.php
@@ -12,12 +12,12 @@
*/
final class Version20221124142100 extends AbstractMigration
{
- public function getDescription() : string
+ public function getDescription(): string
{
return '';
}
- public function up(Schema $schema) : void
+ public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE voorlegger ALTER jss_adviseur_naam TYPE VARCHAR(125)');
@@ -25,7 +25,7 @@ public function up(Schema $schema) : void
$this->addSql('ALTER TABLE voorlegger ALTER jss_adviseur_email TYPE VARCHAR(125)');
}
- public function down(Schema $schema) : void
+ public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE SCHEMA public');
diff --git a/src/Migrations/Version20230522125400.php b/src/Migrations/Version20230522125400.php
index 87802fa4..25360ca8 100644
--- a/src/Migrations/Version20230522125400.php
+++ b/src/Migrations/Version20230522125400.php
@@ -12,7 +12,6 @@
*/
final class Version20230522125400 extends AbstractMigration
{
-
public function getDescription(): string
{
return '';
diff --git a/src/Migrations/Version20230821065733.php b/src/Migrations/Version20230821065733.php
index 84949edd..1c0664cd 100644
--- a/src/Migrations/Version20230821065733.php
+++ b/src/Migrations/Version20230821065733.php
@@ -24,6 +24,5 @@ public function down(Schema $schema): void
{
$this->addSql('ALTER TABLE voorlegger DROP principebeslissing');
$this->addSql('ALTER TABLE voorlegger DROP schulden_op_de_werkvloer');
-
}
}
diff --git a/src/Migrations/Version20240402124121.php b/src/Migrations/Version20240402124121.php
index 01b5565c..9af79d1c 100644
--- a/src/Migrations/Version20240402124121.php
+++ b/src/Migrations/Version20240402124121.php
@@ -26,4 +26,4 @@ public function down(Schema $schema): void
{
$this->addSql("ALTER TABLE voorlegger RENAME COLUMN kindregeling TO schuldenrust_lening");
}
-}
\ No newline at end of file
+}
diff --git a/src/Migrations/Version20251110145705.php b/src/Migrations/Version20251110145705.php
index 49d6473e..36c7c031 100644
--- a/src/Migrations/Version20251110145705.php
+++ b/src/Migrations/Version20251110145705.php
@@ -9,7 +9,7 @@
final class Version20251110145705 extends AbstractMigration
{
- public function getDescription(): string
+ public function getDescription(): string
{
return 'Update dossier.indiendatum_tijd with the latest datumtijd from dossier_timeline for subtype verzenden_gka';
}
diff --git a/src/Migrations/Version20251111152154.php b/src/Migrations/Version20251111152154.php
index bc8d7ed9..e9183823 100644
--- a/src/Migrations/Version20251111152154.php
+++ b/src/Migrations/Version20251111152154.php
@@ -12,7 +12,7 @@
*/
final class Version20251111152154 extends AbstractMigration
{
- public function getDescription(): string
+ public function getDescription(): string
{
return 'Update dossier.indiendatum_tijd with the latest datumtijd from dossier_timeline for subtype verzenden_shv';
}
@@ -43,4 +43,4 @@ public function down(Schema $schema): void
SET indiendatum_tijd = NULL
");
}
-}
\ No newline at end of file
+}
diff --git a/src/Migrations/Version20260123132537.php b/src/Migrations/Version20260123132537.php
new file mode 100644
index 00000000..1c06f4a8
--- /dev/null
+++ b/src/Migrations/Version20260123132537.php
@@ -0,0 +1,48 @@
+addSql('DROP SEQUENCE thumbnail_id_seq CASCADE');
+ $this->addSql('ALTER TABLE thumbnail DROP CONSTRAINT fk_c35726e6c33f7837');
+ $this->addSql('DROP TABLE thumbnail');
+ $this->addSql('ALTER INDEX idx_3d48e0373e6b6494 RENAME TO IDX_3D48E037BD53D44E');
+ $this->addSql('ALTER INDEX idx_3d48e0373f310e50 RENAME TO IDX_3D48E0379445F818');
+ $this->addSql('ALTER INDEX idx_367a5dc79c92a3df RENAME TO IDX_EE455A469C92A3DF');
+ $this->addSql('ALTER INDEX idx_367a5dc73e6b6494 RENAME TO IDX_EE455A46BD53D44E');
+ $this->addSql('ALTER INDEX idx_28d92139296cd8ae RENAME TO IDX_6DD12C19296CD8AE');
+ }
+
+ public function down(Schema $schema): void
+ {
+ // this down() migration is auto-generated, please modify it to your needs
+ $this->addSql('CREATE SCHEMA public');
+ $this->addSql('CREATE SEQUENCE thumbnail_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+ $this->addSql('CREATE TABLE thumbnail (id INT NOT NULL, document_id INT NOT NULL, bestandsnaam VARCHAR(255) NOT NULL, type VARCHAR(25) NOT NULL, sort INT NOT NULL, PRIMARY KEY(id))');
+ $this->addSql('CREATE INDEX idx_c35726e6c33f7837 ON thumbnail (document_id)');
+ $this->addSql('CREATE UNIQUE INDEX uq_bestandsnaam ON thumbnail (bestandsnaam)');
+ $this->addSql('ALTER TABLE thumbnail ADD CONSTRAINT fk_c35726e6c33f7837 FOREIGN KEY (document_id) REFERENCES document (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+ $this->addSql('ALTER INDEX idx_6dd12c19296cd8ae RENAME TO idx_28d92139296cd8ae');
+ $this->addSql('ALTER INDEX idx_3d48e037bd53d44e RENAME TO idx_3d48e0373e6b6494');
+ $this->addSql('ALTER INDEX idx_3d48e0379445f818 RENAME TO idx_3d48e0373f310e50');
+ $this->addSql('ALTER INDEX idx_ee455a46bd53d44e RENAME TO idx_367a5dc73e6b6494');
+ $this->addSql('ALTER INDEX idx_ee455a469c92a3df RENAME TO idx_367a5dc79c92a3df');
+ }
+}
diff --git a/src/Normalizer/DateTimeNormalizer.php b/src/Normalizer/DateTimeNormalizer.php
index f22c0ffa..faa741bd 100644
--- a/src/Normalizer/DateTimeNormalizer.php
+++ b/src/Normalizer/DateTimeNormalizer.php
@@ -24,5 +24,4 @@ public function normalize($object, $format = null, array $context = [])
'rfc2822' => $object->format('r'),
];
}
-
-}
\ No newline at end of file
+}
diff --git a/src/Normalizer/DossierDocumentNormalizer.php b/src/Normalizer/DossierDocumentNormalizer.php
index 1edc7683..f367e1ee 100644
--- a/src/Normalizer/DossierDocumentNormalizer.php
+++ b/src/Normalizer/DossierDocumentNormalizer.php
@@ -50,5 +50,4 @@ public function normalize($object, $format = null, array $context = [])
]
];
}
-
-}
\ No newline at end of file
+}
diff --git a/src/Normalizer/FormErrorIteratorNormalizer.php b/src/Normalizer/FormErrorIteratorNormalizer.php
index 2c31c660..29899812 100644
--- a/src/Normalizer/FormErrorIteratorNormalizer.php
+++ b/src/Normalizer/FormErrorIteratorNormalizer.php
@@ -46,5 +46,4 @@ public function normalize($object, $format = null, array $context = [])
'errors' => $errorData
];
}
-
-}
\ No newline at end of file
+}
diff --git a/src/Normalizer/GebruikerNormalizer.php b/src/Normalizer/GebruikerNormalizer.php
index a6f0d6ac..d21d41c4 100644
--- a/src/Normalizer/GebruikerNormalizer.php
+++ b/src/Normalizer/GebruikerNormalizer.php
@@ -27,5 +27,4 @@ public function normalize($object, $format = null, array $context = [])
'username' => $object->getUsername()
];
}
-
-}
\ No newline at end of file
+}
diff --git a/src/Normalizer/SchuldItemNormalizer.php b/src/Normalizer/SchuldItemNormalizer.php
index 8a323089..15922084 100644
--- a/src/Normalizer/SchuldItemNormalizer.php
+++ b/src/Normalizer/SchuldItemNormalizer.php
@@ -37,5 +37,4 @@ public function normalize($object, $format = null, array $context = [])
'dossierDocumenten' => $this->normalizer->normalize($object->getDossierDocumenten(), $format)
];
}
-
-}
\ No newline at end of file
+}
diff --git a/src/Normalizer/SchuldeiserNormalizer.php b/src/Normalizer/SchuldeiserNormalizer.php
index 0246fc6f..f4c9a9b4 100644
--- a/src/Normalizer/SchuldeiserNormalizer.php
+++ b/src/Normalizer/SchuldeiserNormalizer.php
@@ -31,5 +31,4 @@ public function normalize($object, $format = null, array $context = [])
'plaats' => $object->getPlaats(),
];
}
-
-}
\ No newline at end of file
+}
diff --git a/src/Query/Functions/FullTextSearch.php b/src/Query/Functions/FullTextSearch.php
index e115c86e..2bcb4ee8 100644
--- a/src/Query/Functions/FullTextSearch.php
+++ b/src/Query/Functions/FullTextSearch.php
@@ -1,4 +1,5 @@
toArray();
- } else if (is_array($query['organisaties'])) {
+ } elseif (is_array($query['organisaties'])) {
$organisaties = $query['organisaties'];
} else {
$organisaties = [$query['organisaties']];
diff --git a/src/Repository/PaginationTrait.php b/src/Repository/PaginationTrait.php
index 7a9d6c52..e0bfad6a 100644
--- a/src/Repository/PaginationTrait.php
+++ b/src/Repository/PaginationTrait.php
@@ -17,16 +17,18 @@ public function generatePaginationQuery($dql = null): Query
return $this->getEntityManager()->createQuery($dql);
}
- public function generatePaginationQueryDql(): String
+ public function generatePaginationQueryDql(): string
{
- return sprintf('
+ return sprintf(
+ '
SELECT %s
FROM %s %s %s
',
- $this->paginationAlias.$this->paginationAliases,
+ $this->paginationAlias . $this->paginationAliases,
$this->getEntityName(),
$this->paginationAlias,
- $this->paginationJoins);
+ $this->paginationJoins
+ );
}
public function setPaginationAlias(string $alias)
@@ -53,5 +55,4 @@ protected function getEntityManager()
{
return parent::getEntityManager();
}
-
}
diff --git a/src/Repository/TeamRepository.php b/src/Repository/TeamRepository.php
index 3faa8944..dba69b9e 100644
--- a/src/Repository/TeamRepository.php
+++ b/src/Repository/TeamRepository.php
@@ -1,4 +1,5 @@
'ASC', 'id' => 'ASC'], $pageSize, $page * $pageSize);
}
-}
\ No newline at end of file
+}
diff --git a/src/Security/AccessDeniedHandler.php b/src/Security/AccessDeniedHandler.php
index 99666966..3002c288 100644
--- a/src/Security/AccessDeniedHandler.php
+++ b/src/Security/AccessDeniedHandler.php
@@ -49,7 +49,7 @@ public function handle(Request $request, AccessDeniedException $accessDeniedExce
'message' => 'Gebruikerstype is onbekend. [' . $user->getEmail() . ']',
]), Response::HTTP_FORBIDDEN);
}
-
+
return new Response($accessDeniedException->getMessage(), Response::HTTP_FORBIDDEN);
}
}
diff --git a/src/Security/LogoutSuccessHandler.php b/src/Security/LogoutSuccessHandler.php
index c3dc3e0e..4af13a33 100644
--- a/src/Security/LogoutSuccessHandler.php
+++ b/src/Security/LogoutSuccessHandler.php
@@ -14,13 +14,11 @@
class LogoutSuccessHandler implements LogoutSuccessHandlerInterface
{
-
public function __construct(
- private readonly string $url,
- private readonly string $keycloakVersion,
+ private readonly string $url,
+ private readonly string $keycloakVersion,
private readonly RouterInterface $router
- )
- {
+ ) {
}
/**
diff --git a/src/Security/OidcAuthenticator.php b/src/Security/OidcAuthenticator.php
index b69a3708..aee25ae1 100644
--- a/src/Security/OidcAuthenticator.php
+++ b/src/Security/OidcAuthenticator.php
@@ -98,7 +98,6 @@ public function __construct(EntityManagerInterface $em, UrlGeneratorInterface $u
$this->logger = $logger;
$this->twig = $twig;
-
}
/**
@@ -362,13 +361,11 @@ private function tokenIsVerified(Token $token): bool
// create the key instance
$signerKey = new Key($publicKey);
- $signer = new $signers[$token->getHeader('alg')];
+ $signer = new $signers[$token->getHeader('alg')]();
return $token->verify($signer, $signerKey);
- }
- catch (TransferException $e) {
+ } catch (TransferException $e) {
throw new AuthenticationException('Can not connect to OIDC certs URL. Error ' . $e->getMessage());
}
}
}
-
diff --git a/src/Security/UserChecker.php b/src/Security/UserChecker.php
index d67c6ff7..789242e6 100644
--- a/src/Security/UserChecker.php
+++ b/src/Security/UserChecker.php
@@ -26,4 +26,4 @@ public function checkPostAuth(UserInterface $user): void
{
$this->checkPreAuth($user);
}
-}
\ No newline at end of file
+}
diff --git a/src/Security/Voter/DossierVoter.php b/src/Security/Voter/DossierVoter.php
index 631c32e6..dc91ee6a 100644
--- a/src/Security/Voter/DossierVoter.php
+++ b/src/Security/Voter/DossierVoter.php
@@ -73,7 +73,7 @@ protected function voteOnAttribute($attribute, $dossier, TokenInterface $token):
($user->getType() === Gebruiker::TYPE_GKA || $user->getType() === Gebruiker::TYPE_GKA_APPBEHEERDER)
&&
!$dossier->isEersteKeerVerzondenAanGKA()
- ) {
+ ) {
return false;
}
diff --git a/src/Service/AllegroService.php b/src/Service/AllegroService.php
index 20a8a702..ac9551c2 100644
--- a/src/Service/AllegroService.php
+++ b/src/Service/AllegroService.php
@@ -5,6 +5,7 @@
use Doctrine\ORM\EntityManagerInterface;
use GemeenteAmsterdam\FixxxSchuldhulp\Allegro\Login\AllegroLoginClient;
use GemeenteAmsterdam\FixxxSchuldhulp\Allegro\Login\Type\LoginServiceAllegroWebLogin;
+use GemeenteAmsterdam\FixxxSchuldhulp\Allegro\LoginClientFactory;
use GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulp\AllegroSchuldHulpClient;
use GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulp\Type\SchuldHulpServiceGetLijstSchuldeisers;
use GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulp\Type\SchuldHulpServiceGetSBOverzicht;
@@ -23,12 +24,11 @@
use GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\SchuldHulpService___Aanvraag2SR;
use GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TContact;
use GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TSchuld;
+use GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpClientFactory;
use GemeenteAmsterdam\FixxxSchuldhulp\Entity\Dossier;
use GemeenteAmsterdam\FixxxSchuldhulp\Entity\Gebruiker;
-use GemeenteAmsterdam\FixxxSchuldhulp\Entity\Schuldeiser;
use GemeenteAmsterdam\FixxxSchuldhulp\Entity\Organisatie;
-use GemeenteAmsterdam\FixxxSchuldhulp\Allegro\LoginClientFactory;
-use GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpClientFactory;
+use GemeenteAmsterdam\FixxxSchuldhulp\Entity\Schuldeiser;
use GemeenteAmsterdam\FixxxSchuldhulp\Event\ActionEvent;
use GemeenteAmsterdam\FixxxSchuldhulp\Event\DossierChangedEvent;
use GemeenteAmsterdam\FixxxSchuldhulp\Exception\AllegroServiceException;
@@ -108,6 +108,16 @@ class AllegroService
*/
private $onbekendeSchuldeiser;
+ /**
+ * @var ?string
+ */
+ private $proxyHostIp;
+
+ /**
+ * @var ?string
+ */
+ private $proxyHostPort;
+
public function __construct(
string $allegroEndpoint,
@@ -116,7 +126,9 @@ public function __construct(
LoggerInterface $logger,
EventDispatcherInterface $eventDispatcher,
Security $security,
- $allegroOnbekendeSchuldeiser
+ $allegroOnbekendeSchuldeiser,
+ ?string $proxyHostIp = null,
+ ?string $proxyHostPort = null,
) {
$this->loginWsdl = sprintf('%s?service=LoginService', $allegroEndpoint);
$this->schuldHulpWsdl = sprintf('%s?service=SchuldHulpService', $allegroEndpoint);
@@ -125,7 +137,9 @@ public function __construct(
$this->eventDispatcher = $eventDispatcher;
$this->security = $security;
$this->em = $em;
- $this->onbekendeSchuldeiser = (string)$allegroOnbekendeSchuldeiser;
+ $this->onbekendeSchuldeiser = (string) $allegroOnbekendeSchuldeiser;
+ $this->proxyHostIp = $proxyHostIp;
+ $this->proxyHostPort = $proxyHostPort;
}
/**
@@ -139,11 +153,18 @@ public function login(Organisatie $organisatie, $force = false)
$oldestAllowedSession = clone $now;
$oldestAllowedSession->modify(sprintf('-%s seconds', self::SESSION_TIMEOUT));
- if (false === $force && null !== $organisatie->getAllegroSessionId() && $organisatie->getAllegroSessionAge() >= $oldestAllowedSession) {
+ if (
+ false === $force && null !== $organisatie->getAllegroSessionId() && $organisatie->getAllegroSessionAge(
+ ) >= $oldestAllowedSession
+ ) {
return $organisatie;
}
- $response = $this->getLoginService()->allegroWebLogin((new LoginServiceAllegroWebLogin($organisatie->getAllegroUsername(),
- $organisatie->getAllegroPassword())));
+ $response = $this->getLoginService(null, $this->proxyHostIp, $this->proxyHostPort)->allegroWebLogin(
+ (new LoginServiceAllegroWebLogin(
+ $organisatie->getAllegroUsername(),
+ $organisatie->getAllegroPassword()
+ ))
+ );
if ($response->getResult()) {
$organisatie->setAllegroSessionAge($now);
$organisatie->setAllegroSessionId($response->getAUserInfo()->SessionID);
@@ -166,7 +187,10 @@ public function login(Organisatie $organisatie, $force = false)
public function getSRVAanvraagHeader(Organisatie $organisatie, string $relatieCode): ?TSRVAanvraagHeader
{
$organisatie = $this->login($organisatie);
- $response = $this->getSchuldHulpService($organisatie)->getSRVOverzicht((new SchuldHulpServiceGetSRVOverzicht($relatieCode)));
+ $schuldhulpService = $this->getSchuldHulpService($organisatie, $this->proxyHostIp, $this->proxyHostPort);
+ $response = $schuldhulpService->getSRVOverzicht(
+ (new SchuldHulpServiceGetSRVOverzicht($relatieCode))
+ );
return $response->getResult()->getTSRVAanvraagHeader()[0];
}
@@ -180,7 +204,10 @@ public function getSRVAanvraagHeader(Organisatie $organisatie, string $relatieCo
public function getSRVAanvraag(Organisatie $organisatie, TSRVAanvraagHeader $header): ?TSRVAanvraag
{
$organisatie = $this->login($organisatie);
- $response = $this->getSchuldHulpService($organisatie)->getSRVAanvraag((new SchuldHulpServiceGetSRVAanvraag($header)));
+ $schuldhulpService = $this->getSchuldHulpService($organisatie, $this->proxyHostIp, $this->proxyHostPort);
+ $response = $schuldhulpService->getSRVAanvraag(
+ (new SchuldHulpServiceGetSRVAanvraag($header))
+ );
return $response->getResult();
}
@@ -200,8 +227,9 @@ public function sendAanvraag(Dossier $dossier): bool
$aanvraagSchuldbedrag = $dossier->getSumSchuldItemsNotInPrullenbak();
$huisnummer = explode(' ', $dossier->getClientHuisnummer());
-//
- $omzetting = isset(self::MAPPING_BURGERLIJKE_STAAT[$dossier->getClientBurgelijkeStaat()]) ? self::MAPPING_BURGERLIJKE_STAAT[$dossier->getClientBurgelijkeStaat()] : [
+ $omzetting = isset(
+ self::MAPPING_BURGERLIJKE_STAAT[$dossier->getClientBurgelijkeStaat()]
+ ) ? self::MAPPING_BURGERLIJKE_STAAT[$dossier->getClientBurgelijkeStaat()] : [
'A',
'O',
];
@@ -232,32 +260,46 @@ public function sendAanvraag(Dossier $dossier): bool
$this->validateDossier($dossier);
- $relatiecode = (null === $dossier->getAllegroNummer() || '' === $dossier->getAllegroNummer()) ? 0 : (int)$dossier->getAllegroNummer();
+ $relatiecode = (null === $dossier->getAllegroNummer() || '' === $dossier->getAllegroNummer(
+ )) ? 0 : (int) $dossier->getAllegroNummer();
- $aanvrager = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TAanvraag2Persoon($relatiecode,
- $dossier->getClientBSN(), $dossier->getClientVoorletters(), $dossier->getClientNaam(),
+ $aanvrager = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TAanvraag2Persoon(
+ $relatiecode,
+ $dossier->getClientBSN(),
+ $dossier->getClientVoorletters(),
+ $dossier->getClientNaam(),
self::MAPPING_GESLACHT[$dossier->getClientGeslacht()],
- $dossier->getClientGeboortedatum()->format('Ymd'), eNationaliteit::Leeg, $aanvragerCorrespondentieMail,
- $aanvragerCorrespondentieWeb);
+ $dossier->getClientGeboortedatum()->format('Ymd'),
+ eNationaliteit::Leeg,
+ $aanvragerCorrespondentieMail,
+ $aanvragerCorrespondentieWeb
+ );
$aanvrager->setBezoekadres($aanvragerAdres);
if (null !== $dossier->getClientEmail() or null !== $dossier->getClientTelefoonnummer()) {
- $contact = new TContact($dossier->getClientTelefoonnummer(), null, $dossier->getClientEmail());
- $aanvrager->setContact($contact);
+ $contact = new TContact($dossier->getClientTelefoonnummer(), null, $dossier->getClientEmail());
+ $aanvrager->setContact($contact);
}
// Partner
$partner = null;
if (!$dossier->getPartnerNvt()) {
- $partner = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TAanvraag2Persoon(0,
- $dossier->getPartnerBSN(), $dossier->getPartnerVoorletters(), $dossier->getPartnerNaam(),
+ $partner = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TAanvraag2Persoon(
+ 0,
+ $dossier->getPartnerBSN(),
+ $dossier->getPartnerVoorletters(),
+ $dossier->getPartnerNaam(),
self::MAPPING_GESLACHT[$dossier->getPartnerGeslacht()],
- $dossier->getPartnerGeboortedatum()->format('Ymd'), eNationaliteit::Leeg, false,
- false);
+ $dossier->getPartnerGeboortedatum()->format('Ymd'),
+ eNationaliteit::Leeg,
+ false,
+ false
+ );
}
- $gemeenschapVanGoederen = 'Gehuwd in gemeenschap van goederen' === $dossier->getClientBurgelijkeStaat() ? 'Ja' : 'Nee';
+ $gemeenschapVanGoederen = 'Gehuwd in gemeenschap van goederen' === $dossier->getClientBurgelijkeStaat(
+ ) ? 'Ja' : 'Nee';
$kinderenInGezin = 1 >= $kinderen ? 'Ja' : 'Nee';
$gezin = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TGezinsSituatie(
@@ -270,11 +312,24 @@ public function sendAanvraag(Dossier $dossier): bool
$inkomen = $this->mapInkomen($dossier);
$aanvrager->setInkomen($inkomen);
- $aanvraag = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TAanvraag2SR($bedrijfsCode,
- $aanvrager, false, $gezin, $kinderen, $aanvraagSchuldbedrag,
- count($dossier->getSchuldItemsNotInPrullenbak()), 0, 0, 0,
- false, false, $dossier->getVoorlegger()->getJongerenSchuldenvrijeStart(), true, true,
- true);
+ $aanvraag = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TAanvraag2SR(
+ $bedrijfsCode,
+ $aanvrager,
+ false,
+ $gezin,
+ $kinderen,
+ $aanvraagSchuldbedrag,
+ count($dossier->getSchuldItemsNotInPrullenbak()),
+ 0,
+ 0,
+ 0,
+ false,
+ false,
+ $dossier->getVoorlegger()->getJongerenSchuldenvrijeStart(),
+ true,
+ true,
+ true
+ );
$schulden = $this->mapSchulden($dossier);
$aanvraag->setSchulden($schulden);
@@ -286,7 +341,10 @@ public function sendAanvraag(Dossier $dossier): bool
$a = $this->altService->Aanvraag2SR(new SchuldHulpService___Aanvraag2SR($aanvraag));
if (!$a->getResult()) {
- $this->logger->error(sprintf('%s - %s', $a->getExtraInfo(), $a->getExtraInfoOmschrijving()),[AllegroService::LOGGING_CONTEXT]);
+ $this->logger->error(
+ sprintf('%s - %s', $a->getExtraInfo(), $a->getExtraInfoOmschrijving()),
+ [AllegroService::LOGGING_CONTEXT]
+ );
}
$user = $this->security->getUser();
@@ -294,7 +352,10 @@ public function sendAanvraag(Dossier $dossier): bool
* @var Gebruiker $user
*/
- $this->eventDispatcher->dispatch(new DossierChangedEvent($dossier, $user, ActionEvent::DOSSIER_SEND_TO_ALLEGRO), DossierChangedEvent::NAME);
+ $this->eventDispatcher->dispatch(
+ new DossierChangedEvent($dossier, $user, ActionEvent::DOSSIER_SEND_TO_ALLEGRO),
+ DossierChangedEvent::NAME
+ );
return $a->getResult();
}
@@ -304,85 +365,202 @@ private function mapInkomen(Dossier $dossier): \GemeenteAmsterdam\FixxxSchuldhul
$array = [];
if ($dossier->getVoorlegger()->isBeschikkingUwvZw()) {
- $inkomen = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TInkomen(eSoortInkomen::Uitkering,
- 0, 0, 0, 1, 0, 0, 0, 0, 0, 0);
+ $inkomen = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TInkomen(
+ eSoortInkomen::Uitkering,
+ 0,
+ 0,
+ 0,
+ 1,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0
+ );
$inkomen->setUitkeringsInstantie('UWV');
$inkomen->setSoortUitkering('ZW');
$array[] = $inkomen;
}
if ($dossier->getVoorlegger()->isBeschikkingUwvWw()) {
- $inkomen = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TInkomen(eSoortInkomen::Uitkering,
- 0, 0, 0, 1, 0, 0, 0, 0, 0, 0);
+ $inkomen = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TInkomen(
+ eSoortInkomen::Uitkering,
+ 0,
+ 0,
+ 0,
+ 1,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0
+ );
$inkomen->setUitkeringsInstantie('UWV');
$inkomen->setSoortUitkering('WW');
$array[] = $inkomen;
}
if ($dossier->getVoorlegger()->isBeschikkingUwvWia()) {
- $inkomen = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TInkomen(eSoortInkomen::Uitkering,
- 0, 0, 0, 1, 0, 0, 0, 0, 0, 0);
+ $inkomen = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TInkomen(
+ eSoortInkomen::Uitkering,
+ 0,
+ 0,
+ 0,
+ 1,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0
+ );
$inkomen->setUitkeringsInstantie('UWV');
$inkomen->setSoortUitkering('WIA');
$array[] = $inkomen;
}
if ($dossier->getVoorlegger()->isBeschikkingUwvWajong()) {
- $inkomen = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TInkomen(eSoortInkomen::Uitkering,
- 0, 0, 0, 1, 0, 0, 0, 0, 0, 0);
+ $inkomen = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TInkomen(
+ eSoortInkomen::Uitkering,
+ 0,
+ 0,
+ 0,
+ 1,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0
+ );
$inkomen->setUitkeringsInstantie('UWV');
$inkomen->setSoortUitkering('Wajong');
$array[] = $inkomen;
}
if ($dossier->getVoorlegger()->isBeschikkingGemeenteAmsterdamWPI()) {
- $inkomen = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TInkomen(eSoortInkomen::Uitkering,
- 0, 0, 0, 1, 0, 0, 0, 0, 0, 0);
+ $inkomen = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TInkomen(
+ eSoortInkomen::Uitkering,
+ 0,
+ 0,
+ 0,
+ 1,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0
+ );
$inkomen->setUitkeringsInstantie('Gemeente Amsterdam');
$inkomen->setSoortUitkering('WPI');
$array[] = $inkomen;
}
if ($dossier->getVoorlegger()->isBeschikkingSVBAOW()) {
- $inkomen = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TInkomen(eSoortInkomen::Uitkering,
- 0, 0, 0, 1, 0, 0, 0, 0, 0, 0);
+ $inkomen = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TInkomen(
+ eSoortInkomen::Uitkering,
+ 0,
+ 0,
+ 0,
+ 1,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0
+ );
$inkomen->setUitkeringsInstantie('SVB');
$inkomen->setSoortUitkering('AOW');
$array[] = $inkomen;
}
if ($dossier->getVoorlegger()->isBeschikkingSVBANW()) {
- $inkomen = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TInkomen(eSoortInkomen::Uitkering,
- 0, 0, 0, 1, 0, 0, 0, 0, 0, 0);
+ $inkomen = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TInkomen(
+ eSoortInkomen::Uitkering,
+ 0,
+ 0,
+ 0,
+ 1,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0
+ );
$inkomen->setUitkeringsInstantie('SVB');
$inkomen->setSoortUitkering('ANW');
$array[] = $inkomen;
}
if ($dossier->getVoorlegger()->isBeschikkingGemeenteAmsterdamIOAW()) {
- $inkomen = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TInkomen(eSoortInkomen::Uitkering,
- 0, 0, 0, 1, 0, 0, 0, 0, 0, 0);
+ $inkomen = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TInkomen(
+ eSoortInkomen::Uitkering,
+ 0,
+ 0,
+ 0,
+ 1,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0
+ );
$inkomen->setUitkeringsInstantie('Gemeente Amsterdam');
$inkomen->setSoortUitkering('IOAW');
$array[] = $inkomen;
}
- if (null !== $dossier->getVoorlegger()->getBeschikkingUwvOverig() && strlen($dossier->getVoorlegger()->getBeschikkingUwvOverig())) {
- $inkomen = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TInkomen(eSoortInkomen::Uitkering,
- 0, 0, 0, 1, 0, 0, 0, 0, 0, 0);
+ if (
+ null !== $dossier->getVoorlegger()->getBeschikkingUwvOverig() && strlen(
+ $dossier->getVoorlegger()->getBeschikkingUwvOverig()
+ )
+ ) {
+ $inkomen = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TInkomen(
+ eSoortInkomen::Uitkering,
+ 0,
+ 0,
+ 0,
+ 1,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0
+ );
$inkomen->setUitkeringsInstantie('Overig');
$inkomen->setSoortUitkering($dossier->getVoorlegger()->getBeschikkingUwvOverig());
$array[] = $inkomen;
}
if ($dossier->getVoorlegger()->isBeschikkingInkomenUitWerk()) {
- $dienstVerbandTot = null !== $dossier->getVoorlegger()->getArbeidsovereenkomstEinddatum() ? $dossier->getVoorlegger()->getArbeidsovereenkomstEinddatum()->format('Ymd') : 0;
- $inkomen = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TInkomen(eSoortInkomen::Werk,
- 0, $dienstVerbandTot, 0, 0, 0, 0, 0, 0, 0, 0);
+ $dienstVerbandTot = null !== $dossier->getVoorlegger()->getArbeidsovereenkomstEinddatum(
+ ) ? $dossier->getVoorlegger()->getArbeidsovereenkomstEinddatum()->format('Ymd') : 0;
+ $inkomen = new \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulpAlt\TInkomen(
+ eSoortInkomen::Werk,
+ 0,
+ $dienstVerbandTot,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0
+ );
$inkomen->setWerkgever($dossier->getVoorlegger()->getArbeidsovereenkomstWerkgever());
- $vastDienstverband = 'Vast contract' === $dossier->getVoorlegger()->getArbeidsovereenkomstContract() ? eJaNeeLeeg::Ja : eJaNeeLeeg::Nee;
- $vastDienstverband = null === $dossier->getVoorlegger()->getArbeidsovereenkomstContract() ? eJaNeeLeeg::Leeg : $vastDienstverband;
+ $vastDienstverband = 'Vast contract' === $dossier->getVoorlegger()->getArbeidsovereenkomstContract(
+ ) ? eJaNeeLeeg::Ja : eJaNeeLeeg::Nee;
+ $vastDienstverband = null === $dossier->getVoorlegger()->getArbeidsovereenkomstContract(
+ ) ? eJaNeeLeeg::Leeg : $vastDienstverband;
$inkomen->setVastDienstverband($vastDienstverband);
$array[] = $inkomen;
@@ -403,7 +581,8 @@ private function mapSchulden(Dossier $dossier): SchuldArray
continue;
}
- $codeEiser = null === $item->getSchuldeiser()->getAllegroCode() ? $this->onbekendeSchuldeiser : $item->getSchuldeiser()->getAllegroCode();
+ $codeEiser = null === $item->getSchuldeiser()->getAllegroCode(
+ ) ? $this->onbekendeSchuldeiser : $item->getSchuldeiser()->getAllegroCode();
$omschrijving = $item->getBedrag();
if ($item->getSchuldeiser()->getAllegroCode() === $this->onbekendeSchuldeiser) {
@@ -428,9 +607,17 @@ private function mapSchulden(Dossier $dossier): SchuldArray
return $schuldArray;
}
- private function getSchuldHulpService(Organisatie $organisatie): AllegroSchuldHulpClient
- {
- return SchuldHulpClientFactory::factory($this->schuldHulpWsdl, $organisatie);
+ private function getSchuldHulpService(
+ Organisatie $organisatie,
+ ?string $proxyHostIp = null,
+ ?string $proxyHostPort = null
+ ): AllegroSchuldHulpClient {
+ return SchuldHulpClientFactory::factory(
+ $this->schuldHulpWsdl,
+ $organisatie,
+ $proxyHostIp,
+ $proxyHostPort
+ );
}
/**
@@ -446,9 +633,17 @@ public function updateDossier(Dossier $dossier)
$this->em->flush();
}
- private function getLoginService(Organisatie $organisatie = null): AllegroLoginClient
- {
- return LoginClientFactory::factory($this->loginWsdl, $organisatie);
+ private function getLoginService(
+ ?Organisatie $organisatie = null,
+ ?string $proxyHostIp = null,
+ ?string $proxyHostPort = null
+ ): AllegroLoginClient {
+ return LoginClientFactory::factory(
+ $this->loginWsdl,
+ $organisatie,
+ $proxyHostIp,
+ $proxyHostPort
+ );
}
/**
@@ -457,18 +652,21 @@ private function getLoginService(Organisatie $organisatie = null): AllegroLoginC
*/
public function getSRVEisers(Dossier $dossier, TSRVAanvraagHeader $header): ?TSRVEisers
{
- return $this->getSchuldHulpService($dossier->getOrganisatie())->getSRVEisers((new SchuldHulpServiceGetSRVEisers((new TSRVAanvraagHeader($header->getRelatieCode(),
- $header->getVolgnummer(), $header->getIsNPS(), $header->getStatus(), $header->getStatustekst(),
- $header->getAanvraagdatum(), $header->getExtraStatus())))))->getResult();
- }
-
- /**
- * @param Dossier $dossier
- * @return \GemeenteAmsterdam\FixxxSchuldhulp\Allegro\SchuldHulp\Type\SchuldHulpServiceGetSBOverzichtResponse|\Phpro\SoapClient\Type\ResultInterface
- */
- public function getSBOverzicht(Dossier $dossier)
- {
- return $this->getSchuldHulpService($dossier->getOrganisatie())->getSBOverzicht((new SchuldHulpServiceGetSBOverzicht($dossier->getAllegroNummer())));
+ $schuldhulpService = $this->getSchuldHulpService($dossier->getOrganisatie(), $this->proxyHostIp, $this->proxyHostPort);
+
+ return $schuldhulpService->getSRVEisers(
+ (new SchuldHulpServiceGetSRVEisers(
+ (new TSRVAanvraagHeader(
+ $header->getRelatieCode(),
+ $header->getVolgnummer(),
+ $header->getIsNPS(),
+ $header->getStatus(),
+ $header->getStatustekst(),
+ $header->getAanvraagdatum(),
+ $header->getExtraStatus()
+ ))
+ ))
+ )->getResult();
}
/**
@@ -479,11 +677,15 @@ private function setSoapHeader(Organisatie $organisatie): void
{
$loginSucces = $this->login($organisatie);
- if(!$loginSucces) {
+ if (!$loginSucces) {
throw new \Exception('Login of organisatie failed');
}
- $header = new \SoapHeader('http://tempuri.org/', 'ROClientIDHeader', ['ID' => $organisatie->getAllegroSessionId()]);
+ $header = new \SoapHeader(
+ 'http://tempuri.org/',
+ 'ROClientIDHeader',
+ ['ID' => $organisatie->getAllegroSessionId()]
+ );
$this->altService->__setSoapHeaders($header);
}
@@ -544,10 +746,12 @@ public function validateDossier(Dossier $dossier): bool
* @param string $searchString
* @throws \Exception
*/
- public function syncSchuldeisers(Organisatie $organisatie, $searchString = ''): array {
+ public function syncSchuldeisers(Organisatie $organisatie, $searchString = ''): array
+ {
$organisatie = $this->login($organisatie);
$parameters = new SchuldHulpServiceGetLijstSchuldeisers($searchString);
- $response = $this->getSchuldHulpService($organisatie)->getLijstSchuldeisers($parameters);
+ $schuldhulpService = $this->getSchuldHulpService($organisatie, $this->proxyHostIp, $this->proxyHostPort);
+ $response = $schuldhulpService->getLijstSchuldeisers($parameters);
$statistics = ['created' => 0, 'updated' => 0];
if (null === $response->getResult()->getTOrganisatie()) {
@@ -560,17 +764,17 @@ public function syncSchuldeisers(Organisatie $organisatie, $searchString = ''):
/**
* @var TOrganisatie $organisatie
*/
- $eiser = $repo->findOneBy(['allegroCode'=>$organisatie->getRelatieCode()]);
+ $eiser = $repo->findOneBy(['allegroCode' => $organisatie->getRelatieCode()]);
if (null === $eiser) {
- $statistics['created'] ++;
+ $statistics['created']++;
$eiser = new Schuldeiser();
$eiser->setAllegroCode($organisatie->getRelatieCode());
$eiser->setEnabled(true);
$eiser->setRekening('');
$this->em->persist($eiser);
} else {
- $statistics['updated'] ++;
+ $statistics['updated']++;
}
$adres = $organisatie->getPostAdres();
@@ -579,7 +783,7 @@ public function syncSchuldeisers(Organisatie $organisatie, $searchString = ''):
$eiser->setPlaats($adres->getWoonplaats());
$eiser->setHuisnummer($adres->getHuisnr());
$eiser->setHuisnummerToevoeging($adres->getHuisnrToev());
- $eiser->setPostcode(substr(strtoupper(str_replace(' ', '', $adres->getPostcode())),0,6));
+ $eiser->setPostcode(substr(strtoupper(str_replace(' ', '', $adres->getPostcode())), 0, 6));
$eiser->setStraat($adres->getStraat());
}
@@ -587,4 +791,4 @@ public function syncSchuldeisers(Organisatie $organisatie, $searchString = ''):
return $statistics;
}
-}
\ No newline at end of file
+}
diff --git a/src/Service/ApplicationVersion.php b/src/Service/ApplicationVersion.php
index 3094fee4..0c3c2afe 100644
--- a/src/Service/ApplicationVersion.php
+++ b/src/Service/ApplicationVersion.php
@@ -60,8 +60,8 @@ public function getVersionDate()
$versionFile = self::getVersionFile();
if (file_exists($versionFile)) {
$versionFile = self::getVersionFile();
- return date ("y-m-d", filemtime($versionFile));
+ return date("y-m-d", filemtime($versionFile));
}
return '';
}
-}
\ No newline at end of file
+}
diff --git a/src/Service/FileStorageSelector.php b/src/Service/FileStorageSelector.php
index f6e0c19c..fd58b36c 100644
--- a/src/Service/FileStorageSelector.php
+++ b/src/Service/FileStorageSelector.php
@@ -1,4 +1,5 @@
getFileStorageForDossier();
}
@@ -41,4 +41,4 @@ public function getFileStorageForDossier()
{
return $this->fileStorageDossier;
}
-}
\ No newline at end of file
+}
diff --git a/src/Traits/ExportAble.php b/src/Traits/ExportAble.php
index 69b2648b..f06bea0a 100644
--- a/src/Traits/ExportAble.php
+++ b/src/Traits/ExportAble.php
@@ -30,12 +30,12 @@ public function toSpreadsheetCsv(): Spreadsheet
$sheet = $spreadsheet->getActiveSheet();
$columnIndex = 1;
- foreach($csvHeader as $headerItem){
+ foreach ($csvHeader as $headerItem) {
$sheet->setCellValueByColumnAndRow($columnIndex++, 1, $headerItem);
}
$maxColumnIndex = $columnIndex;
- foreach($csvValues as $csvValue){
- if($columnIndex === $maxColumnIndex){
+ foreach ($csvValues as $csvValue) {
+ if ($columnIndex === $maxColumnIndex) {
$columnIndex = 1;
}
$sheet->setCellValueByColumnAndRow($columnIndex++, 2, $csvValue);
@@ -57,13 +57,13 @@ public function batchToSpreadsheetCsv(array $header, array $rows): Spreadsheet
$sheet = $spreadsheet->getActiveSheet();
$columnIndex = 1;
- foreach($header as $headerItem){
+ foreach ($header as $headerItem) {
$sheet->setCellValueByColumnAndRow($columnIndex++, 1, $headerItem);
}
$maxColumnIndex = $columnIndex;
$rowIndex = 1;
- foreach($rows as $csvValue){
- if($columnIndex === $maxColumnIndex){
+ foreach ($rows as $csvValue) {
+ if ($columnIndex === $maxColumnIndex) {
$columnIndex = 1;
$rowIndex++;
}
@@ -118,7 +118,7 @@ public function getClassAttributesAndValues(): array
$attributeValue = $attributeValue->format('d-m-Y h:i:s');
}
- if(is_bool($attributeValue)){
+ if (is_bool($attributeValue)) {
$attributeValue = $attributeValue ? 'ja' : 'nee';
}
diff --git a/src/Traits/FilterAble.php b/src/Traits/FilterAble.php
index 25513c78..d48fe069 100644
--- a/src/Traits/FilterAble.php
+++ b/src/Traits/FilterAble.php
@@ -14,7 +14,6 @@
*/
trait FilterAble
{
-
private array $allowedFilterFields = [
't.naam',
'g.email',
diff --git a/src/Twig/AllegroTypeExtension.php b/src/Twig/AllegroTypeExtension.php
index f348625a..153be532 100644
--- a/src/Twig/AllegroTypeExtension.php
+++ b/src/Twig/AllegroTypeExtension.php
@@ -18,10 +18,9 @@ class AllegroTypeExtension extends \Twig_Extension
public function getFilters(): array
{
return [
- new \Twig_Filter('allegro_status', function (String $status) {
+ new \Twig_Filter('allegro_status', function (string $status) {
return Dossier::twigAllegroStatus($status);
})
];
}
-
}
diff --git a/src/Twig/ExportDossierVoorlegger.php b/src/Twig/ExportDossierVoorlegger.php
index 285f3ad2..2ba98e95 100644
--- a/src/Twig/ExportDossierVoorlegger.php
+++ b/src/Twig/ExportDossierVoorlegger.php
@@ -29,5 +29,4 @@ public function getFilters(): array
})
];
}
-
}
diff --git a/src/Twig/GebruikerTypeToTitleExtension.php b/src/Twig/GebruikerTypeToTitleExtension.php
index 28471716..ad0c176e 100644
--- a/src/Twig/GebruikerTypeToTitleExtension.php
+++ b/src/Twig/GebruikerTypeToTitleExtension.php
@@ -19,10 +19,9 @@ class GebruikerTypeToTitleExtension extends \Twig_Extension
public function getFilters(): array
{
return [
- new \Twig_Filter('transform_type_in_title', function (String $type) {
+ new \Twig_Filter('transform_type_in_title', function (string $type) {
return Gebruiker::getTitleFromType($type);
})
];
}
-
}
diff --git a/src/Twig/StrPadExtension.php b/src/Twig/StrPadExtension.php
index f012f2f5..f9962e58 100644
--- a/src/Twig/StrPadExtension.php
+++ b/src/Twig/StrPadExtension.php
@@ -23,5 +23,4 @@ public function getFilters(): array
})
];
}
-
}
diff --git a/src/Validator/Constraints/BSN.php b/src/Validator/Constraints/BSN.php
index a535c3a6..7d6ed5d1 100644
--- a/src/Validator/Constraints/BSN.php
+++ b/src/Validator/Constraints/BSN.php
@@ -10,4 +10,4 @@
class BSN extends Constraint
{
public $message = 'Ongeldige BSN "{{ string }}"';
-}
\ No newline at end of file
+}
diff --git a/src/Validator/Constraints/BSNValidator.php b/src/Validator/Constraints/BSNValidator.php
index bcbb090a..498b4dea 100644
--- a/src/Validator/Constraints/BSNValidator.php
+++ b/src/Validator/Constraints/BSNValidator.php
@@ -29,20 +29,20 @@ public function validate($value, Constraint $constraint)
$digits = str_split($value);
$sum = 0;
- for ($i=count($digits);$i>0;$i--) {
+ for ($i = count($digits); $i > 0; $i--) {
$digit = current($digits);
- if ($i>1) {
- $sum += $i*$digit;
+ if ($i > 1) {
+ $sum += $i * $digit;
} else {
- $sum += -1*$digit;
+ $sum += -1 * $digit;
}
next($digits);
}
- if ($sum/11 !== (int)floor($sum/11)) {
+ if ($sum / 11 !== (int)floor($sum / 11)) {
$this->context->buildViolation($constraint->message)
->setParameter('{{ string }}', $value)
->addViolation();
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Validator/Constraints/RequiredFieldsWhenAddingNewShvUserValidator.php b/src/Validator/Constraints/RequiredFieldsWhenAddingNewShvUserValidator.php
index ad06a5c8..d322963f 100644
--- a/src/Validator/Constraints/RequiredFieldsWhenAddingNewShvUserValidator.php
+++ b/src/Validator/Constraints/RequiredFieldsWhenAddingNewShvUserValidator.php
@@ -14,7 +14,6 @@
*/
class RequiredFieldsWhenAddingNewShvUserValidator extends ConstraintValidator
{
-
/**
* Checks if the passed value is valid.
*
diff --git a/symfony.lock b/symfony.lock
index 2b298148..78c0aa03 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -110,6 +110,18 @@
"config/packages/sensio_framework_extra.yaml"
]
},
+ "squizlabs/php_codesniffer": {
+ "version": "4.0",
+ "recipe": {
+ "repo": "github.com/symfony/recipes-contrib",
+ "branch": "main",
+ "version": "3.6",
+ "ref": "1019e5c08d4821cb9b77f4891f8e9c31ff20ac6f"
+ },
+ "files": [
+ "phpcs.xml.dist"
+ ]
+ },
"symfony/console": {
"version": "5.4",
"recipe": {
diff --git a/templates/Dossier/detailLogboek.html.twig b/templates/Dossier/detailLogboek.html.twig
index 694331d1..4da2649d 100644
--- a/templates/Dossier/detailLogboek.html.twig
+++ b/templates/Dossier/detailLogboek.html.twig
@@ -57,6 +57,36 @@
{% if log.name == 'dossier_gewijzigd' %}
Dossier gewijzigd
{% endif %}
+ {% if log.name == 'dossier_voorlegger_gewijzigd' %}
+ Dossier voorlegger gewijzigd door {{ log.data.gebruiker.naam }}
+
+ {{ schulditemUpdate.schuldeiserNaam }} (€ {{ schulditemUpdate.bedrag|number_format(2, ',', '.') }} )
+
+ {% include 'Dossier/partial.logboekUpdates.html.twig' with { changeSet: schulditemUpdate.schuldenChangeSet } %}
+
+ {{ schulditemUpdate.schuldeiserNaam }} (€ {{ schulditemUpdate.bedrag|number_format(2, ',', '.') }} )
+
+ {% include 'Dossier/partial.logboekUpdates.html.twig' with { changeSet: schulditemUpdate.schuldenChangeSet, isNew: true } %}
+
-
Nieuwe van Schulddossier is live ({{ releaseDate|date("d-m-Y") }})
-
Bekijk PDF- en Microsoft Word-documenten op volledig scherm.
- Bekijk versies voor een toelichting.
-
-
- {{ form_start(searchForm, {'attr': {}}) }}
-
-
-
-
-
-
-
-
-
-
- {{ form_row(searchForm.status) }}
-
-
-
- {% if is_granted('ROLE_SHV') is same as(FALSE) and is_granted('ROLE_SHV_KEYUSER') is same as(FALSE) %}
- {{ form_row(searchForm.organisaties) }}
- {% endif %}
- {{ form_row(searchForm.medewerkerOrganisatie) }}
-
-
- {{ form_row(searchForm.teamGka) }}
-
-
- Zoeken
- Annuleren
-
-
-
-
-
- {{ form_end(searchForm) }}
-
-
-
-
- Naam
- Organisatie
- SHV/BW dossiernr.
- GKA dossiernr.
- Aangemaakt
- Indiendatum
- Status
-
-
-
- {% set empty = true %}
- {% for dossier in dossiers %}
- {% set empty = false %}
-
-
- {% if dossier.clientVoorletters %}{{ dossier.clientVoorletters|trim }} {% endif %}{{ dossier.clientNaam }}
-
- {{ dossier.organisatie }}
-
- {{ dossier.regasNummer|default('-') }}
-
-
- {{ dossier.allegroNummer|default('-') }}
-
-
- {{ dossier.aanmaakDatumTijd|date('d-m-Y') }}
-
-
- {{ dossier.indiendatumTijd ? dossier.indiendatumTijd|date('d-m-Y') : "" }}
-
- {{ dossier.status|trans }}
-
- {% endfor %}
-
-
-
- {% if empty %}
-
Er zijn geen dossiers om weer te geven.
- {% endif %}
-
-
- {% if pagination.numberOfPages > 1 %}
- {% include 'pagination.html.twig' with {'pagination': pagination} only %}
- {% endif %}
-
-
-
+
Vanaf nu zijn PDF-documenten op volledig scherm te bekijken in een nieuw tabblad
+
Bekijk versies voor een toelichting op de laatste update.
+
+ {{ form_start(searchForm, {'attr': {}}) }}
+
+
+
+
+
+
+
+
+
+
+ {{ form_row(searchForm.status) }}
+
+
+
+ {% if is_granted('ROLE_SHV') is same as(FALSE) and is_granted('ROLE_SHV_KEYUSER') is same as(FALSE) %}
+ {{ form_row(searchForm.organisaties) }}
+ {% endif %}
+ {{ form_row(searchForm.medewerkerOrganisatie) }}
+
+
+ {{ form_row(searchForm.teamGka) }}
+
+
+ Zoeken
+ Annuleren
+
+
+
+
+
+ {{ form_end(searchForm) }}
+
+
+
+
+ Naam
+ Organisatie
+ SHV/BW dossiernr.
+ GKA dossiernr.
+ Aangemaakt
+ Indiendatum
+ Status
+
+
+
+ {% set empty = true %}
+ {% for dossier in dossiers %}
+ {% set empty = false %}
+
+
+ {% if dossier.clientVoorletters %}{{ dossier.clientVoorletters|trim }} {% endif %}{{ dossier.clientNaam }}
+
+ {{ dossier.organisatie }}
+
+ {{ dossier.regasNummer|default('-') }}
+
+
+ {{ dossier.allegroNummer|default('-') }}
+
+
+ {{ dossier.aanmaakDatumTijd|date('d-m-Y') }}
+
+
+ {{ dossier.indiendatumTijd ? dossier.indiendatumTijd|date('d-m-Y') : "" }}
+
+ {{ dossier.status|trans }}
+
+ {% endfor %}
+
+
+
+ {% if empty %}
+
Er zijn geen dossiers om weer te geven.
+ {% endif %}
+
+
+ {% if pagination.numberOfPages > 1 %}
+ {% include 'pagination.html.twig' with {'pagination': pagination} only %}
+ {% endif %}
+
+
+
Uitgebreide status
- {% if is_granted('ROLE_ADMIN') or is_granted('ROLE_GKA') or is_granted('ROLE_GKA_APPBEHEERDER') %}
+ {% if is_granted('ROLE_ADMIN') %}
Exporteren
{% endif %}
diff --git a/templates/Dossier/partial.logboekUpdates.html.twig b/templates/Dossier/partial.logboekUpdates.html.twig
new file mode 100644
index 00000000..e22b4811
--- /dev/null
+++ b/templates/Dossier/partial.logboekUpdates.html.twig
@@ -0,0 +1,52 @@
+{% if changeSet is not empty %}
+
+
+
+
+ Veld
+ {% if isNew|default(false) == false %}
+ Oude waarde
+ {% endif %}
+ Nieuwe waarde
+
+
+
+ {% for field, values in changeSet %}
+
+ {{ field }}
+ {% if isNew|default(false) == false %}
+
+ {% if values[0] is same as(false) %}
+ Nee
+ {% elseif values[0] is same as(true) %}
+ Ja
+ {% elseif values[0] is null %}
+ Geen waarde
+ {% elseif values[0] is iterable %}
+ {{ values[0]['naam'] }}
+ {% else %}
+ {{ values[0] }}
+ {% endif %}
+
+ {% endif %}
+
+ {% if values[1] is same as(false) %}
+ Nee
+ {% elseif values[1] is same as(true) %}
+ Ja
+ {% elseif values[1] is null %}
+ Geen waarde
+ {% elseif values[1] is iterable %}
+ {{ values[1]['naam'] }}
+ {% else %}
+ {{ values[1] }}
+ {% endif %}
+
+
+ {% endfor %}
+
+
+
Er zijn geen velden bijgewerkt
+{% endif %}
\ No newline at end of file
diff --git a/templates/Log/index.html.twig b/templates/Log/index.html.twig
index c4768760..45215f61 100644
--- a/templates/Log/index.html.twig
+++ b/templates/Log/index.html.twig
@@ -90,6 +90,48 @@
{% if log.name == 'dossier_gewijzigd' %}
Dossier gewijzigd
{% endif %}
+ {% if log.name == 'dossier_voorlegger_gewijzigd' %}
+ Voorlegger gewijzigd van dossier
+ {% if log.dossier.clientNaam is defined %}
+ {{ log.dossier.clientNaam }}
+ {% endif %}
+ door {{ log.data.gebruiker.naam }}
+ {{ log.dossier.clientNaam }}
+ {% endif %}
+ door {{ log.data.gebruiker.naam }}
+
+ {{ schulditemUpdate.schuldeiserNaam }} (€ {{ schulditemUpdate.bedrag|number_format(2, ',', '.') }} )
+
+ {% include 'Dossier/partial.logboekUpdates.html.twig' with { changeSet: schulditemUpdate.schuldenChangeSet, isNew: true } %}
+ {{ log.dossier.clientNaam }}
+ {% endif %}
+ door {{ log.data.gebruiker.naam }}
+
+ {{ schulditemUpdate.schuldeiserNaam }} (€ {{ schulditemUpdate.bedrag|number_format(2, ',', '.') }} )
+
+ {% include 'Dossier/partial.logboekUpdates.html.twig' with { changeSet: schulditemUpdate.schuldenChangeSet } %}
+ Nieuw
+
+PDF-documenten zijn op volledig scherm te bekijken in een nieuw tabblad.
+In de lijst met documenten is voor elk document van het type "PDF" een knop toegevoegd. Als je op deze knop drukt wordt het document ge-opend in een nieuw tabblad. Deze knop is te vinden tussen de verwijder- en downloadknop en is herkenbaar aan dit icoon:
+
+
+Opgelost
+
+
+ In het kader van security zijn er kleine updates gedaan op diverse afhankelijkheden.
+
diff --git a/templates/UserReleaseNotes/26-02-03/title.html.twig b/templates/UserReleaseNotes/26-02-03/title.html.twig
new file mode 100644
index 00000000..3f177b79
--- /dev/null
+++ b/templates/UserReleaseNotes/26-02-03/title.html.twig
@@ -0,0 +1 @@
+03-02-2026 (v8.2.0): PDF-documenten zijn op volledig scherm te bekijken in een nieuw tabblad
diff --git a/templates/master.html.twig b/templates/master.html.twig
index 2ef1f31d..2839b8ee 100644
--- a/templates/master.html.twig
+++ b/templates/master.html.twig
@@ -1,116 +1,113 @@
-
-
-
- {% block title %}Schulddossier - Gemeente Amsterdam{% endblock %}
-
-{% block flash %}
-{% for type, messages in app.flashes %}
- {% for message in messages %}
-
- {% endfor %}
-{% endfor %}
-{% endblock %}
-
-{% block document %}.{% endblock %}
-
{% block title %}Schulddossier - Gemeente Amsterdam{% endblock %}
+
+{% block flash %}
+{% for type, messages in app.flashes %}
+ {% for message in messages %}
+
+ {% endfor %}
+{% endfor %}
+{% endblock %}
+
+{% block document %}.{% endblock %}
+