Skip to content

Commit

Permalink
Merge pull request #23 from akeneo-labs/prepare-1-5
Browse files Browse the repository at this point in the history
Prepare 1.5
  • Loading branch information
Remy Betus committed Oct 7, 2015
2 parents b966c58 + 8e4312a commit bcb0bbf
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Archiver/FileIteratorReaderArchiver.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use Akeneo\Bundle\BatchBundle\Entity\JobExecution;
use Akeneo\Bundle\BatchBundle\Step\ItemStep;
use Gaufrette\Filesystem;
use League\Flysystem\Filesystem;
use Pim\Bundle\BaseConnectorBundle\Archiver\AbstractFilesystemArchiver;
use Pim\Bundle\ExcelConnectorBundle\Reader\FileIteratorReader;

Expand Down Expand Up @@ -49,11 +49,11 @@ public function archive(JobExecution $jobExecution)
if ($reader instanceof FileIteratorReader) {
$key = strtr(
$this->getRelativeArchivePath($jobExecution),
array(
[
'%filename%' => basename($reader->getFilePath()),
)
]
);
$this->filesystem->write($key, file_get_contents($reader->getFilePath()), true);
$this->filesystem->put($key, file_get_contents($reader->getFilePath()));
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions Resources/config/archiving.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ services:
pim_excel_connector.archiver.file_iterator_reader_archiver:
class: %pim_excel_connector.archiver.file_iterator_reader_archiver.class%
arguments:
- '@pim_archivist_filesystem'
- '@oneup_flysystem.archivist_filesystem'
tags:
- { name: pim_base_connector.archiver }
- { name: pim_base_connector.archiver }

0 comments on commit bcb0bbf

Please sign in to comment.