Skip to content
This repository has been archived by the owner on Apr 29, 2019. It is now read-only.

Made getAllOptions() and toOptionArray() compatible #34

Merged
merged 1 commit into from
Feb 8, 2018

Conversation

joni-jones
Copy link
Contributor

@joni-jones joni-jones commented Feb 5, 2018

Fixed Issues

  1. \Magento\Framework\Data\OptionSourceInterface::toOptionArray() implementations are incompatible with the interface #6: \Magento\Framework\Data\OptionSourceInterface::toOptionArray() implementations are incompatible with the interface

Changes for EE in the internal branch https://github.com/magento-mpi/magento2ee/tree/G%236

Contribution checklist

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds on Travis CI are green)

@buskamuza buskamuza self-assigned this Feb 7, 2018
@buskamuza buskamuza added this to the February 2018 milestone Feb 7, 2018
@buskamuza buskamuza changed the title Made toOptionArray() and toOptionArray() compatible Made getAllOptions() and toOptionArray() compatible Feb 7, 2018
*/
public function toOptionArray($noEmpty = false)
public function toOptionArray($noEmpty = false, $foregroundCountries = '')
{
$options = parent::toOptionArray($noEmpty);
Copy link
Contributor

Choose a reason for hiding this comment

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

Please add $foregroundCountries here in the call, it's supported by the parent.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@buskamuza, done.

$item2,
]);

$this->itemPriceRenderer->method('toHtml')
Copy link
Contributor

Choose a reason for hiding this comment

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

@joni-jones @buskamuza It looks like missing check that method toHtml will be called at least once

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@ihor-sviziev, this expects is redundant because if toHtml() won't be called the test will fail. "Price assertions" check this case.

@magento-engcom-team magento-engcom-team merged commit 130cde2 into magento-engcom:2.3-develop Feb 8, 2018
magento-engcom-team pushed a commit that referenced this pull request Jul 4, 2018
[Backport] Use correct error message for duplicate error key in product import
magento-team pushed a commit that referenced this pull request Aug 27, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants