Skip to content

Commit e4503a6

Browse files
committed
MC-33909: Fix Integration tests php 7.4
1 parent 431a535 commit e4503a6

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ public function execute()
104104
\Magento\Sales\Api\CreditmemoManagementInterface::class
105105
);
106106
$creditmemo->getOrder()->setCustomerNoteNotify(!empty($data['send_email']));
107-
$creditmemoManagement->refund($creditmemo, (bool)$data['do_offline']);
107+
$doOffline = isset($data['do_offline']) ? (bool)$data['do_offline'] : false;
108+
$creditmemoManagement->refund($creditmemo, $doOffline);
108109

109110
if (!empty($data['send_email'])) {
110111
$this->creditmemoSender->send($creditmemo);

lib/internal/Magento/Framework/Archive/Tar.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ protected function _initWriter()
8585
*/
8686
protected static function _getFormatParseHeader()
8787
{
88-
return 'a100name/a8mode/a8uid/a8gid/a12size/a12mtime/a8checksum/a1type/a100symlink/a6magic/a2version/' .
89-
'a32uname/a32gname/a8devmajor/a8devminor/a155prefix/a12closer';
88+
return 'Z100name/Z8mode/Z8uid/Z8gid/Z12size/Z12mtime/Z8checksum/Z1type/Z100symlink/Z6magic/Z2version/' .
89+
'Z32uname/Z32gname/Z8devmajor/Z8devminor/Z155prefix/Z12closer';
9090
}
9191

9292
/**

0 commit comments

Comments
 (0)