Skip to content

Fix for removing the dirs while creating a TAR archive #18322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 3, 2018
Merged

Fix for removing the dirs while creating a TAR archive #18322

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f08a19d
Fix for removing the dirs while creating a TAR archive
haroldclaus Sep 30, 2018
39e0ad9
Fix static test
ihor-sviziev Oct 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions lib/internal/Magento/Framework/Archive/Tar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
* See COPYING.txt for license details.
*/

namespace Magento\Framework\Archive;

use Magento\Framework\Archive\Helper\File;

/**
* Class to work with tar archives
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Framework\Archive;

use Magento\Framework\Archive\Helper\File;

class Tar extends \Magento\Framework\Archive\AbstractArchive implements \Magento\Framework\Archive\ArchiveInterface
{
/**
Expand Down Expand Up @@ -259,10 +259,7 @@ protected function _createTar($skipRoot = false, $finalize = false)
);
}

array_shift($dirFiles);
/* remove './'*/
array_shift($dirFiles);
/* remove '../'*/
$dirFiles = array_diff($dirFiles, ['..', '.']);

foreach ($dirFiles as $item) {
$this->_setCurrentFile($file . $item)->_createTar();
Expand Down