Skip to content

Commit 2c0852a

Browse files
committed
MC-33909: Fix Integration tests php 7.4
1 parent c712401 commit 2c0852a

File tree

1 file changed

+7
-18
lines changed
  • lib/internal/Magento/Framework/Archive

1 file changed

+7
-18
lines changed

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

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -430,23 +430,6 @@ protected function _unpackCurrentTar($destination)
430430
return $list;
431431
}
432432

433-
/**
434-
* Converts octal numbers to decimal ones for specific header types.
435-
*
436-
* @param array $header
437-
* @return array
438-
*/
439-
private function convertOctToDec(array $header): array
440-
{
441-
$typesToConvert = ['mode', 'uid', 'gid', 'size', 'mtime', 'checksum'];
442-
foreach ($typesToConvert as $type) {
443-
$octNum = preg_replace('/[^0-7]/', '', $header[$type]);
444-
$header[$type] = octdec($octNum);
445-
}
446-
447-
return $header;
448-
}
449-
450433
/**
451434
* Read and decode file header information from tarball
452435
*
@@ -463,7 +446,13 @@ protected function _extractFileHeader()
463446
}
464447

465448
$header = unpack(self::_getFormatParseHeader(), $headerBlock);
466-
$header = $this->convertOctToDec($header);
449+
450+
$header['mode'] = octdec($header['mode']);
451+
$header['uid'] = octdec($header['uid']);
452+
$header['gid'] = octdec($header['gid']);
453+
$header['size'] = octdec($header['size']);
454+
$header['mtime'] = octdec($header['mtime']);
455+
$header['checksum'] = octdec($header['checksum']);
467456

468457
if ($header['type'] == "5") {
469458
$header['size'] = 0;

0 commit comments

Comments
 (0)