diff --git a/composer.json b/composer.json index 53bd11a..2fe696f 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "minimum-stability": "dev", "require": { "php": ">=7.4", - "commongateway/corebundle": "^1.1.110 | < 2.0", + "commongateway/corebundle": "^1.4.13 | < 2.0", "common-gateway/zgw-bundle": "1.0.50 | ^1.2" }, "require-dev": { diff --git a/publiccode.yaml b/publiccode.yaml index d749daf..969001f 100644 --- a/publiccode.yaml +++ b/publiccode.yaml @@ -72,14 +72,14 @@ localisation: dependsOn: open: - name: CommonGateway - versionMin: 1.2 - versionMax: 1.3 - version: 1.2.47 + versionMin: 1.4 + versionMax: 1.5 + version: 1.4.13 optional: false - name: CoreBundle - versionMin: 1.2 - versionMax: 1.3 - version: 1.2.47 + versionMin: 1.4 + versionMax: 1.5 + version: 1.4.13 optional: false - name: ZGWBundle versionMin: 1.0 diff --git a/src/Service/SimXMLToZGWService.php b/src/Service/SimXMLToZGWService.php index a71558d..93e053c 100644 --- a/src/Service/SimXMLToZGWService.php +++ b/src/Service/SimXMLToZGWService.php @@ -151,7 +151,7 @@ public function connectEigenschappen(array $zaakArray, ObjectEntity $zaakType): $eigenschapEntity = $this->resourceService->getSchema($this::SCHEMA_REFS['ZtcEigenschap'], $this::PLUGIN_NAME); $eigenschapObjects = []; foreach ($zaakArray['eigenschappen'] as $key => $eigenschap) { - $eigenschappen = $this->cacheService->searchObjects(null, ['naam' => $eigenschap['eigenschap']['naam'], 'zaaktype' => $zaakType->getUri()], [$eigenschapEntity->getId()->toString()])['results']; + $eigenschappen = $this->cacheService->searchObjects(['naam' => $eigenschap['eigenschap']['naam'], 'zaaktype' => $zaakType->getUri()], [$eigenschapEntity->getId()->toString()])['results']; if ($eigenschappen !== []) { $this->logger->debug('Property has been found, connecting to property'); @@ -196,7 +196,7 @@ public function connectRolTypes(array $zaakArray, ObjectEntity $zaakType): array $rolTypeObjects = $zaakType->getValue('roltypen'); foreach ($zaakArray['rollen'] as $key => $role) { - $rollen = $this->cacheService->searchObjects(null, ['omschrijvingGeneriek' => $role['roltype']['omschrijvingGeneriek'], 'zaaktype' => $zaakType->getUri()], [$rolTypeEntity->getId()->toString()])['results']; + $rollen = $this->cacheService->searchObjects(['omschrijvingGeneriek' => $role['roltype']['omschrijvingGeneriek'], 'zaaktype' => $zaakType->getUri()], [$rolTypeEntity->getId()->toString()])['results']; if ($rollen !== []) { $this->logger->debug('Role type has been found, connecting to existing role type'); $zaakArray['rollen'][$key]['roltype'] = $rollen[0]['_self']['id']; @@ -240,11 +240,11 @@ public function connectZaakInformatieObjecten(array $zaakArray, ObjectEntity $za $documentEntity = $this->resourceService->getSchema($this::SCHEMA_REFS['DrcEnkelvoudigInformatieObject'], $this::PLUGIN_NAME); $mapping = $this->resourceService->getMapping($this::MAPPING_REFS['ZdsDocumentToZgwDocument'], $this::PLUGIN_NAME); - $zaken = $this->cacheService->searchObjects(null, ['identificatie' => $zaakArray['identificatie']], [$zaakEntity->getId()->toString()])['results']; + $zaken = $this->cacheService->searchObjects(['identificatie' => $zaakArray['identificatie']], [$zaakEntity->getId()->toString()])['results']; $zaakinformatieobjecten = $zaak->getValue('zaakinformatieobjecten'); foreach ($zaakinformatieobjecten as $key => $zaakInformatieObject) { - $documenten = $this->cacheService->searchObjects(null, ['identificatie' => $zaakInformatieObject->getValue('informatieobject')->getValue('identificatie')], [$documentEntity->getId()->toString()])['results']; + $documenten = $this->cacheService->searchObjects(['identificatie' => $zaakInformatieObject->getValue('informatieobject')->getValue('identificatie')], [$documentEntity->getId()->toString()])['results']; if ($documenten !== []) { $this->logger->debug('Populating document with identification'.$zaakInformatieObject->getValue('informatieobject')->getValue('identificatie')); @@ -283,7 +283,7 @@ public function convertZaakType(array $zaakArray): array $this->logger->debug('Trying to connect case to existing case type'); $zaakTypeEntity = $this->resourceService->getSchema($this::SCHEMA_REFS['ZtcZaakType'], $this::PLUGIN_NAME); - $zaaktypes = $this->cacheService->searchObjects(null, ['identificatie' => $zaakArray['zaaktype']['identificatie']], [$zaakTypeEntity->getId()->toString()])['results']; + $zaaktypes = $this->cacheService->searchObjects(['identificatie' => $zaakArray['zaaktype']['identificatie']], [$zaakTypeEntity->getId()->toString()])['results']; if (count($zaaktypes) > 0) { $this->logger->debug('Case type found, connecting case to case type'); @@ -508,7 +508,7 @@ public function zaakActionHandler(array $data, array $configuration): array $zaakArray = $this->convertZaakType($zaakArray); - $zaken = $this->cacheService->searchObjects(null, ['identificatie' => $zaakArray['identificatie']], [$zaakEntity->getId()->toString()])['results']; + $zaken = $this->cacheService->searchObjects(['identificatie' => $zaakArray['identificatie']], [$zaakEntity->getId()->toString()])['results']; if ($zaken === []) { $zaak = new ObjectEntity($zaakEntity);