Bump ImapEngine from 1.25.1 to 1.25.2

This commit is contained in:
johnnyq
2026-07-18 11:17:53 -04:00
parent 9cc7e5ff3c
commit 1a3d7a1e0d
32 changed files with 2375 additions and 269 deletions

View File

@@ -147,7 +147,7 @@ abstract class AbstractOperation implements OperationInterface
*/
public function moveMessagesToIntlDomainsIfPossible(string $batch = self::ALL_BATCH): void
{
// If MessageFormatter class does not exists, intl domains are not supported.
// If MessageFormatter class does not exist, intl domains are not supported.
if (!class_exists(\MessageFormatter::class)) {
return;
}
@@ -170,6 +170,12 @@ abstract class AbstractOperation implements OperationInterface
$currentMessages = array_diff_key($messages, $result->all($domain));
$result->replace($currentMessages, $domain);
$result->replace($allIntlMessages + $messages, $intlDomain);
foreach ($result->getCatalogueMetadata('', $domain) ?? [] as $key => $value) {
if (null === $this->result->getCatalogueMetadata($key, $intlDomain)) {
$result->setCatalogueMetadata($key, $value, $intlDomain);
}
}
}
}

View File

@@ -172,6 +172,6 @@ final class TranslationPushCommand extends Command
$domains = array_merge($domains, $catalogue->getDomains());
}
return array_unique($domains);
return array_values(array_unique($domains));
}
}

View File

@@ -156,10 +156,11 @@ class XliffFileDumper extends FileDumper
}
if ($catalogueMetadata = $messages->getCatalogueMetadata('', $domain) ?? []) {
$xliff->setAttribute('xmlns:m', 'urn:oasis:names:tc:xliff:metadata:2.0');
$xliffMetadata = $xliffFile->appendChild($dom->createElement('m:metadata'));
$xliff->setAttribute('xmlns:mda', 'urn:oasis:names:tc:xliff:metadata:2.0');
$xliffMetadata = $xliffFile->appendChild($dom->createElement('mda:metadata'));
$xliffMetaGroup = $xliffMetadata->appendChild($dom->createElement('mda:metaGroup'));
foreach ($catalogueMetadata as $key => $value) {
$xliffMeta = $xliffMetadata->appendChild($dom->createElement('prop'));
$xliffMeta = $xliffMetaGroup->appendChild($dom->createElement('mda:meta'));
$xliffMeta->setAttribute('type', $key);
$xliffMeta->appendChild($dom->createTextNode($value));
}

View File

@@ -158,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) {