(fix): missing form object in MergeTags trait

Author: Mike van den Hoek

src/Contracts/AbstractCreateUploadedDocumentsAction.php

@@ -149,7 +149,7 @@ protected function prepareInformationObjectArgs(string $objectURL, string $infor
         $args['formaat'] = $this->getContentType($objectURL);
         $args['bestandsnaam'] = sprintf('%s.%s', \sanitize_title($fileName), $this->getExtension($objectURL));
         $args['bestandsomvang'] = $bestandsomvang ? (int) $bestandsomvang : strlen($inhoud);
-        $args['beschrijving'] = 0 < strlen($objectDescription) ? $this->handleMergeTags($this->entry, $objectDescription) : $fileName;
+        $args['beschrijving'] = 0 < strlen($objectDescription) ? $this->handleMergeTags($this->entry, $this->form, $objectDescription) : $fileName;
         $args['inhoud'] = $inhoud;
         $args['vertrouwelijkheidaanduiding'] = 'vertrouwelijk';
         $args['auteur'] = 'OWC';

src/Contracts/AbstractCreateZaakAction.php

@@ -10,12 +10,12 @@
 use OWC\Zaaksysteem\Entities\Rol;
 use OWC\Zaaksysteem\Entities\Zaak;
 use OWC\Zaaksysteem\Entities\Zaakeigenschap;
-use function OWC\Zaaksysteem\Foundation\Helpers\resolve;
 use OWC\Zaaksysteem\Http\Errors\BadRequestError;
 use OWC\Zaaksysteem\Resolvers\ContainerResolver;
 use OWC\Zaaksysteem\Support\PagedCollection;
 use OWC\Zaaksysteem\Traits\FormSetting;
 use OWC\Zaaksysteem\Traits\MergeTags;
+use function OWC\Zaaksysteem\Foundation\Helpers\resolve;
 
 abstract class AbstractCreateZaakAction
 {
@@ -112,7 +112,7 @@ protected function mapArgs(array $args, array $form, array $entry): array
                 $fieldValue = (new DateTime($fieldValue))->format('Y-m-d');
             }
 
-            $args[$field->linkedFieldValueZGW] = $this->handleMergeTags($entry, $fieldValue);
+            $args[$field->linkedFieldValueZGW] = $this->handleMergeTags($entry, $form, $fieldValue);
         }
 
         return $args;

src/Traits/MergeTags.php

@@ -10,19 +10,19 @@
 
 trait MergeTags
 {
-    public function handleMergeTags(array $entry, string $value)
+    public function handleMergeTags(array $entry, array $form, string $value)
     {
-        return preg_replace_callback('/\[[^\]]*\]/', function ($matches) use ($entry) {
+        return preg_replace_callback('/\[[^\]]*\]/', function ($matches) use ($entry, $form) {
             $fieldID = str_replace(['[', ']'], '', $matches[0]);
             $fieldValue = null;
 
-            if ($field = $this->checkFieldType($fieldID, 'checkbox')) {
+            if ($field = $this->checkFieldType($form, $fieldID, 'checkbox')) {
                 $fieldValue = [];
 
                 foreach ($field->inputs as $input) {
                     $fieldValue[] = rgar($entry, $input['id']);
                 }
-            } elseif ($this->checkFieldType($fieldID, 'multiselect')) {
+            } elseif ($this->checkFieldType($form, $fieldID, 'multiselect')) {
                 $fieldValue = json_decode(rgar($entry, $fieldID), true) ?: [];
             } else {
                 $fieldValue = rgar($entry, $fieldID);
@@ -42,9 +42,9 @@ public function handleMergeTags(array $entry, string $value)
         }, $value);
     }
 
-    protected function checkFieldType(string $fieldID, string $fieldType): ?GF_Field
+    protected function checkFieldType(array $form, string $fieldID, string $fieldType): ?GF_Field
     {
-        $fields = array_filter($this->form['fields'], function ($field) use ($fieldID, $fieldType) {
+        $fields = array_filter($form['fields'], function ($field) use ($fieldID, $fieldType) {
             return $field->id == $fieldID && $fieldType === $field->type;
         });