Core update to searchobjects en countobjects, requires CoreBundle:1.4.13

composer.json

@@ -16,7 +16,7 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=8.0",
-        "commongateway/corebundle": ">=1.3.11",
+        "commongateway/corebundle": "^1.4.13 | <2.0",
         "league/flysystem-ziparchive": "^2.3.1"
     },
     "require-dev": {

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
 roadmap: null
 inputTypes:

src/Service/BrkService.php

@@ -33,7 +33,7 @@
 use Twig\Error\LoaderError;
 use Twig\Error\SyntaxError;
 
 class BrkService
 {
 
     /**
@@ -138,7 +138,7 @@
      *
      * @throws Exception
      */
     public function getFromCache(string $id): ?ObjectEntity
     {
         $item = $this->cache->getItem($id);
         if ($item->isHit() === true) {
@@ -160,13 +160,13 @@
      *
      * @return string The value of the key-value pair.
      */
     public function addToCache(string $id, string $value): string
     {
 
         $item = $this->cache->getItem($id);
 
         $item->set($value);
         $item->expiresAt(new \DateTime('+10 days'));
         $this->cache->save($item);
 
         return $item->get();
@@ -209,7 +209,7 @@
                     && $this->isAssociative($objectArray['embedded'][$attribute->getName()])
                 ) {
                     $subObject = $objects[0];
                     $subObject->setId(Uuid::fromString($objectArray['embedded'][$attribute->getName()]['_self']['id']));
                     $this->entityManager->persist($subObject);
                     $this->entityManager->persist($subObject);
                     continue;
@@ -217,7 +217,7 @@
 
                 if(isset($objectArray['embedded'][$attribute->getName()]) === true) {
                     foreach($objects as $key => $subObject) {
                         $subObject->setId(Uuid::fromString($objectArray['embedded'][$attribute->getName()][$key]['_self']['id']));
                         $this->entityManager->persist($subObject);
                         $this->entityManager->persist($subObject);
                     }
@@ -302,7 +302,7 @@
      *
      * @return array The array of parents with children connected.
      */
     public function connectInversed(array $parents, array $children, string $property, bool $singular=true): array
     {
         foreach ($parents as $key => $parent) {
             if (isset($parent['identificatie']) === true) {
@@ -495,12 +495,11 @@
             if (isset($snapshot['Appartementsrecht']['hoofdsplitsing']['HoofdsplitsingRef']['#']) === true) {
                 $splitsingId = $snapshot['Appartementsrecht']['hoofdsplitsing']['HoofdsplitsingRef']['#'];
 
                 // $snapshot['Appartementsrecht']['hoofdsplitsing']['HoofdsplitsingRef']['#'] = $this->getFromCache($splitsingId);
                 $snapshot['Appartementsrecht']['hoofdsplitsing']['HoofdsplitsingRef']['#'] = null;
 
                 if ($snapshot['Appartementsrecht']['hoofdsplitsing']['HoofdsplitsingRef']['#'] === null) {
                     $percelen = $this->cacheService->searchObjects(
-                        null,
                         ['embedded.zakelijkGerechtigdeIdentificaties.hoofdsplitsing' => $splitsingId],
                         [$ozSchema->getId()->toString()]
                     )['results'];
@@ -514,7 +513,7 @@
                                 $this->entityManager->persist($perceelObject);
                                 $perceelObject->hydrate(\Safe\json_decode(\Safe\json_encode($perceel), true));
 
                                 $perceelObject = $this->reconnectIds($perceelObject, \Safe\json_decode(\Safe\json_encode($perceel), true));
                                 $this->entityManager->persist($perceelObject);
                                 $this->cacheService->cacheObject($perceelObject);
 
@@ -609,7 +608,7 @@
         }
 
         $vveId = $hoofdsplitsing['heeftVerenigingVanEigenaren']['NietNatuurlijkPersoonRef']['#'];
-        $vves  = $this->cacheService->searchObjects(null, ['identificatie' => $vveId], [$nnpSchema->getId()->toString()])['results'];
+        $vves  = $this->cacheService->searchObjects(['identificatie' => $vveId], [$nnpSchema->getId()->toString()])['results'];
 
         if (count($vves) === 0) {
             return;
@@ -618,7 +617,6 @@
         $vve = $vves[0]['_self']['id'];
 
         $results = $this->cacheService->searchObjects(
-            null,
             ['embedded.zakelijkGerechtigdeIdentificaties.hoofdsplitsing' => $splitsingId],
             [$ozSchema->getId()->toString()]
         )['results'];
@@ -859,7 +857,6 @@
 
         foreach ($fileDataSet['stand']['KadastraalObjectSnapshot'] as $object) {
             $snapshots = $this->cacheService->searchObjects(
-                null,
                 ['referentie' => $object['referentie']],
                 [$this->configuration['schema']->getId()->toString()]
             )['results'];
@@ -1035,7 +1032,7 @@
             ];
         }
 
-        $oldArray = $this->cacheService->searchObjects(null, ['identificatie' => $refObject['identificatie']], [$schema->getId()->toString()])['results'];
+        $oldArray = $this->cacheService->searchObjects(['identificatie' => $refObject['identificatie']], [$schema->getId()->toString()])['results'];
 
 //        $synchronization = $this->syncService->findSyncBySource(
 //            $this->configuration['source'],

src/Service/GdsService.php

@@ -4,7 +4,7 @@
  *
  * This service connects to the GDS download service of the kadaster in order to retrieve new data.
  *
  * @package common-gateway/brk-bundle
  *
  * @author  Robert Zondervan <[email protected]>
  * @license EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
@@ -165,7 +165,7 @@
     private function getDataUrls(array $result): array
     {
         $locations = [];
         $baseUrls  = $result['SOAP-ENV:Body']['ns9:BestandenlijstOpvragenResponse']['ns9:antwoord']['ns3:BaseURLSet']['ns4:BaseURL'];
 
         foreach ($baseUrls as $baseUrl) {
             if ($baseUrl['@type'] === 'certificaat') {
@@ -173,11 +173,11 @@
             }
         }
 
         $files = $result['SOAP-ENV:Body']['ns9:BestandenlijstOpvragenResponse']['ns9:antwoord']['ns5:BestandenLijst']['ns5:Afgifte'];
 
         if ($this->brkService->isAssociative($files) === true) {
             $fileUrl     = $files['ns8:digikoppeling-external-datareferences']['ns8:data-reference']['ns8:transport']['ns8:location']['ns8:senderUrl']['#'];
             $mime        = $files['ns8:digikoppeling-external-datareferences']['ns8:data-reference']['ns8:content']['@contentType'];
             $locations[] = [
                 'url'  => "{$baseUrl['#']}/$fileUrl",
                 'mime' => "$mime",
@@ -188,7 +188,7 @@
 
         foreach ($files as $file) {
             $fileUrl     = $file['ns8:digikoppeling-external-datareferences']['ns8:data-reference']['ns8:transport']['ns8:location']['ns8:senderUrl']['#'];
             $mime        = $file['ns8:digikoppeling-external-datareferences']['ns8:data-reference']['ns8:content']['@contentType'];
             $locations[] = [
                 'url'  => "{$baseUrl['#']}/$fileUrl",
                 'mime' => "$mime",
@@ -271,7 +271,7 @@
         $snapshotsToMap   = [];
         $createdSnapshots = [];
 
         $this->removeDeletedObjects(was: $data['wordt']['KadastraalObjectSnapshot'], becomes: $data['was']['KadastraalObjectSnapshot']);
 
         $snapshotsToMap[] = $data['wordt']['KadastraalObjectSnapshot'];
 
@@ -284,7 +284,6 @@
 
         foreach ($snapshotsToMap as $snapshot) {
             $snapshots = $this->cacheService->searchObjects(
-                null,
                 ['referentie' => $snapshot['referentie']],
                 [$snapshotSchema->getId()->toString()]
             )['results'];