Skip to content

Commit 7bd7041

Browse files
committed
5189: Updated itk-dev/serviceplatformen
1 parent 7533b14 commit 7bd7041

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"fig/http-message-util": "^1.1",
5656
"http-interop/http-factory-guzzle": "^1.0.0",
5757
"itk-dev/beskedfordeler-drupal": "^1.0",
58-
"itk-dev/serviceplatformen": "dev-feature/5189-memo-1.2 as 1.7.0",
58+
"itk-dev/serviceplatformen": "^1.7.1",
5959
"mglaman/composer-drupal-lenient": "^1.0",
6060
"os2web/os2web_audit": "^1.0",
6161
"os2web/os2web_datalookup": "^2.0",
@@ -79,10 +79,6 @@
7979
"wsdltophp/packagegenerator": "^4.0"
8080
},
8181
"repositories": {
82-
"itk-dev/serviceplatformen": {
83-
"type": "vcs",
84-
"url": "https://github.com/itk-dev/serviceplatformen"
85-
},
8682
"drupal": {
8783
"type": "composer",
8884
"url": "https://packages.drupal.org/8"

modules/os2forms_digital_post/src/Drush/Commands/DigitalPostTestCommands.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,17 +133,16 @@ public function send(
133133
$io->section('Digital post');
134134
$io->definitionList(
135135
['Type' => $type],
136-
['Document' => sprintf('%s (%s) (sanitized: %s)', $document->filename, $document->mimeType, SF1601::sanitizeFilename($document->filename))],
137136
['Subject' => $subject],
138137
['Message' => $message],
139-
['MeMe version' => $meMoVersion],
138+
['Document' => sprintf('%s (%s)', $document->filename, $document->mimeType)],
139+
['MeMo version' => $meMoVersion ?? ''],
140140
);
141141

142142
$actions = array_map($this->buildAction(...), $options['action']);
143143

144144
foreach ($recipients as $recipient) {
145145
try {
146-
$io->writeln(sprintf('Recipient: %s', $recipient));
147146
$recipientLookupResult = $this->digitalPostHelper->lookupRecipient($recipient);
148147

149148
$meMoMessage = $this->digitalPostHelper->getMeMoHelper()->buildMessage($recipientLookupResult, $senderLabel,
@@ -160,6 +159,12 @@ public function send(
160159
$forsendelse
161160
);
162161

162+
$io->definitionList(
163+
['Recipient' => $recipient],
164+
['Document' => sprintf('%s (%s)', $document->filename, $document->mimeType)],
165+
['MeMo version' => $meMoMessage->getMemoVersion()],
166+
);
167+
163168
$io->success(sprintf('Digital post sent to %s (MeMo %s)', $recipient, $meMoMessage->getMemoVersion()));
164169
}
165170
catch (\Throwable $throwable) {

modules/os2forms_digital_post/src/Helper/MeMoHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function buildMessage(CprLookupResult|CompanyLookupResult $recipientData,
7676
(new File())
7777
->setEncodingFormat($document->mimeType)
7878
->setLanguage($document->language)
79-
->setFilename(SF1601::sanitizeFilename($document->filename))
79+
->setFilename($document->filename)
8080
->setContent($document->content),
8181
]);
8282

0 commit comments

Comments
 (0)