Cleaned up

Author: rimi-itk

src/Drush/Commands/ValidateXmlCommand.php

@@ -4,7 +4,6 @@
 
 namespace Drupal\os2forms_fordelingskomponent\Drush\Commands;
 
-use Composer\Console\Input\InputOption;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Url;
 use Drupal\os2forms_fordelingskomponent\Helper\FordelingskomponentHelper;
@@ -18,6 +17,7 @@
 use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 

src/Helper/FordelingskomponentHelper.php

@@ -507,7 +507,7 @@ public function checkFilesDelivered(
       }
       catch (\Exception $exception) {
         $this->logger->warning('Error checking file %filename: %message', $context + [
-          '%filename' => $filename ?? NULL,
+          '%filename' => $filename,
           '%message' => $exception->getMessage(),
           'exception' => $exception,
         ]);

src/Helper/WebformHelperSF2900.php

@@ -127,7 +127,13 @@ public function renderPreview(WebformHandlerSF2900 $handler, WebformSubmissionIn
     $distributionObject = NULL;
     $xml = new XmlRenderResult(
       template: '',
-      context: [],
+      context: [
+        'submission' => [],
+        'files' => [],
+        'handler' => [
+          'settings' => [],
+        ],
+      ],
       rendered: NULL,
       exception: NULL,
     );

src/Helper/XmlHelper.php

@@ -75,8 +75,16 @@ public function render(string $template, array $context, bool $validateXml = TRU
 
   /**
    * Get render context.
+   *
+   * @return array {
+   *   submission: array,
+   *   files: array,
+   *   handler: array{
+   *     settings: array
+   *   }
+   *   }
    */
-  public function getRenderContext(HandlerSettings $handlerSettings, WebformSubmissionInterface $submission, array $files) {
+  public function getRenderContext(HandlerSettings $handlerSettings, WebformSubmissionInterface $submission, array $files): array {
     return [
       'submission' => $submission->toArray(TRUE),
       'files' => $files,

src/Model/XmlRenderResult.php

@@ -18,9 +18,11 @@ public function __construct(
      * The context.
      *
      * @var array{
-     *   submission: array,
+     *   submission: array|WebformSubmissionInterface|null,
      *   files: array,
-     *   handler: array,
+     *   handler: array{
+     *     settings: array,
+     *   },
      * }
      */
     public array $context,

src/Os2formsFordelingskomponentTwigExtension.php

@@ -15,6 +15,7 @@ final class Os2formsFordelingskomponentTwigExtension extends AbstractExtension {
   /**
    * {@inheritdoc}
    */
+  #[\Override]
   public function getFunctions(): array {
     $functions[] = new TwigFunction(
       'os2forms_fordelingskomponent_intval',