[Web] Update composer libraries

data/web/inc/lib/vendor/symfony/translation/Loader/CsvFileLoader.php

@@ -22,29 +22,28 @@ class CsvFileLoader extends FileLoader
 {
     private string $delimiter = ';';
     private string $enclosure = '"';
-    private string $escape = '\\';
+    /**
+     * @deprecated since Symfony 7.2, to be removed in 8.0
+     */
+    private string $escape = '';
 
     protected function loadResource(string $resource): array
     {
         $messages = [];
 
-        try {
-            $file = new \SplFileObject($resource, 'rb');
-        } catch (\RuntimeException $e) {
-            throw new NotFoundResourceException(sprintf('Error opening file "%s".', $resource), 0, $e);
+        if (!$file = @fopen($resource, 'r')) {
+            throw new NotFoundResourceException(\sprintf('Error opening file "%s".', $resource));
         }
 
-        $file->setFlags(\SplFileObject::READ_CSV | \SplFileObject::SKIP_EMPTY);
-        $file->setCsvControl($this->delimiter, $this->enclosure, $this->escape);
-
-        foreach ($file as $data) {
-            if (false === $data) {
-                continue;
-            }
-
-            if (!str_starts_with($data[0], '#') && isset($data[1]) && 2 === \count($data)) {
-                $messages[$data[0]] = $data[1];
+        try {
+            while (false !== $data = fgetcsv($file, null, $this->delimiter, $this->enclosure, $this->escape)) {
+                // empty lines are read as [null]
+                if (isset($data[1]) && 2 === \count($data) && !str_starts_with($data[0], '#')) {
+                    $messages[$data[0]] = $data[1];
+                }
             }
+        } finally {
+            fclose($file);
         }
 
         return $messages;
@@ -52,13 +51,15 @@ class CsvFileLoader extends FileLoader
 
     /**
      * Sets the delimiter, enclosure, and escape character for CSV.
-     *
-     * @return void
      */
-    public function setCsvControl(string $delimiter = ';', string $enclosure = '"', string $escape = '\\')
+    public function setCsvControl(string $delimiter = ';', string $enclosure = '"', string $escape = ''): void
     {
         $this->delimiter = $delimiter;
         $this->enclosure = $enclosure;
+        if ('' !== $escape) {
+            trigger_deprecation('symfony/translation', '7.2', 'The "escape" parameter of the "%s" method is deprecated. It will be removed in 8.0.', __METHOD__);
+        }
+
         $this->escape = $escape;
     }
 }

data/web/inc/lib/vendor/symfony/translation/Loader/FileLoader.php

@@ -24,11 +24,11 @@ abstract class FileLoader extends ArrayLoader
     public function load(mixed $resource, string $locale, string $domain = 'messages'): MessageCatalogue
     {
         if (!stream_is_local($resource)) {
-            throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
+            throw new InvalidResourceException(\sprintf('This is not a local file "%s".', $resource));
         }
 
         if (!file_exists($resource)) {
-            throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
+            throw new NotFoundResourceException(\sprintf('File "%s" not found.', $resource));
         }
 
         $messages = $this->loadResource($resource);
@@ -38,7 +38,7 @@ abstract class FileLoader extends ArrayLoader
 
         // not an array
         if (!\is_array($messages)) {
-            throw new InvalidResourceException(sprintf('Unable to load file "%s".', $resource));
+            throw new InvalidResourceException(\sprintf('Unable to load file "%s".', $resource));
         }
 
         $catalogue = parent::load($messages, $locale, $domain);

data/web/inc/lib/vendor/symfony/translation/Loader/IcuDatFileLoader.php

@@ -26,11 +26,11 @@ class IcuDatFileLoader extends IcuResFileLoader
     public function load(mixed $resource, string $locale, string $domain = 'messages'): MessageCatalogue
     {
         if (!stream_is_local($resource.'.dat')) {
-            throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
+            throw new InvalidResourceException(\sprintf('This is not a local file "%s".', $resource));
         }
 
         if (!file_exists($resource.'.dat')) {
-            throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
+            throw new NotFoundResourceException(\sprintf('File "%s" not found.', $resource));
         }
 
         try {
@@ -40,7 +40,7 @@ class IcuDatFileLoader extends IcuResFileLoader
         }
 
         if (!$rb) {
-            throw new InvalidResourceException(sprintf('Cannot load resource "%s".', $resource));
+            throw new InvalidResourceException(\sprintf('Cannot load resource "%s".', $resource));
         } elseif (intl_is_failure($rb->getErrorCode())) {
             throw new InvalidResourceException($rb->getErrorMessage(), $rb->getErrorCode());
         }

data/web/inc/lib/vendor/symfony/translation/Loader/IcuResFileLoader.php

@@ -26,11 +26,11 @@ class IcuResFileLoader implements LoaderInterface
     public function load(mixed $resource, string $locale, string $domain = 'messages'): MessageCatalogue
     {
         if (!stream_is_local($resource)) {
-            throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
+            throw new InvalidResourceException(\sprintf('This is not a local file "%s".', $resource));
         }
 
         if (!is_dir($resource)) {
-            throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
+            throw new NotFoundResourceException(\sprintf('File "%s" not found.', $resource));
         }
 
         try {
@@ -40,7 +40,7 @@ class IcuResFileLoader implements LoaderInterface
         }
 
         if (!$rb) {
-            throw new InvalidResourceException(sprintf('Cannot load resource "%s".', $resource));
+            throw new InvalidResourceException(\sprintf('Cannot load resource "%s".', $resource));
         } elseif (intl_is_failure($rb->getErrorCode())) {
             throw new InvalidResourceException($rb->getErrorMessage(), $rb->getErrorCode());
         }

data/web/inc/lib/vendor/symfony/translation/Loader/PoFileLoader.php

@@ -55,6 +55,7 @@ class PoFileLoader extends FileLoader
      * - No support for comments spanning multiple lines.
      * - Translator and extracted comments are treated as being the same type.
      * - Message IDs are allowed to have other encodings as just US-ASCII.
+     * - Contexts (msgctxt) are parsed but discarded.
      *
      * Items with an empty id are ignored.
      */
@@ -65,6 +66,7 @@ class PoFileLoader extends FileLoader
         $defaults = [
             'ids' => [],
             'translated' => null,
+            'context' => null,
         ];
 
         $messages = [];
@@ -76,23 +78,28 @@ class PoFileLoader extends FileLoader
 
             if ('' === $line) {
                 // Whitespace indicated current item is done
-                if (!\in_array('fuzzy', $flags)) {
-                    $this->addMessage($messages, $item);
-                }
-                $item = $defaults;
-                $flags = [];
+                $this->saveItem($messages, $item, $flags, $defaults);
             } elseif (str_starts_with($line, '#,')) {
+                // flags belong to the next entry, so the previous one ends here
+                if (null !== $item['translated']) {
+                    $this->saveItem($messages, $item, $flags, $defaults);
+                }
                 $flags = array_map('trim', explode(',', substr($line, 2)));
+            } elseif (str_starts_with($line, 'msgctxt "')) {
+                if (null !== $item['translated']) {
+                    $this->saveItem($messages, $item, $flags, $defaults);
+                }
+                $item['context'] = substr($line, 9, -1);
             } elseif (str_starts_with($line, 'msgid "')) {
                 // We start a new msg so save previous
-                // TODO: this fails when comments or contexts are added
-                $this->addMessage($messages, $item);
-                $item = $defaults;
+                if ($item['ids']) {
+                    $this->saveItem($messages, $item, $flags, $defaults);
+                }
                 $item['ids']['singular'] = substr($line, 7, -1);
             } elseif (str_starts_with($line, 'msgstr "')) {
                 $item['translated'] = substr($line, 8, -1);
             } elseif ('"' === $line[0]) {
-                $continues = isset($item['translated']) ? 'translated' : 'ids';
+                $continues = isset($item['translated']) ? 'translated' : ($item['ids'] ? 'ids' : 'context');
 
                 if (\is_array($item[$continues])) {
                     end($item[$continues]);
@@ -108,14 +115,21 @@ class PoFileLoader extends FileLoader
             }
         }
         // save last item
-        if (!\in_array('fuzzy', $flags)) {
-            $this->addMessage($messages, $item);
-        }
+        $this->saveItem($messages, $item, $flags, $defaults);
         fclose($stream);
 
         return $messages;
     }
 
+    private function saveItem(array &$messages, array &$item, array &$flags, array $defaults): void
+    {
+        if (!\in_array('fuzzy', $flags, true)) {
+            $this->addMessage($messages, $item);
+        }
+        $item = $defaults;
+        $flags = [];
+    }
+
     /**
      * Save a translation item to the messages.
      *

data/web/inc/lib/vendor/symfony/translation/Loader/QtFileLoader.php

@@ -32,17 +32,17 @@ class QtFileLoader implements LoaderInterface
         }
 
         if (!stream_is_local($resource)) {
-            throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
+            throw new InvalidResourceException(\sprintf('This is not a local file "%s".', $resource));
         }
 
         if (!file_exists($resource)) {
-            throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
+            throw new NotFoundResourceException(\sprintf('File "%s" not found.', $resource));
         }
 
         try {
             $dom = XmlUtils::loadFile($resource);
         } catch (\InvalidArgumentException $e) {
-            throw new InvalidResourceException(sprintf('Unable to load "%s".', $resource), $e->getCode(), $e);
+            throw new InvalidResourceException(\sprintf('Unable to load "%s".', $resource), $e->getCode(), $e);
         }
 
         $internalErrors = libxml_use_internal_errors(true);
@@ -57,7 +57,7 @@ class QtFileLoader implements LoaderInterface
             foreach ($translations as $translation) {
                 $translationValue = (string) $translation->getElementsByTagName('translation')->item(0)->nodeValue;
 
-                if (!empty($translationValue)) {
+                if ($translationValue) {
                     $catalogue->set(
                         (string) $translation->getElementsByTagName('source')->item(0)->nodeValue,
                         $translationValue,

data/web/inc/lib/vendor/symfony/translation/Loader/XliffFileLoader.php

@@ -36,15 +36,15 @@ class XliffFileLoader implements LoaderInterface
 
         if (!$this->isXmlString($resource)) {
             if (!stream_is_local($resource)) {
-                throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
+                throw new InvalidResourceException(\sprintf('This is not a local file "%s".', $resource));
             }
 
             if (!file_exists($resource)) {
-                throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
+                throw new NotFoundResourceException(\sprintf('File "%s" not found.', $resource));
             }
 
             if (!is_file($resource)) {
-                throw new InvalidResourceException(sprintf('This is neither a file nor an XLIFF string "%s".', $resource));
+                throw new InvalidResourceException(\sprintf('This is neither a file nor an XLIFF string "%s".', $resource));
             }
         }
 
@@ -55,11 +55,11 @@ class XliffFileLoader implements LoaderInterface
                 $dom = XmlUtils::loadFile($resource);
             }
         } catch (\InvalidArgumentException|XmlParsingException|InvalidXmlException $e) {
-            throw new InvalidResourceException(sprintf('Unable to load "%s": ', $resource).$e->getMessage(), $e->getCode(), $e);
+            throw new InvalidResourceException(\sprintf('Unable to load "%s": ', $resource).$e->getMessage(), $e->getCode(), $e);
         }
 
         if ($errors = XliffUtils::validateSchema($dom)) {
-            throw new InvalidResourceException(sprintf('Invalid resource provided: "%s"; Errors: ', $resource).XliffUtils::getErrorsAsString($errors));
+            throw new InvalidResourceException(\sprintf('Invalid resource provided: "%s"; Errors: ', $resource).XliffUtils::getErrorsAsString($errors));
         }
 
         $catalogue = new MessageCatalogue($locale);
@@ -112,16 +112,20 @@ class XliffFileLoader implements LoaderInterface
                     continue;
                 }
 
-                if (isset($translation->target) && 'needs-translation' === (string) $translation->target->attributes()['state']) {
+                $source = (string) (isset($attributes['resname']) && $attributes['resname'] ? $attributes['resname'] : $translation->source);
+
+                if (isset($translation->target)
+                    && 'needs-translation' === (string) $translation->target->attributes()['state']
+                    && \in_array((string) $translation->target, [$source, (string) $translation->source], true)
+                ) {
                     continue;
                 }
 
-                $source = isset($attributes['resname']) && $attributes['resname'] ? $attributes['resname'] : $translation->source;
                 // If the xlf file has another encoding specified, try to convert it because
                 // simple_xml will always return utf-8 encoded values
                 $target = $this->utf8ToCharset((string) ($translation->target ?? $translation->source), $encoding);
 
-                $catalogue->set((string) $source, $target, $domain);
+                $catalogue->set($source, $target, $domain);
 
                 $metadata = [
                     'source' => (string) $translation->source,
@@ -144,7 +148,7 @@ class XliffFileLoader implements LoaderInterface
                     $metadata['id'] = (string) $attributes['id'];
                 }
 
-                $catalogue->setMetadata((string) $source, $metadata, $domain);
+                $catalogue->setMetadata($source, $metadata, $domain);
             }
         }
     }
@@ -154,6 +158,12 @@ class XliffFileLoader implements LoaderInterface
         $xml = simplexml_import_dom($dom);
         $encoding = $dom->encoding ? strtoupper($dom->encoding) : null;
 
+        $xml->registerXPathNamespace('mda', 'urn:oasis:names:tc:xliff:metadata:2.0');
+
+        foreach ($xml->xpath('//mda:meta') as $meta) {
+            $catalogue->setCatalogueMetadata($meta->attributes()['type'] ?? '', (string) $meta, $domain);
+        }
+
         $xml->registerXPathNamespace('xliff', 'urn:oasis:names:tc:xliff:document:2.0');
 
         foreach ($xml->xpath('//xliff:unit') as $unit) {
@@ -168,6 +178,13 @@ class XliffFileLoader implements LoaderInterface
                 $catalogue->set((string) $source, $target, $domain);
 
                 $metadata = [];
+                if ($segment->attributes()) {
+                    $metadata['segment-attributes'] = [];
+                    foreach ($segment->attributes() as $key => $value) {
+                        $metadata['segment-attributes'][$key] = (string) $value;
+                    }
+                }
+
                 if (isset($segment->target) && $segment->target->attributes()) {
                     $metadata['target-attributes'] = [];
                     foreach ($segment->target->attributes() as $key => $value) {
@@ -197,7 +214,7 @@ class XliffFileLoader implements LoaderInterface
      */
     private function utf8ToCharset(string $content, ?string $encoding = null): string
     {
-        if ('UTF-8' !== $encoding && !empty($encoding)) {
+        if ('UTF-8' !== $encoding && $encoding) {
             return mb_convert_encoding($content, $encoding, 'UTF-8');
         }
 

data/web/inc/lib/vendor/symfony/translation/Loader/YamlFileLoader.php

@@ -29,7 +29,7 @@ class YamlFileLoader extends FileLoader
     protected function loadResource(string $resource): array
     {
         if (!isset($this->yamlParser)) {
-            if (!class_exists(\Symfony\Component\Yaml\Parser::class)) {
+            if (!class_exists(YamlParser::class)) {
                 throw new LogicException('Loading translations from the YAML format requires the Symfony Yaml component.');
             }
 
@@ -39,11 +39,11 @@ class YamlFileLoader extends FileLoader
         try {
             $messages = $this->yamlParser->parseFile($resource, Yaml::PARSE_CONSTANT);
         } catch (ParseException $e) {
-            throw new InvalidResourceException(sprintf('The file "%s" does not contain valid YAML: ', $resource).$e->getMessage(), 0, $e);
+            throw new InvalidResourceException(\sprintf('The file "%s" does not contain valid YAML: ', $resource).$e->getMessage(), 0, $e);
         }
 
         if (null !== $messages && !\is_array($messages)) {
-            throw new InvalidResourceException(sprintf('Unable to load file "%s".', $resource));
+            throw new InvalidResourceException(\sprintf('Unable to load file "%s".', $resource));
         }
 
         return $messages ?: [];