[BUGFIX] Convert non-list arrays in API response

Resolves: #81

Classes/Exception/InvalidArrayPathException.php

@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the TYPO3 CMS extension "personio_jobs".
+ *
+ * Copyright (C) 2023 Elias Häußler <e.haeussler@familie-redlich.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace CPSIT\Typo3PersonioJobs\Exception;
+
+use Exception;
+
+/**
+ * InvalidArrayPathException
+ *
+ * @author Elias Häußler <e.haeussler@familie-redlich.de>
+ * @license GPL-2.0-or-later
+ */
+final class InvalidArrayPathException extends Exception
+{
+    public static function forUnexpectedType(string $path, string $expected, string $actual): self
+    {
+        return new self(
+            sprintf('Expected %s at array path "%s", got %s instead.', $expected, $path, $actual),
+            1692177655,
+        );
+    }
+
+    public static function forInvalidPathSegment(string $path): self
+    {
+        return new self(
+            sprintf('The array path segment "%s" is not valid.', $path),
+            1692178102,
+        );
+    }
+}

Classes/Exception/MalformedXmlException.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the TYPO3 CMS extension "personio_jobs".
+ *
+ * Copyright (C) 2023 Elias Häußler <e.haeussler@familie-redlich.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace CPSIT\Typo3PersonioJobs\Exception;
+
+use Exception;
+
+/**
+ * MalformedXmlException
+ *
+ * @author Elias Häußler <e.haeussler@familie-redlich.de>
+ * @license GPL-2.0-or-later
+ */
+final class MalformedXmlException extends Exception
+{
+    public static function create(string $input, string $error): self
+    {
+        return new self(
+            sprintf(
+                'The string "%s" does not contain valid XML: %s',
+                mb_strimwidth($input, 0, 100, '…'),
+                $error,
+            ),
+            1692170602,
+        );
+    }
+}

Classes/Mapper/Source/XmlSource.php

@@ -0,0 +1,89 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the TYPO3 CMS extension "personio_jobs".
+ *
+ * Copyright (C) 2023 Elias Häußler <e.haeussler@familie-redlich.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace CPSIT\Typo3PersonioJobs\Mapper\Source;
+
+use ArrayObject;
+use CPSIT\Typo3PersonioJobs\Exception\InvalidArrayPathException;
+use CPSIT\Typo3PersonioJobs\Exception\MalformedXmlException;
+use CPSIT\Typo3PersonioJobs\Utility\ArrayUtility;
+use Mtownsend\XmlToArray\XmlToArray;
+use Throwable;
+
+/**
+ * XmlSource
+ *
+ * @author Elias Häußler <e.haeussler@familie-redlich.de>
+ * @license GPL-2.0-or-later
+ *
+ * @extends ArrayObject<string, mixed>
+ */
+final class XmlSource extends ArrayObject
+{
+    /**
+     * @param array<string, mixed> $source
+     */
+    public function __construct(array $source)
+    {
+        parent::__construct($source);
+    }
+
+    /**
+     * @throws MalformedXmlException
+     */
+    public static function fromXml(string $xml): self
+    {
+        set_error_handler(static fn (int $code, string $message) => self::handleParseError($xml, $message));
+
+        try {
+            $source = XmlToArray::convert($xml);
+        } catch (Throwable $exception) {
+            self::handleParseError($xml, $exception->getMessage());
+        } finally {
+            restore_error_handler();
+        }
+
+        return new self($source);
+    }
+
+    /**
+     * @throws InvalidArrayPathException
+     */
+    public function asCollection(string $node): self
+    {
+        $clone = clone $this;
+        $clone->exchangeArray(
+            ArrayUtility::convertToCollection((array)$clone, $node),
+        );
+
+        return $clone;
+    }
+
+    /**
+     * @throws MalformedXmlException
+     */
+    private static function handleParseError(string $xml, string $message): never
+    {
+        throw MalformedXmlException::create($xml, $message);
+    }
+}

Classes/Service/PersonioApiService.php

@@ -27,15 +27,16 @@
 use CPSIT\Typo3PersonioJobs\Domain\Model\Job;
 use CPSIT\Typo3PersonioJobs\Domain\Model\JobDescription;
 use CPSIT\Typo3PersonioJobs\Event\AfterJobsMappedEvent;
+use CPSIT\Typo3PersonioJobs\Exception\InvalidArrayPathException;
 use CPSIT\Typo3PersonioJobs\Exception\MalformedApiResponseException;
+use CPSIT\Typo3PersonioJobs\Exception\MalformedXmlException;
+use CPSIT\Typo3PersonioJobs\Mapper\Source\XmlSource;
 use CPSIT\Typo3PersonioJobs\Utility\FrontendUtility;
 use CuyZ\Valinor\Mapper\MappingError;
-use CuyZ\Valinor\Mapper\Source\Source;
 use CuyZ\Valinor\Mapper\Tree\Message\Messages;
 use CuyZ\Valinor\Mapper\TreeMapper;
 use CuyZ\Valinor\MapperBuilder;
 use DateTimeInterface;
-use Mtownsend\XmlToArray\XmlToArray;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use TYPO3\CMS\Core\Http\RequestFactory;
 use TYPO3\CMS\Core\Http\Uri;
@@ -62,17 +63,21 @@ public function __construct(
 
     /**
      * @return list<Job>
+     * @throws InvalidArrayPathException
      * @throws MalformedApiResponseException
+     * @throws MalformedXmlException
      */
     public function getJobs(): array
     {
         $requestUri = $this->apiUrl->withPath('/xml');
         $response = $this->requestFactory->request((string)$requestUri);
-        $array = XmlToArray::convert((string)$response->getBody());
-        $source = Source::array($array['position'] ?? []);
+        $source = XmlSource::fromXml((string)$response->getBody())
+            ->asCollection('position')
+            ->asCollection('position.*.jobDescriptions.jobDescription')
+        ;
 
         try {
-            $jobs = $this->mapper->map('list<' . Job::class . '>', $source);
+            $jobs = $this->mapper->map('list<' . Job::class . '>', $source['position']);
 
             $this->eventDispatcher->dispatch(new AfterJobsMappedEvent($requestUri, $jobs));
 

Classes/Service/PersonioImportService.php

@@ -29,7 +29,9 @@
 use CPSIT\Typo3PersonioJobs\Domain\Repository\JobRepository;
 use CPSIT\Typo3PersonioJobs\Enums\ImportOperation;
 use CPSIT\Typo3PersonioJobs\Event\AfterJobsImportedEvent;
+use CPSIT\Typo3PersonioJobs\Exception\InvalidArrayPathException;
 use CPSIT\Typo3PersonioJobs\Exception\InvalidParametersException;
+use CPSIT\Typo3PersonioJobs\Exception\MalformedXmlException;
 use CPSIT\Typo3PersonioJobs\Helper\SlugHelper;
 use Generator;
 use Psr\EventDispatcher\EventDispatcherInterface;
@@ -59,7 +61,9 @@ public function __construct(
 
     /**
      * @param int<0, max> $storagePid
+     * @throws InvalidArrayPathException
      * @throws InvalidParametersException
+     * @throws MalformedXmlException
      */
     public function import(
         int $storagePid,

Classes/Utility/ArrayUtility.php

@@ -0,0 +1,111 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the TYPO3 CMS extension "personio_jobs".
+ *
+ * Copyright (C) 2023 Elias Häußler <e.haeussler@familie-redlich.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace CPSIT\Typo3PersonioJobs\Utility;
+
+use CPSIT\Typo3PersonioJobs\Exception\InvalidArrayPathException;
+
+/**
+ * ArrayUtility
+ *
+ * @author Elias Häußler <e.haeussler@familie-redlich.de>
+ * @license GPL-2.0-or-later
+ */
+final class ArrayUtility
+{
+    /**
+     * @param array<string, mixed> $array
+     * @return array<string, mixed>
+     * @throws InvalidArrayPathException
+     */
+    public static function convertToCollection(array $array, string $path): array
+    {
+        $reference = &$array;
+        $pathSegments = str_getcsv($path, '.');
+        $remainingSegments = $pathSegments;
+        $currentPathSegments = [];
+
+        foreach ($pathSegments as $pathSegment) {
+            $currentPathSegments[] = array_shift($remainingSegments);
+
+            // Validate path segment
+            if (!is_string($pathSegment) || trim($pathSegment) === '') {
+                throw InvalidArrayPathException::forInvalidPathSegment(implode('.', $currentPathSegments));
+            }
+
+            // Handle non-array values
+            if (!is_array($reference)) {
+                throw InvalidArrayPathException::forUnexpectedType(
+                    implode('.', $currentPathSegments),
+                    'array',
+                    gettype($reference),
+                );
+            }
+
+            // Handle placeholder for lists
+            if ($pathSegment === '*') {
+                $reference = self::convertListToCollection($reference, implode('.', $remainingSegments));
+
+                return $array;
+            }
+
+            // Create node value if not exists
+            if (!array_key_exists($pathSegment, $reference)) {
+                $reference[$pathSegment] = [];
+            }
+
+            $reference = &$reference[$pathSegment];
+        }
+
+        // Handle non-array values
+        if (!is_array($reference)) {
+            throw InvalidArrayPathException::forUnexpectedType($path, 'array', gettype($reference));
+        }
+
+        // Convert array to list
+        if (!array_is_list($reference)) {
+            $reference = [$reference];
+        }
+
+        return $array;
+    }
+
+    /**
+     * @param array<mixed> $array
+     * @return array<int, mixed>
+     * @throws InvalidArrayPathException
+     */
+    private static function convertListToCollection(array $array, string $path): array
+    {
+        // Handle non-lists
+        if (!array_is_list($array)) {
+            throw InvalidArrayPathException::forUnexpectedType($path, 'list', 'array');
+        }
+
+        foreach ($array as $key => $value) {
+            $array[$key] = self::convertToCollection($value, $path);
+        }
+
+        return $array;
+    }
+}