Skip to content

[Forwardport] Remove unused namespace from ui export #15611

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

Closed
wants to merge 1 commit into from
Closed

[Forwardport] Remove unused namespace from ui export #15611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions app/code/Magento/Ui/Model/Export/ConvertToCsv.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\Filesystem;
use Magento\Framework\Filesystem\Directory\WriteInterface;
use Magento\Ui\Component\MassAction\Filter;

/**
Expand All @@ -17,7 +16,7 @@
class ConvertToCsv
{
/**
* @var WriteInterface
* @var DirectoryList
Copy link
Contributor

@rogyar rogyar May 31, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like there's some mistake. In the constructor we init $directory property as a result of $filesystem->getDirectoryWrite() method, which creates an instance of Magento\Framework\Filesystem\Directory\Write using the corresponding factory. So, basically, it returns WriteInterface but not DirectoryList. The same situation is for the ConvertToXml class.
Please, correct me if I'm wrong.

*/
protected $directory;

Expand Down
3 changes: 1 addition & 2 deletions app/code/Magento/Ui/Model/Export/ConvertToXml.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
use Magento\Framework\Convert\ExcelFactory;
use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\Filesystem;
use Magento\Framework\Filesystem\Directory\WriteInterface;
use Magento\Ui\Component\MassAction\Filter;

/**
Expand All @@ -21,7 +20,7 @@
class ConvertToXml
{
/**
* @var WriteInterface
* @var DirectoryList
*/
protected $directory;

Expand Down