diff --git a/app/code/Magento/AdminNotification/Model/Config/Source/Frequency.php b/app/code/Magento/AdminNotification/Model/Config/Source/Frequency.php index 6defd92ea48cb..3f16c8e4d699a 100644 --- a/app/code/Magento/AdminNotification/Model/Config/Source/Frequency.php +++ b/app/code/Magento/AdminNotification/Model/Config/Source/Frequency.php @@ -12,7 +12,7 @@ * @api * @since 100.0.2 */ -class Frequency implements \Magento\Framework\Option\ArrayInterface +class Frequency implements \Magento\Framework\Data\OptionSourceInterface { /** * @return array diff --git a/app/code/Magento/AdvancedSearch/Model/Adminhtml/Search/Grid/Options.php b/app/code/Magento/AdvancedSearch/Model/Adminhtml/Search/Grid/Options.php index b139689dbc234..0821004a5409d 100644 --- a/app/code/Magento/AdvancedSearch/Model/Adminhtml/Search/Grid/Options.php +++ b/app/code/Magento/AdvancedSearch/Model/Adminhtml/Search/Grid/Options.php @@ -11,7 +11,7 @@ * @api * @since 100.0.2 */ -class Options implements \Magento\Framework\Option\ArrayInterface +class Options implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\Framework\App\RequestInterface diff --git a/app/code/Magento/Analytics/Model/Config/Source/Vertical.php b/app/code/Magento/Analytics/Model/Config/Source/Vertical.php index c9d9582ea7c7a..13291b2730f78 100644 --- a/app/code/Magento/Analytics/Model/Config/Source/Vertical.php +++ b/app/code/Magento/Analytics/Model/Config/Source/Vertical.php @@ -11,7 +11,7 @@ * Prepares and provides options for a selector of verticals which is located * in the corresponding configuration menu of the Admin area. */ -class Vertical implements \Magento\Framework\Option\ArrayInterface +class Vertical implements \Magento\Framework\Data\OptionSourceInterface { /** * The list of possible verticals. diff --git a/app/code/Magento/Authorizenet/Model/Source/PaymentAction.php b/app/code/Magento/Authorizenet/Model/Source/PaymentAction.php index 9943e1001da56..8a30f0c5f32ee 100644 --- a/app/code/Magento/Authorizenet/Model/Source/PaymentAction.php +++ b/app/code/Magento/Authorizenet/Model/Source/PaymentAction.php @@ -3,28 +3,32 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + +declare(strict_types=1); + namespace Magento\Authorizenet\Model\Source; -use Magento\Framework\Option\ArrayInterface; +use Magento\Authorizenet\Model\Authorizenet; +use Magento\Framework\Data\OptionSourceInterface; /** * * Authorize.net Payment Action Dropdown source */ -class PaymentAction implements ArrayInterface +class PaymentAction implements OptionSourceInterface { /** * {@inheritdoc} */ - public function toOptionArray() + public function toOptionArray(): array { return [ [ - 'value' => \Magento\Authorizenet\Model\Authorizenet::ACTION_AUTHORIZE, + 'value' => Authorizenet::ACTION_AUTHORIZE, 'label' => __('Authorize Only'), ], [ - 'value' => \Magento\Authorizenet\Model\Authorizenet::ACTION_AUTHORIZE_CAPTURE, + 'value' => Authorizenet::ACTION_AUTHORIZE_CAPTURE, 'label' => __('Authorize and Capture') ] ]; diff --git a/app/code/Magento/Backup/Model/Config/Source/Type.php b/app/code/Magento/Backup/Model/Config/Source/Type.php index d8a7f139a1710..60d00694d1bb9 100644 --- a/app/code/Magento/Backup/Model/Config/Source/Type.php +++ b/app/code/Magento/Backup/Model/Config/Source/Type.php @@ -12,7 +12,7 @@ * @api * @since 100.0.2 */ -class Type implements \Magento\Framework\Option\ArrayInterface +class Type implements \Magento\Framework\Data\OptionSourceInterface { /** * Backup data diff --git a/app/code/Magento/Backup/Model/Grid/Options.php b/app/code/Magento/Backup/Model/Grid/Options.php index 762b8ddc3e518..31807553eab87 100644 --- a/app/code/Magento/Backup/Model/Grid/Options.php +++ b/app/code/Magento/Backup/Model/Grid/Options.php @@ -15,7 +15,7 @@ * @api * @since 100.0.2 */ -class Options implements \Magento\Framework\Option\ArrayInterface +class Options implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\Backup\Helper\Data diff --git a/app/code/Magento/Braintree/Model/Adminhtml/Source/Environment.php b/app/code/Magento/Braintree/Model/Adminhtml/Source/Environment.php index 77cf05a611b70..2374102bd0af4 100644 --- a/app/code/Magento/Braintree/Model/Adminhtml/Source/Environment.php +++ b/app/code/Magento/Braintree/Model/Adminhtml/Source/Environment.php @@ -5,12 +5,12 @@ */ namespace Magento\Braintree\Model\Adminhtml\Source; -use Magento\Framework\Option\ArrayInterface; +use Magento\Framework\Data\OptionSourceInterface; /** * Class Environment */ -class Environment implements ArrayInterface +class Environment implements OptionSourceInterface { const ENVIRONMENT_PRODUCTION = 'production'; const ENVIRONMENT_SANDBOX = 'sandbox'; diff --git a/app/code/Magento/Braintree/Model/Adminhtml/Source/PaymentAction.php b/app/code/Magento/Braintree/Model/Adminhtml/Source/PaymentAction.php index 595d8b4792a62..acc77866cbd29 100644 --- a/app/code/Magento/Braintree/Model/Adminhtml/Source/PaymentAction.php +++ b/app/code/Magento/Braintree/Model/Adminhtml/Source/PaymentAction.php @@ -5,13 +5,13 @@ */ namespace Magento\Braintree\Model\Adminhtml\Source; -use Magento\Framework\Option\ArrayInterface; +use Magento\Framework\Data\OptionSourceInterface; use Magento\Payment\Model\MethodInterface; /** * Class PaymentAction */ -class PaymentAction implements ArrayInterface +class PaymentAction implements OptionSourceInterface { /** * Possible actions on order place diff --git a/app/code/Magento/Braintree/Model/Adminhtml/System/Config/Country.php b/app/code/Magento/Braintree/Model/Adminhtml/System/Config/Country.php index ae154e768ed09..ef2bb3796b2c6 100644 --- a/app/code/Magento/Braintree/Model/Adminhtml/System/Config/Country.php +++ b/app/code/Magento/Braintree/Model/Adminhtml/System/Config/Country.php @@ -6,12 +6,12 @@ namespace Magento\Braintree\Model\Adminhtml\System\Config; use Magento\Directory\Model\ResourceModel\Country\Collection; -use Magento\Framework\Option\ArrayInterface; +use Magento\Framework\Data\OptionSourceInterface; /** * Class Country */ -class Country implements ArrayInterface +class Country implements OptionSourceInterface { /** * @var array diff --git a/app/code/Magento/Bundle/Model/Source/Option/Selection/Price/Type.php b/app/code/Magento/Bundle/Model/Source/Option/Selection/Price/Type.php index 2f7182db84d8e..5f53532a1e179 100644 --- a/app/code/Magento/Bundle/Model/Source/Option/Selection/Price/Type.php +++ b/app/code/Magento/Bundle/Model/Source/Option/Selection/Price/Type.php @@ -13,7 +13,7 @@ * @api * @since 100.0.2 */ -class Type implements \Magento\Framework\Option\ArrayInterface +class Type implements \Magento\Framework\Data\OptionSourceInterface { /** * @return array diff --git a/app/code/Magento/Bundle/Model/Source/Option/Type.php b/app/code/Magento/Bundle/Model/Source/Option/Type.php index f129d24ade671..3f3698773b76e 100644 --- a/app/code/Magento/Bundle/Model/Source/Option/Type.php +++ b/app/code/Magento/Bundle/Model/Source/Option/Type.php @@ -16,8 +16,8 @@ * */ class Type extends \Magento\Framework\Model\AbstractExtensibleModel implements - \Magento\Framework\Option\ArrayInterface, - \Magento\Bundle\Api\Data\OptionTypeInterface + \Magento\Bundle\Api\Data\OptionTypeInterface, + \Magento\Framework\Data\OptionSourceInterface { /**#@+ * Constants diff --git a/app/code/Magento/Captcha/Model/Config/Font.php b/app/code/Magento/Captcha/Model/Config/Font.php index cce57e6ced81a..c1aacc439b048 100644 --- a/app/code/Magento/Captcha/Model/Config/Font.php +++ b/app/code/Magento/Captcha/Model/Config/Font.php @@ -11,7 +11,7 @@ */ namespace Magento\Captcha\Model\Config; -class Font implements \Magento\Framework\Option\ArrayInterface +class Font implements \Magento\Framework\Data\OptionSourceInterface { /** * Captcha data diff --git a/app/code/Magento/Captcha/Model/Config/Form/AbstractForm.php b/app/code/Magento/Captcha/Model/Config/Form/AbstractForm.php index 811e455af534a..e9d66f18b859f 100644 --- a/app/code/Magento/Captcha/Model/Config/Form/AbstractForm.php +++ b/app/code/Magento/Captcha/Model/Config/Form/AbstractForm.php @@ -13,7 +13,7 @@ use Magento\Framework\App\Config\Value; -abstract class AbstractForm extends Value implements \Magento\Framework\Option\ArrayInterface +abstract class AbstractForm extends Value implements \Magento\Framework\Data\OptionSourceInterface { /** * @var string diff --git a/app/code/Magento/Captcha/Model/Config/Mode.php b/app/code/Magento/Captcha/Model/Config/Mode.php index b1f0239e73537..eba42d45197a6 100644 --- a/app/code/Magento/Captcha/Model/Config/Mode.php +++ b/app/code/Magento/Captcha/Model/Config/Mode.php @@ -11,7 +11,7 @@ */ namespace Magento\Captcha\Model\Config; -class Mode implements \Magento\Framework\Option\ArrayInterface +class Mode implements \Magento\Framework\Data\OptionSourceInterface { /** * Get options for captcha mode selection field diff --git a/app/code/Magento/Catalog/Model/Config/Source/Category.php b/app/code/Magento/Catalog/Model/Config/Source/Category.php index 24d7cc0b67378..2c1af2fa63447 100644 --- a/app/code/Magento/Catalog/Model/Config/Source/Category.php +++ b/app/code/Magento/Catalog/Model/Config/Source/Category.php @@ -10,7 +10,7 @@ * * @SuppressWarnings(PHPMD.LongVariable) */ -class Category implements \Magento\Framework\Option\ArrayInterface +class Category implements \Magento\Framework\Data\OptionSourceInterface { /** * Category collection factory diff --git a/app/code/Magento/Catalog/Model/Config/Source/GridPerPage.php b/app/code/Magento/Catalog/Model/Config/Source/GridPerPage.php index c3311b7399db3..58b0dea749ac4 100644 --- a/app/code/Magento/Catalog/Model/Config/Source/GridPerPage.php +++ b/app/code/Magento/Catalog/Model/Config/Source/GridPerPage.php @@ -10,7 +10,7 @@ * * @author Magento Core Team */ -class GridPerPage implements \Magento\Framework\Option\ArrayInterface +class GridPerPage implements \Magento\Framework\Data\OptionSourceInterface { /** * Options diff --git a/app/code/Magento/Catalog/Model/Config/Source/LayoutList.php b/app/code/Magento/Catalog/Model/Config/Source/LayoutList.php index f7b7d6b9e48b9..46ff1d3bb0914 100644 --- a/app/code/Magento/Catalog/Model/Config/Source/LayoutList.php +++ b/app/code/Magento/Catalog/Model/Config/Source/LayoutList.php @@ -13,7 +13,7 @@ /** * Returns layout list for Web>Default Layouts>Default Product Layout/Default Category Layout */ -class LayoutList implements \Magento\Framework\Option\ArrayInterface +class LayoutList implements \Magento\Framework\Data\OptionSourceInterface { /** * @var array diff --git a/app/code/Magento/Catalog/Model/Config/Source/ListMode.php b/app/code/Magento/Catalog/Model/Config/Source/ListMode.php index 4b32e2d45e5f4..50daceb9c204a 100644 --- a/app/code/Magento/Catalog/Model/Config/Source/ListMode.php +++ b/app/code/Magento/Catalog/Model/Config/Source/ListMode.php @@ -5,7 +5,7 @@ */ namespace Magento\Catalog\Model\Config\Source; -class ListMode implements \Magento\Framework\Option\ArrayInterface +class ListMode implements \Magento\Framework\Data\OptionSourceInterface { /** * {@inheritdoc} diff --git a/app/code/Magento/Catalog/Model/Config/Source/ListPerPage.php b/app/code/Magento/Catalog/Model/Config/Source/ListPerPage.php index ae6cc555a6955..74a928100aec4 100644 --- a/app/code/Magento/Catalog/Model/Config/Source/ListPerPage.php +++ b/app/code/Magento/Catalog/Model/Config/Source/ListPerPage.php @@ -10,7 +10,7 @@ * * @author Magento Core Team */ -class ListPerPage implements \Magento\Framework\Option\ArrayInterface +class ListPerPage implements \Magento\Framework\Data\OptionSourceInterface { /** * Pager Options diff --git a/app/code/Magento/Catalog/Model/Config/Source/ListSort.php b/app/code/Magento/Catalog/Model/Config/Source/ListSort.php index 5cd2297fd7cbc..8c2654186898b 100644 --- a/app/code/Magento/Catalog/Model/Config/Source/ListSort.php +++ b/app/code/Magento/Catalog/Model/Config/Source/ListSort.php @@ -11,7 +11,7 @@ */ namespace Magento\Catalog\Model\Config\Source; -class ListSort implements \Magento\Framework\Option\ArrayInterface +class ListSort implements \Magento\Framework\Data\OptionSourceInterface { /** * Catalog config diff --git a/app/code/Magento/Catalog/Model/Config/Source/Price/Scope.php b/app/code/Magento/Catalog/Model/Config/Source/Price/Scope.php index 173788aa34e66..0057bc2948f19 100644 --- a/app/code/Magento/Catalog/Model/Config/Source/Price/Scope.php +++ b/app/code/Magento/Catalog/Model/Config/Source/Price/Scope.php @@ -5,7 +5,7 @@ */ namespace Magento\Catalog\Model\Config\Source\Price; -class Scope implements \Magento\Framework\Option\ArrayInterface +class Scope implements \Magento\Framework\Data\OptionSourceInterface { /** * {@inheritdoc} diff --git a/app/code/Magento/Catalog/Model/Config/Source/Price/Step.php b/app/code/Magento/Catalog/Model/Config/Source/Price/Step.php index fbb0ddb91186d..db172626393b3 100644 --- a/app/code/Magento/Catalog/Model/Config/Source/Price/Step.php +++ b/app/code/Magento/Catalog/Model/Config/Source/Price/Step.php @@ -6,9 +6,9 @@ namespace Magento\Catalog\Model\Config\Source\Price; use Magento\Catalog\Model\Layer\Filter\Dynamic\AlgorithmFactory; -use Magento\Framework\Option\ArrayInterface; +use Magento\Framework\Data\OptionSourceInterface; -class Step implements ArrayInterface +class Step implements OptionSourceInterface { /** * {@inheritdoc} diff --git a/app/code/Magento/Catalog/Model/Config/Source/Product/Options/Type.php b/app/code/Magento/Catalog/Model/Config/Source/Product/Options/Type.php index 8f6e34ca81e3a..9f1e333b04f38 100644 --- a/app/code/Magento/Catalog/Model/Config/Source/Product/Options/Type.php +++ b/app/code/Magento/Catalog/Model/Config/Source/Product/Options/Type.php @@ -8,7 +8,7 @@ /** * Product option types mode source */ -class Type implements \Magento\Framework\Option\ArrayInterface +class Type implements \Magento\Framework\Data\OptionSourceInterface { /** * Product Option Config diff --git a/app/code/Magento/Catalog/Model/Config/Source/Product/Thumbnail.php b/app/code/Magento/Catalog/Model/Config/Source/Product/Thumbnail.php index 4424baf350fa6..3dcbc2ba2a5b4 100644 --- a/app/code/Magento/Catalog/Model/Config/Source/Product/Thumbnail.php +++ b/app/code/Magento/Catalog/Model/Config/Source/Product/Thumbnail.php @@ -9,7 +9,7 @@ * Catalog products per page on Grid mode source * */ -class Thumbnail implements \Magento\Framework\Option\ArrayInterface +class Thumbnail implements \Magento\Framework\Data\OptionSourceInterface { const OPTION_USE_PARENT_IMAGE = 'parent'; diff --git a/app/code/Magento/Catalog/Model/Config/Source/TimeFormat.php b/app/code/Magento/Catalog/Model/Config/Source/TimeFormat.php index e601028ffaf0d..b8eda56b5a181 100644 --- a/app/code/Magento/Catalog/Model/Config/Source/TimeFormat.php +++ b/app/code/Magento/Catalog/Model/Config/Source/TimeFormat.php @@ -5,7 +5,7 @@ */ namespace Magento\Catalog\Model\Config\Source; -class TimeFormat implements \Magento\Framework\Option\ArrayInterface +class TimeFormat implements \Magento\Framework\Data\OptionSourceInterface { /** * {@inheritdoc} diff --git a/app/code/Magento/Catalog/Model/Config/Source/Watermark/Position.php b/app/code/Magento/Catalog/Model/Config/Source/Watermark/Position.php index 83f4313724694..8f89fec9ab8e1 100644 --- a/app/code/Magento/Catalog/Model/Config/Source/Watermark/Position.php +++ b/app/code/Magento/Catalog/Model/Config/Source/Watermark/Position.php @@ -11,7 +11,7 @@ */ namespace Magento\Catalog\Model\Config\Source\Watermark; -class Position implements \Magento\Framework\Option\ArrayInterface +class Position implements \Magento\Framework\Data\OptionSourceInterface { /** * Get available options diff --git a/app/code/Magento/CatalogInventory/Model/Source/Backorders.php b/app/code/Magento/CatalogInventory/Model/Source/Backorders.php index 0bffb9a9888cd..b34e3eddfc79c 100644 --- a/app/code/Magento/CatalogInventory/Model/Source/Backorders.php +++ b/app/code/Magento/CatalogInventory/Model/Source/Backorders.php @@ -14,7 +14,7 @@ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html */ -class Backorders implements \Magento\Framework\Option\ArrayInterface +class Backorders implements \Magento\Framework\Data\OptionSourceInterface { /** * @return array diff --git a/app/code/Magento/Checkout/Model/Adminhtml/BillingAddressDisplayOptions.php b/app/code/Magento/Checkout/Model/Adminhtml/BillingAddressDisplayOptions.php index 7352177528515..b6e7f5f501b6c 100644 --- a/app/code/Magento/Checkout/Model/Adminhtml/BillingAddressDisplayOptions.php +++ b/app/code/Magento/Checkout/Model/Adminhtml/BillingAddressDisplayOptions.php @@ -5,13 +5,13 @@ */ namespace Magento\Checkout\Model\Adminhtml; -use Magento\Framework\Option\ArrayInterface; +use Magento\Framework\Data\OptionSourceInterface; /** * BillingAddressDisplayOptions gets list of configuration options for billing address displaying on * the Payment step on checkout */ -class BillingAddressDisplayOptions implements ArrayInterface +class BillingAddressDisplayOptions implements OptionSourceInterface { /** * Return array of options for billing address displaying on checkout payment step diff --git a/app/code/Magento/Checkout/Model/Config/Source/Cart/Summary.php b/app/code/Magento/Checkout/Model/Config/Source/Cart/Summary.php index 1cb6056b521a9..96c1b3af8ab25 100644 --- a/app/code/Magento/Checkout/Model/Config/Source/Cart/Summary.php +++ b/app/code/Magento/Checkout/Model/Config/Source/Cart/Summary.php @@ -5,7 +5,7 @@ */ namespace Magento\Checkout\Model\Config\Source\Cart; -class Summary implements \Magento\Framework\Option\ArrayInterface +class Summary implements \Magento\Framework\Data\OptionSourceInterface { /** * @return array diff --git a/app/code/Magento/Cms/Model/Config/Source/Page.php b/app/code/Magento/Cms/Model/Config/Source/Page.php index 9ac1208308126..7971884eeff32 100644 --- a/app/code/Magento/Cms/Model/Config/Source/Page.php +++ b/app/code/Magento/Cms/Model/Config/Source/Page.php @@ -10,7 +10,7 @@ /** * Class Page */ -class Page implements \Magento\Framework\Option\ArrayInterface +class Page implements \Magento\Framework\Data\OptionSourceInterface { /** * @var array diff --git a/app/code/Magento/Cms/Model/Config/Source/Wysiwyg/Editor.php b/app/code/Magento/Cms/Model/Config/Source/Wysiwyg/Editor.php index 2997a624a6c10..e7b961da79c28 100644 --- a/app/code/Magento/Cms/Model/Config/Source/Wysiwyg/Editor.php +++ b/app/code/Magento/Cms/Model/Config/Source/Wysiwyg/Editor.php @@ -8,7 +8,7 @@ /** * Configuration source model for Wysiwyg toggling */ -class Editor implements \Magento\Framework\Option\ArrayInterface +class Editor implements \Magento\Framework\Data\OptionSourceInterface { /** * @var array diff --git a/app/code/Magento/Cms/Model/Config/Source/Wysiwyg/Enabled.php b/app/code/Magento/Cms/Model/Config/Source/Wysiwyg/Enabled.php index 763b93f520527..3215d0c735674 100644 --- a/app/code/Magento/Cms/Model/Config/Source/Wysiwyg/Enabled.php +++ b/app/code/Magento/Cms/Model/Config/Source/Wysiwyg/Enabled.php @@ -8,7 +8,7 @@ /** * Configuration source model for Wysiwyg toggling */ -class Enabled implements \Magento\Framework\Option\ArrayInterface +class Enabled implements \Magento\Framework\Data\OptionSourceInterface { /** * {@inheritdoc} diff --git a/app/code/Magento/Config/Model/Config/Source/Admin/Page.php b/app/code/Magento/Config/Model/Config/Source/Admin/Page.php index a4ede7e8d1468..9d94ac6d06c1e 100644 --- a/app/code/Magento/Config/Model/Config/Source/Admin/Page.php +++ b/app/code/Magento/Config/Model/Config/Source/Admin/Page.php @@ -11,7 +11,7 @@ * @api * @since 100.0.2 */ -class Page implements \Magento\Framework\Option\ArrayInterface +class Page implements \Magento\Framework\Data\OptionSourceInterface { /** * Menu model diff --git a/app/code/Magento/Config/Model/Config/Source/Date/Short.php b/app/code/Magento/Config/Model/Config/Source/Date/Short.php index 90ac0d3d5fb35..677dc23b588fb 100644 --- a/app/code/Magento/Config/Model/Config/Source/Date/Short.php +++ b/app/code/Magento/Config/Model/Config/Source/Date/Short.php @@ -9,7 +9,7 @@ * @api * @since 100.0.2 */ -class Short implements \Magento\Framework\Option\ArrayInterface +class Short implements \Magento\Framework\Data\OptionSourceInterface { /** * @return array diff --git a/app/code/Magento/Config/Model/Config/Source/Design/Robots.php b/app/code/Magento/Config/Model/Config/Source/Design/Robots.php index 415e3389b3b4f..6d0c459f8eccb 100644 --- a/app/code/Magento/Config/Model/Config/Source/Design/Robots.php +++ b/app/code/Magento/Config/Model/Config/Source/Design/Robots.php @@ -9,7 +9,7 @@ * @api * @since 100.0.2 */ -class Robots implements \Magento\Framework\Option\ArrayInterface +class Robots implements \Magento\Framework\Data\OptionSourceInterface { /** * @return array diff --git a/app/code/Magento/Config/Model/Config/Source/Dev/Dbautoup.php b/app/code/Magento/Config/Model/Config/Source/Dev/Dbautoup.php index 868623b73ccbf..3649b9466fa4a 100644 --- a/app/code/Magento/Config/Model/Config/Source/Dev/Dbautoup.php +++ b/app/code/Magento/Config/Model/Config/Source/Dev/Dbautoup.php @@ -10,7 +10,7 @@ * @api * @since 100.0.2 */ -class Dbautoup implements \Magento\Framework\Option\ArrayInterface +class Dbautoup implements \Magento\Framework\Data\OptionSourceInterface { /** * @return array diff --git a/app/code/Magento/Config/Model/Config/Source/Email/Identity.php b/app/code/Magento/Config/Model/Config/Source/Email/Identity.php index 8cc7af6f619ac..ed393a7cbce3d 100644 --- a/app/code/Magento/Config/Model/Config/Source/Email/Identity.php +++ b/app/code/Magento/Config/Model/Config/Source/Email/Identity.php @@ -9,7 +9,7 @@ * @api * @since 100.0.2 */ -class Identity implements \Magento\Framework\Option\ArrayInterface +class Identity implements \Magento\Framework\Data\OptionSourceInterface { /** * Email Identity options diff --git a/app/code/Magento/Config/Model/Config/Source/Email/Method.php b/app/code/Magento/Config/Model/Config/Source/Email/Method.php index 4ce575b64d21b..6861d0c9e7898 100644 --- a/app/code/Magento/Config/Model/Config/Source/Email/Method.php +++ b/app/code/Magento/Config/Model/Config/Source/Email/Method.php @@ -15,7 +15,7 @@ * @api * @since 100.0.2 */ -class Method implements \Magento\Framework\Option\ArrayInterface +class Method implements \Magento\Framework\Data\OptionSourceInterface { /** * @return array diff --git a/app/code/Magento/Config/Model/Config/Source/Email/Smtpauth.php b/app/code/Magento/Config/Model/Config/Source/Email/Smtpauth.php index 1742d16e79c2e..3d2d09efe4508 100644 --- a/app/code/Magento/Config/Model/Config/Source/Email/Smtpauth.php +++ b/app/code/Magento/Config/Model/Config/Source/Email/Smtpauth.php @@ -9,7 +9,7 @@ * @api * @since 100.0.2 */ -class Smtpauth implements \Magento\Framework\Option\ArrayInterface +class Smtpauth implements \Magento\Framework\Data\OptionSourceInterface { /** * @return array diff --git a/app/code/Magento/Config/Model/Config/Source/Email/Template.php b/app/code/Magento/Config/Model/Config/Source/Email/Template.php index 04222733418d3..3b330ac379037 100644 --- a/app/code/Magento/Config/Model/Config/Source/Email/Template.php +++ b/app/code/Magento/Config/Model/Config/Source/Email/Template.php @@ -9,7 +9,7 @@ * @api * @since 100.0.2 */ -class Template extends \Magento\Framework\DataObject implements \Magento\Framework\Option\ArrayInterface +class Template extends \Magento\Framework\DataObject implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\Framework\Registry diff --git a/app/code/Magento/Config/Model/Config/Source/Enabledisable.php b/app/code/Magento/Config/Model/Config/Source/Enabledisable.php index c015f41a659d9..7e784ecb7b8cf 100644 --- a/app/code/Magento/Config/Model/Config/Source/Enabledisable.php +++ b/app/code/Magento/Config/Model/Config/Source/Enabledisable.php @@ -10,7 +10,7 @@ * @api * @since 100.0.2 */ -class Enabledisable implements \Magento\Framework\Option\ArrayInterface +class Enabledisable implements \Magento\Framework\Data\OptionSourceInterface { /** * Value which equal Enable for Enabledisable dropdown. diff --git a/app/code/Magento/Config/Model/Config/Source/Image/Adapter.php b/app/code/Magento/Config/Model/Config/Source/Image/Adapter.php index cfd86c9e75fe1..7cc7a051c6f21 100644 --- a/app/code/Magento/Config/Model/Config/Source/Image/Adapter.php +++ b/app/code/Magento/Config/Model/Config/Source/Image/Adapter.php @@ -9,7 +9,7 @@ * @api * @since 100.0.2 */ -class Adapter implements \Magento\Framework\Option\ArrayInterface +class Adapter implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\Framework\Image\Adapter\ConfigInterface diff --git a/app/code/Magento/Config/Model/Config/Source/Locale.php b/app/code/Magento/Config/Model/Config/Source/Locale.php index 62357aa159fe2..b4f25dce87ba4 100644 --- a/app/code/Magento/Config/Model/Config/Source/Locale.php +++ b/app/code/Magento/Config/Model/Config/Source/Locale.php @@ -13,7 +13,7 @@ * @api * @since 100.0.2 */ -class Locale implements \Magento\Framework\Option\ArrayInterface +class Locale implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\Framework\Locale\ListsInterface diff --git a/app/code/Magento/Config/Model/Config/Source/Locale/Country.php b/app/code/Magento/Config/Model/Config/Source/Locale/Country.php index 0724352d11bd5..a9bba501616a7 100644 --- a/app/code/Magento/Config/Model/Config/Source/Locale/Country.php +++ b/app/code/Magento/Config/Model/Config/Source/Locale/Country.php @@ -13,7 +13,7 @@ * @api * @since 100.0.2 */ -class Country implements \Magento\Framework\Option\ArrayInterface +class Country implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\Framework\Locale\ListsInterface diff --git a/app/code/Magento/Config/Model/Config/Source/Locale/Currency.php b/app/code/Magento/Config/Model/Config/Source/Locale/Currency.php index b3474674cf76d..c907c25369632 100644 --- a/app/code/Magento/Config/Model/Config/Source/Locale/Currency.php +++ b/app/code/Magento/Config/Model/Config/Source/Locale/Currency.php @@ -13,7 +13,7 @@ * @api * @since 100.0.2 */ -class Currency implements \Magento\Framework\Option\ArrayInterface +class Currency implements \Magento\Framework\Data\OptionSourceInterface { /** * @var array diff --git a/app/code/Magento/Config/Model/Config/Source/Locale/Currency/All.php b/app/code/Magento/Config/Model/Config/Source/Locale/Currency/All.php index bac1064cc2d1e..b0723e1026585 100644 --- a/app/code/Magento/Config/Model/Config/Source/Locale/Currency/All.php +++ b/app/code/Magento/Config/Model/Config/Source/Locale/Currency/All.php @@ -9,7 +9,7 @@ * @api * @since 100.0.2 */ -class All implements \Magento\Framework\Option\ArrayInterface +class All implements \Magento\Framework\Data\OptionSourceInterface { /** * @var array diff --git a/app/code/Magento/Config/Model/Config/Source/Locale/Timezone.php b/app/code/Magento/Config/Model/Config/Source/Locale/Timezone.php index 4813fd370e279..2d5abf3d37ed8 100644 --- a/app/code/Magento/Config/Model/Config/Source/Locale/Timezone.php +++ b/app/code/Magento/Config/Model/Config/Source/Locale/Timezone.php @@ -13,7 +13,7 @@ * @api * @since 100.0.2 */ -class Timezone implements \Magento\Framework\Option\ArrayInterface +class Timezone implements \Magento\Framework\Data\OptionSourceInterface { /** * Timezones that works incorrect with php_intl extension diff --git a/app/code/Magento/Config/Model/Config/Source/Locale/Weekdaycodes.php b/app/code/Magento/Config/Model/Config/Source/Locale/Weekdaycodes.php index 93375eaf1b67f..262cca1326301 100644 --- a/app/code/Magento/Config/Model/Config/Source/Locale/Weekdaycodes.php +++ b/app/code/Magento/Config/Model/Config/Source/Locale/Weekdaycodes.php @@ -13,7 +13,7 @@ * @api * @since 100.0.2 */ -class Weekdaycodes implements \Magento\Framework\Option\ArrayInterface +class Weekdaycodes implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\Framework\Locale\ListsInterface diff --git a/app/code/Magento/Config/Model/Config/Source/Locale/Weekdays.php b/app/code/Magento/Config/Model/Config/Source/Locale/Weekdays.php index 7e4507336d899..429086e064308 100644 --- a/app/code/Magento/Config/Model/Config/Source/Locale/Weekdays.php +++ b/app/code/Magento/Config/Model/Config/Source/Locale/Weekdays.php @@ -13,7 +13,7 @@ * @api * @since 100.0.2 */ -class Weekdays implements \Magento\Framework\Option\ArrayInterface +class Weekdays implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\Framework\Locale\ListsInterface diff --git a/app/code/Magento/Config/Model/Config/Source/Nooptreq.php b/app/code/Magento/Config/Model/Config/Source/Nooptreq.php index 1c9eb801dfec7..6a2f4937ad123 100644 --- a/app/code/Magento/Config/Model/Config/Source/Nooptreq.php +++ b/app/code/Magento/Config/Model/Config/Source/Nooptreq.php @@ -9,7 +9,7 @@ * @api * @since 100.0.2 */ -class Nooptreq implements \Magento\Framework\Option\ArrayInterface +class Nooptreq implements \Magento\Framework\Data\OptionSourceInterface { const VALUE_NO = ''; const VALUE_OPTIONAL = 'opt'; diff --git a/app/code/Magento/Config/Model/Config/Source/Reports/Scope.php b/app/code/Magento/Config/Model/Config/Source/Reports/Scope.php index f52a1cb5d3f6b..d9738c3e42315 100644 --- a/app/code/Magento/Config/Model/Config/Source/Reports/Scope.php +++ b/app/code/Magento/Config/Model/Config/Source/Reports/Scope.php @@ -15,7 +15,7 @@ * @api * @since 100.0.2 */ -class Scope implements \Magento\Framework\Option\ArrayInterface +class Scope implements \Magento\Framework\Data\OptionSourceInterface { /** * Scope filter diff --git a/app/code/Magento/Config/Model/Config/Source/Store.php b/app/code/Magento/Config/Model/Config/Source/Store.php index 7ba46677a08c7..0874f6a91074f 100644 --- a/app/code/Magento/Config/Model/Config/Source/Store.php +++ b/app/code/Magento/Config/Model/Config/Source/Store.php @@ -9,7 +9,7 @@ * @api * @since 100.0.2 */ -class Store implements \Magento\Framework\Option\ArrayInterface +class Store implements \Magento\Framework\Data\OptionSourceInterface { /** * @var array diff --git a/app/code/Magento/Config/Model/Config/Source/Web/Protocol.php b/app/code/Magento/Config/Model/Config/Source/Web/Protocol.php index d42d78e6417c4..68baf9447d670 100644 --- a/app/code/Magento/Config/Model/Config/Source/Web/Protocol.php +++ b/app/code/Magento/Config/Model/Config/Source/Web/Protocol.php @@ -9,7 +9,7 @@ * @api * @since 100.0.2 */ -class Protocol implements \Magento\Framework\Option\ArrayInterface +class Protocol implements \Magento\Framework\Data\OptionSourceInterface { /** * @return array diff --git a/app/code/Magento/Config/Model/Config/Source/Web/Redirect.php b/app/code/Magento/Config/Model/Config/Source/Web/Redirect.php index 100e9a12d15b6..d09c4413a006a 100644 --- a/app/code/Magento/Config/Model/Config/Source/Web/Redirect.php +++ b/app/code/Magento/Config/Model/Config/Source/Web/Redirect.php @@ -9,7 +9,7 @@ * @api * @since 100.0.2 */ -class Redirect implements \Magento\Framework\Option\ArrayInterface +class Redirect implements \Magento\Framework\Data\OptionSourceInterface { /** * @return array diff --git a/app/code/Magento/Config/Model/Config/Source/Website.php b/app/code/Magento/Config/Model/Config/Source/Website.php index 40583d93187e2..e65ca7af751ef 100644 --- a/app/code/Magento/Config/Model/Config/Source/Website.php +++ b/app/code/Magento/Config/Model/Config/Source/Website.php @@ -9,7 +9,7 @@ * @api * @since 100.0.2 */ -class Website implements \Magento\Framework\Option\ArrayInterface +class Website implements \Magento\Framework\Data\OptionSourceInterface { /** * @var array diff --git a/app/code/Magento/Config/Model/Config/Source/Website/OptionHash.php b/app/code/Magento/Config/Model/Config/Source/Website/OptionHash.php index d9b2783cad84c..e101e67e17fa6 100644 --- a/app/code/Magento/Config/Model/Config/Source/Website/OptionHash.php +++ b/app/code/Magento/Config/Model/Config/Source/Website/OptionHash.php @@ -5,14 +5,14 @@ */ namespace Magento\Config\Model\Config\Source\Website; -use Magento\Framework\Option\ArrayInterface; +use Magento\Framework\Data\OptionSourceInterface; use Magento\Store\Model\System\Store; /** * @api * @since 100.0.2 */ -class OptionHash implements ArrayInterface +class OptionHash implements OptionSourceInterface { /** * System Store Model diff --git a/app/code/Magento/Config/Model/Config/Source/Yesno.php b/app/code/Magento/Config/Model/Config/Source/Yesno.php index bdc39ee3a6f20..8ae47a3d14ce7 100644 --- a/app/code/Magento/Config/Model/Config/Source/Yesno.php +++ b/app/code/Magento/Config/Model/Config/Source/Yesno.php @@ -9,7 +9,7 @@ * @api * @since 100.0.2 */ -class Yesno implements \Magento\Framework\Option\ArrayInterface +class Yesno implements \Magento\Framework\Data\OptionSourceInterface { /** * Options getter diff --git a/app/code/Magento/Config/Model/Config/Source/Yesnocustom.php b/app/code/Magento/Config/Model/Config/Source/Yesnocustom.php index 939d512f72f20..51a2ac48b6110 100644 --- a/app/code/Magento/Config/Model/Config/Source/Yesnocustom.php +++ b/app/code/Magento/Config/Model/Config/Source/Yesnocustom.php @@ -14,7 +14,7 @@ * @api * @since 100.0.2 */ -class Yesnocustom implements \Magento\Framework\Option\ArrayInterface +class Yesnocustom implements \Magento\Framework\Data\OptionSourceInterface { /** * Options getter diff --git a/app/code/Magento/Config/Model/Config/SourceFactory.php b/app/code/Magento/Config/Model/Config/SourceFactory.php index 52a136f697dc0..8d947750dfb5c 100644 --- a/app/code/Magento/Config/Model/Config/SourceFactory.php +++ b/app/code/Magento/Config/Model/Config/SourceFactory.php @@ -30,7 +30,7 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan * Create backend model by name * * @param string $modelName - * @return \Magento\Framework\Option\ArrayInterface + * @return \Magento\Framework\Data\OptionSourceInterface */ public function create($modelName) { diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/FieldTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/FieldTest.php index 58973a13f3e87..e04d84a88e019 100644 --- a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/FieldTest.php +++ b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/FieldTest.php @@ -308,7 +308,7 @@ public function testGetOptionsWithConstantValOptions() public function testGetOptionsUsesOptionsInterfaceIfNoMethodIsProvided() { $this->_model->setData(['source_model' => 'Source_Model_Name'], 'scope'); - $sourceModelMock = $this->createMock(\Magento\Framework\Option\ArrayInterface::class); + $sourceModelMock = $this->createMock(\Magento\Framework\Data\OptionSourceInterface::class); $this->_sourceFactoryMock->expects( $this->once() )->method( diff --git a/app/code/Magento/Cron/Model/Config/Source/Frequency.php b/app/code/Magento/Cron/Model/Config/Source/Frequency.php index 5b205a2690799..79020167c164e 100644 --- a/app/code/Magento/Cron/Model/Config/Source/Frequency.php +++ b/app/code/Magento/Cron/Model/Config/Source/Frequency.php @@ -5,7 +5,7 @@ */ namespace Magento\Cron\Model\Config\Source; -class Frequency implements \Magento\Framework\Option\ArrayInterface +class Frequency implements \Magento\Framework\Data\OptionSourceInterface { /** * @var array diff --git a/app/code/Magento/Customer/Model/Config/Share.php b/app/code/Magento/Customer/Model/Config/Share.php index e5dda28afa095..73d615c0ea029 100644 --- a/app/code/Magento/Customer/Model/Config/Share.php +++ b/app/code/Magento/Customer/Model/Config/Share.php @@ -10,7 +10,7 @@ * * @author Magento Core Team */ -class Share extends \Magento\Framework\App\Config\Value implements \Magento\Framework\Option\ArrayInterface +class Share extends \Magento\Framework\App\Config\Value implements \Magento\Framework\Data\OptionSourceInterface { /** * Xml config path to customers sharing scope value diff --git a/app/code/Magento/Customer/Model/Config/Source/Address/Type.php b/app/code/Magento/Customer/Model/Config/Source/Address/Type.php index 76ab43755ce86..5f61651ff28fd 100644 --- a/app/code/Magento/Customer/Model/Config/Source/Address/Type.php +++ b/app/code/Magento/Customer/Model/Config/Source/Address/Type.php @@ -11,7 +11,7 @@ */ namespace Magento\Customer\Model\Config\Source\Address; -class Type implements \Magento\Framework\Option\ArrayInterface +class Type implements \Magento\Framework\Data\OptionSourceInterface { /** * Retrieve possible customer address types diff --git a/app/code/Magento/Customer/Model/Config/Source/Group.php b/app/code/Magento/Customer/Model/Config/Source/Group.php index 7132b8ad4cedf..321bffb75df35 100644 --- a/app/code/Magento/Customer/Model/Config/Source/Group.php +++ b/app/code/Magento/Customer/Model/Config/Source/Group.php @@ -9,7 +9,7 @@ use Magento\Customer\Model\Customer\Attribute\Source\GroupSourceLoggedInOnlyInterface; use Magento\Framework\App\ObjectManager; -class Group implements \Magento\Framework\Option\ArrayInterface +class Group implements \Magento\Framework\Data\OptionSourceInterface { /** * @var array diff --git a/app/code/Magento/Customer/Model/Config/Source/Group/Multiselect.php b/app/code/Magento/Customer/Model/Config/Source/Group/Multiselect.php index bf1fae8d34bed..9da64f8fbc243 100644 --- a/app/code/Magento/Customer/Model/Config/Source/Group/Multiselect.php +++ b/app/code/Magento/Customer/Model/Config/Source/Group/Multiselect.php @@ -9,7 +9,7 @@ use Magento\Customer\Api\GroupManagementInterface; use Magento\Framework\App\ObjectManager; -class Multiselect implements \Magento\Framework\Option\ArrayInterface +class Multiselect implements \Magento\Framework\Data\OptionSourceInterface { /** * Customer groups options array diff --git a/app/code/Magento/Developer/Model/Config/Source/WorkflowType.php b/app/code/Magento/Developer/Model/Config/Source/WorkflowType.php index 813312b9ee807..439f1fc979818 100644 --- a/app/code/Magento/Developer/Model/Config/Source/WorkflowType.php +++ b/app/code/Magento/Developer/Model/Config/Source/WorkflowType.php @@ -5,7 +5,7 @@ */ namespace Magento\Developer\Model\Config\Source; -use Magento\Framework\Option\ArrayInterface; +use Magento\Framework\Data\OptionSourceInterface; /** * Class WorkflowType @@ -13,7 +13,7 @@ * @api * @since 100.0.2 */ -class WorkflowType implements ArrayInterface +class WorkflowType implements OptionSourceInterface { /** * Constant for diff --git a/app/code/Magento/Developer/Test/Unit/Model/Config/Source/WorkflowTypeTest.php b/app/code/Magento/Developer/Test/Unit/Model/Config/Source/WorkflowTypeTest.php index 32518a2fd8218..12d0138cfa504 100644 --- a/app/code/Magento/Developer/Test/Unit/Model/Config/Source/WorkflowTypeTest.php +++ b/app/code/Magento/Developer/Test/Unit/Model/Config/Source/WorkflowTypeTest.php @@ -26,7 +26,7 @@ protected function setUp() public function testToOptionArray() { - $this->assertInstanceOf(\Magento\Framework\Option\ArrayInterface::class, $this->model); + $this->assertInstanceOf(\Magento\Framework\Data\OptionSourceInterface::class, $this->model); $this->assertCount(2, $this->model->toOptionArray()); $option = current($this->model->toOptionArray()); diff --git a/app/code/Magento/Dhl/Model/Source/Contenttype.php b/app/code/Magento/Dhl/Model/Source/Contenttype.php index 9c36ef1d54872..9a416c8a55d25 100644 --- a/app/code/Magento/Dhl/Model/Source/Contenttype.php +++ b/app/code/Magento/Dhl/Model/Source/Contenttype.php @@ -8,7 +8,7 @@ /** * Source model for DHL Content Type */ -class Contenttype implements \Magento\Framework\Option\ArrayInterface +class Contenttype implements \Magento\Framework\Data\OptionSourceInterface { /** * {@inheritdoc} diff --git a/app/code/Magento/Directory/Model/Config/Source/Allregion.php b/app/code/Magento/Directory/Model/Config/Source/Allregion.php index c86cfed33e92c..7fb4a70646f18 100644 --- a/app/code/Magento/Directory/Model/Config/Source/Allregion.php +++ b/app/code/Magento/Directory/Model/Config/Source/Allregion.php @@ -11,7 +11,7 @@ * @api * @since 100.0.2 */ -class Allregion implements \Magento\Framework\Option\ArrayInterface +class Allregion implements \Magento\Framework\Data\OptionSourceInterface { /** * @var array diff --git a/app/code/Magento/Directory/Model/Config/Source/Country.php b/app/code/Magento/Directory/Model/Config/Source/Country.php index a38ac4b62e1ee..fdf91baec131f 100644 --- a/app/code/Magento/Directory/Model/Config/Source/Country.php +++ b/app/code/Magento/Directory/Model/Config/Source/Country.php @@ -11,7 +11,7 @@ * @api * @since 100.0.2 */ -class Country implements \Magento\Framework\Option\ArrayInterface +class Country implements \Magento\Framework\Data\OptionSourceInterface { /** * Countries diff --git a/app/code/Magento/Directory/Model/Config/Source/Country/Full.php b/app/code/Magento/Directory/Model/Config/Source/Country/Full.php index e3c4e17c4bd75..0b6b0be6b9c4a 100644 --- a/app/code/Magento/Directory/Model/Config/Source/Country/Full.php +++ b/app/code/Magento/Directory/Model/Config/Source/Country/Full.php @@ -13,7 +13,7 @@ * @codeCoverageIgnore * @since 100.0.2 */ -class Full extends \Magento\Directory\Model\Config\Source\Country implements \Magento\Framework\Option\ArrayInterface +class Full extends \Magento\Directory\Model\Config\Source\Country implements \Magento\Framework\Data\OptionSourceInterface { /** * @inheritdoc diff --git a/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php b/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php index 4e2758b362a43..9e7e736037be4 100644 --- a/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php +++ b/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php @@ -11,7 +11,7 @@ * @api * @since 100.0.2 */ -class WeightUnit implements \Magento\Framework\Option\ArrayInterface +class WeightUnit implements \Magento\Framework\Data\OptionSourceInterface { /** * {@inheritdoc} diff --git a/app/code/Magento/Directory/Model/Currency/Import/Source/Service.php b/app/code/Magento/Directory/Model/Currency/Import/Source/Service.php index 1babaeba3bf18..25bc21b4862b6 100644 --- a/app/code/Magento/Directory/Model/Currency/Import/Source/Service.php +++ b/app/code/Magento/Directory/Model/Currency/Import/Source/Service.php @@ -5,7 +5,7 @@ */ namespace Magento\Directory\Model\Currency\Import\Source; -class Service implements \Magento\Framework\Option\ArrayInterface +class Service implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\Directory\Model\Currency\Import\Config diff --git a/app/code/Magento/Downloadable/Model/System/Config/Source/Contentdisposition.php b/app/code/Magento/Downloadable/Model/System/Config/Source/Contentdisposition.php index 10354f6df10ab..7a28c0157ccd3 100644 --- a/app/code/Magento/Downloadable/Model/System/Config/Source/Contentdisposition.php +++ b/app/code/Magento/Downloadable/Model/System/Config/Source/Contentdisposition.php @@ -10,7 +10,7 @@ * * @author Magento Core Team */ -class Contentdisposition implements \Magento\Framework\Option\ArrayInterface +class Contentdisposition implements \Magento\Framework\Data\OptionSourceInterface { /** * @return array diff --git a/app/code/Magento/Downloadable/Model/System/Config/Source/Orderitemstatus.php b/app/code/Magento/Downloadable/Model/System/Config/Source/Orderitemstatus.php index 176c4337d0ce9..f481c7a4c6be3 100644 --- a/app/code/Magento/Downloadable/Model/System/Config/Source/Orderitemstatus.php +++ b/app/code/Magento/Downloadable/Model/System/Config/Source/Orderitemstatus.php @@ -10,7 +10,7 @@ * * @author Magento Core Team */ -class Orderitemstatus implements \Magento\Framework\Option\ArrayInterface +class Orderitemstatus implements \Magento\Framework\Data\OptionSourceInterface { /** * @return array diff --git a/app/code/Magento/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php b/app/code/Magento/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php index aa3b00126eee1..3f377a48df7e3 100644 --- a/app/code/Magento/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php +++ b/app/code/Magento/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php @@ -5,7 +5,7 @@ */ namespace Magento\Eav\Model\Adminhtml\System\Config\Source; -class Inputtype implements \Magento\Framework\Option\ArrayInterface +class Inputtype implements \Magento\Framework\Data\OptionSourceInterface { /** * @var array diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php index 0991b3f9f4b23..e791adbae8b14 100644 --- a/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php +++ b/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php @@ -15,7 +15,7 @@ */ abstract class AbstractSource implements \Magento\Eav\Model\Entity\Attribute\Source\SourceInterface, - \Magento\Framework\Option\ArrayInterface + \Magento\Framework\Data\OptionSourceInterface { /** * Reference to the attribute instance diff --git a/app/code/Magento/Fedex/Model/Source/Generic.php b/app/code/Magento/Fedex/Model/Source/Generic.php index f245685ce0274..77f705df1fb3d 100644 --- a/app/code/Magento/Fedex/Model/Source/Generic.php +++ b/app/code/Magento/Fedex/Model/Source/Generic.php @@ -5,7 +5,7 @@ */ namespace Magento\Fedex\Model\Source; -class Generic implements \Magento\Framework\Option\ArrayInterface +class Generic implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\Fedex\Model\Carrier diff --git a/app/code/Magento/GoogleAdwords/Model/Config/Source/Language.php b/app/code/Magento/GoogleAdwords/Model/Config/Source/Language.php index 34544229cdbf2..d5a8b1f18df96 100644 --- a/app/code/Magento/GoogleAdwords/Model/Config/Source/Language.php +++ b/app/code/Magento/GoogleAdwords/Model/Config/Source/Language.php @@ -12,7 +12,7 @@ * @api * @since 100.0.2 */ -class Language implements \Magento\Framework\Option\ArrayInterface +class Language implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\GoogleAdwords\Helper\Data diff --git a/app/code/Magento/GoogleAdwords/Model/Config/Source/ValueType.php b/app/code/Magento/GoogleAdwords/Model/Config/Source/ValueType.php index 22749b0002e45..e8fb6c892ef29 100644 --- a/app/code/Magento/GoogleAdwords/Model/Config/Source/ValueType.php +++ b/app/code/Magento/GoogleAdwords/Model/Config/Source/ValueType.php @@ -11,7 +11,7 @@ * @api * @since 100.0.2 */ -class ValueType implements \Magento\Framework\Option\ArrayInterface +class ValueType implements \Magento\Framework\Data\OptionSourceInterface { /** * Get conversation value type option diff --git a/app/code/Magento/ImportExport/Model/Source/Export/Entity.php b/app/code/Magento/ImportExport/Model/Source/Export/Entity.php index 2dacd658e1562..253bd1f3a34df 100644 --- a/app/code/Magento/ImportExport/Model/Source/Export/Entity.php +++ b/app/code/Magento/ImportExport/Model/Source/Export/Entity.php @@ -11,7 +11,7 @@ * @api * @since 100.0.2 */ -class Entity implements \Magento\Framework\Option\ArrayInterface +class Entity implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\ImportExport\Model\Export\ConfigInterface diff --git a/app/code/Magento/ImportExport/Model/Source/Export/Format.php b/app/code/Magento/ImportExport/Model/Source/Export/Format.php index 6888cdc8289fb..031b8eeac358e 100644 --- a/app/code/Magento/ImportExport/Model/Source/Export/Format.php +++ b/app/code/Magento/ImportExport/Model/Source/Export/Format.php @@ -11,7 +11,7 @@ * @api * @since 100.0.2 */ -class Format implements \Magento\Framework\Option\ArrayInterface +class Format implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\ImportExport\Model\Export\ConfigInterface diff --git a/app/code/Magento/ImportExport/Model/Source/Import/AbstractBehavior.php b/app/code/Magento/ImportExport/Model/Source/Import/AbstractBehavior.php index 9f83f10ad4d53..26188cfe649c7 100644 --- a/app/code/Magento/ImportExport/Model/Source/Import/AbstractBehavior.php +++ b/app/code/Magento/ImportExport/Model/Source/Import/AbstractBehavior.php @@ -11,7 +11,7 @@ * @api * @since 100.0.2 */ -abstract class AbstractBehavior implements \Magento\Framework\Option\ArrayInterface +abstract class AbstractBehavior implements \Magento\Framework\Data\OptionSourceInterface { /** * Get array of possible values diff --git a/app/code/Magento/ImportExport/Model/Source/Import/Entity.php b/app/code/Magento/ImportExport/Model/Source/Import/Entity.php index 8a85ec54c3870..9214b25f2eab9 100644 --- a/app/code/Magento/ImportExport/Model/Source/Import/Entity.php +++ b/app/code/Magento/ImportExport/Model/Source/Import/Entity.php @@ -11,7 +11,7 @@ * @api * @since 100.0.2 */ -class Entity implements \Magento\Framework\Option\ArrayInterface +class Entity implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\ImportExport\Model\Import\ConfigInterface diff --git a/app/code/Magento/Integration/Model/Integration/Source/Status.php b/app/code/Magento/Integration/Model/Integration/Source/Status.php index e762db23c6de7..4f9067637b2e5 100644 --- a/app/code/Magento/Integration/Model/Integration/Source/Status.php +++ b/app/code/Magento/Integration/Model/Integration/Source/Status.php @@ -8,7 +8,7 @@ /** * Integration status options. */ -class Status implements \Magento\Framework\Option\ArrayInterface +class Status implements \Magento\Framework\Data\OptionSourceInterface { /** * Retrieve status options array. diff --git a/app/code/Magento/MediaStorage/Model/Config/Source/Storage/Media/Database.php b/app/code/Magento/MediaStorage/Model/Config/Source/Storage/Media/Database.php index 83134c2ac00ef..4c2acd0f67f7a 100644 --- a/app/code/Magento/MediaStorage/Model/Config/Source/Storage/Media/Database.php +++ b/app/code/Magento/MediaStorage/Model/Config/Source/Storage/Media/Database.php @@ -12,7 +12,7 @@ use Magento\Framework\App\DeploymentConfig; use Magento\Framework\Config\ConfigOptionsListConstants; -class Database implements \Magento\Framework\Option\ArrayInterface +class Database implements \Magento\Framework\Data\OptionSourceInterface { /** * @var DeploymentConfig diff --git a/app/code/Magento/MediaStorage/Model/Config/Source/Storage/Media/Storage.php b/app/code/Magento/MediaStorage/Model/Config/Source/Storage/Media/Storage.php index fb171831407e2..2b5aff93b440d 100644 --- a/app/code/Magento/MediaStorage/Model/Config/Source/Storage/Media/Storage.php +++ b/app/code/Magento/MediaStorage/Model/Config/Source/Storage/Media/Storage.php @@ -9,7 +9,7 @@ */ namespace Magento\MediaStorage\Model\Config\Source\Storage\Media; -class Storage implements \Magento\Framework\Option\ArrayInterface +class Storage implements \Magento\Framework\Data\OptionSourceInterface { /** * Options getter diff --git a/app/code/Magento/Newsletter/Block/Subscribe/Grid/Options/GroupOptionHash.php b/app/code/Magento/Newsletter/Block/Subscribe/Grid/Options/GroupOptionHash.php index 0ff52313f4efd..89ee5543d4b41 100644 --- a/app/code/Magento/Newsletter/Block/Subscribe/Grid/Options/GroupOptionHash.php +++ b/app/code/Magento/Newsletter/Block/Subscribe/Grid/Options/GroupOptionHash.php @@ -7,7 +7,7 @@ */ namespace Magento\Newsletter\Block\Subscribe\Grid\Options; -class GroupOptionHash implements \Magento\Framework\Option\ArrayInterface +class GroupOptionHash implements \Magento\Framework\Data\OptionSourceInterface { /** * System Store Model diff --git a/app/code/Magento/Newsletter/Block/Subscribe/Grid/Options/StoreOptionHash.php b/app/code/Magento/Newsletter/Block/Subscribe/Grid/Options/StoreOptionHash.php index a713a049a0e7d..c6d3cd38b7e6d 100644 --- a/app/code/Magento/Newsletter/Block/Subscribe/Grid/Options/StoreOptionHash.php +++ b/app/code/Magento/Newsletter/Block/Subscribe/Grid/Options/StoreOptionHash.php @@ -7,7 +7,7 @@ */ namespace Magento\Newsletter\Block\Subscribe\Grid\Options; -class StoreOptionHash implements \Magento\Framework\Option\ArrayInterface +class StoreOptionHash implements \Magento\Framework\Data\OptionSourceInterface { /** * System Store Model diff --git a/app/code/Magento/Newsletter/Model/Queue/Options/Status.php b/app/code/Magento/Newsletter/Model/Queue/Options/Status.php index 72a7986b6ae8f..8e64c97d26d23 100644 --- a/app/code/Magento/Newsletter/Model/Queue/Options/Status.php +++ b/app/code/Magento/Newsletter/Model/Queue/Options/Status.php @@ -11,7 +11,7 @@ */ namespace Magento\Newsletter\Model\Queue\Options; -class Status implements \Magento\Framework\Option\ArrayInterface +class Status implements \Magento\Framework\Data\OptionSourceInterface { /** * Return statuses option array diff --git a/app/code/Magento/OfflineShipping/Model/Config/Source/Flatrate.php b/app/code/Magento/OfflineShipping/Model/Config/Source/Flatrate.php index ad549cb398cf7..318ed7b9275f4 100644 --- a/app/code/Magento/OfflineShipping/Model/Config/Source/Flatrate.php +++ b/app/code/Magento/OfflineShipping/Model/Config/Source/Flatrate.php @@ -9,7 +9,7 @@ * @api * @since 100.0.2 */ -class Flatrate implements \Magento\Framework\Option\ArrayInterface +class Flatrate implements \Magento\Framework\Data\OptionSourceInterface { /** * {@inheritdoc} diff --git a/app/code/Magento/OfflineShipping/Model/Config/Source/Tablerate.php b/app/code/Magento/OfflineShipping/Model/Config/Source/Tablerate.php index 4771596fb06d9..094489edf4729 100644 --- a/app/code/Magento/OfflineShipping/Model/Config/Source/Tablerate.php +++ b/app/code/Magento/OfflineShipping/Model/Config/Source/Tablerate.php @@ -9,7 +9,7 @@ * @api * @since 100.0.2 */ -class Tablerate implements \Magento\Framework\Option\ArrayInterface +class Tablerate implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\OfflineShipping\Model\Carrier\Tablerate diff --git a/app/code/Magento/PageCache/Model/System/Config/Source/Application.php b/app/code/Magento/PageCache/Model/System/Config/Source/Application.php index d44daa7dec95d..247b86f313d30 100644 --- a/app/code/Magento/PageCache/Model/System/Config/Source/Application.php +++ b/app/code/Magento/PageCache/Model/System/Config/Source/Application.php @@ -9,13 +9,13 @@ */ namespace Magento\PageCache\Model\System\Config\Source; -use Magento\Framework\Option\ArrayInterface; +use Magento\Framework\Data\OptionSourceInterface; use Magento\PageCache\Model\Config; /** * Class Application */ -class Application implements ArrayInterface +class Application implements OptionSourceInterface { /** * Options getter diff --git a/app/code/Magento/Payment/Model/Config/Source/Allmethods.php b/app/code/Magento/Payment/Model/Config/Source/Allmethods.php index 4dbf7acd158e2..07a459fbd1391 100644 --- a/app/code/Magento/Payment/Model/Config/Source/Allmethods.php +++ b/app/code/Magento/Payment/Model/Config/Source/Allmethods.php @@ -5,7 +5,7 @@ */ namespace Magento\Payment\Model\Config\Source; -class Allmethods implements \Magento\Framework\Option\ArrayInterface +class Allmethods implements \Magento\Framework\Data\OptionSourceInterface { /** * Payment data diff --git a/app/code/Magento/Payment/Model/Config/Source/Allspecificcountries.php b/app/code/Magento/Payment/Model/Config/Source/Allspecificcountries.php index 0a3850745d3aa..1e69d3a696fb7 100644 --- a/app/code/Magento/Payment/Model/Config/Source/Allspecificcountries.php +++ b/app/code/Magento/Payment/Model/Config/Source/Allspecificcountries.php @@ -9,7 +9,7 @@ * @api * @since 100.0.2 */ -class Allspecificcountries implements \Magento\Framework\Option\ArrayInterface +class Allspecificcountries implements \Magento\Framework\Data\OptionSourceInterface { /** * {@inheritdoc} diff --git a/app/code/Magento/Payment/Model/Config/Source/Cctype.php b/app/code/Magento/Payment/Model/Config/Source/Cctype.php index d97f549984fdf..6a41b51f783be 100644 --- a/app/code/Magento/Payment/Model/Config/Source/Cctype.php +++ b/app/code/Magento/Payment/Model/Config/Source/Cctype.php @@ -5,7 +5,7 @@ */ namespace Magento\Payment\Model\Config\Source; -class Cctype implements \Magento\Framework\Option\ArrayInterface +class Cctype implements \Magento\Framework\Data\OptionSourceInterface { /** * Payment config model diff --git a/app/code/Magento/Payment/Model/ResourceModel/Grid/GroupList.php b/app/code/Magento/Payment/Model/ResourceModel/Grid/GroupList.php index 7505643badf98..30e870671c974 100644 --- a/app/code/Magento/Payment/Model/ResourceModel/Grid/GroupList.php +++ b/app/code/Magento/Payment/Model/ResourceModel/Grid/GroupList.php @@ -8,7 +8,7 @@ /** * Sales transaction types option array */ -class GroupList implements \Magento\Framework\Option\ArrayInterface +class GroupList implements \Magento\Framework\Data\OptionSourceInterface { /** * Payment data diff --git a/app/code/Magento/Payment/Model/ResourceModel/Grid/TypeList.php b/app/code/Magento/Payment/Model/ResourceModel/Grid/TypeList.php index 170db877a47b1..2cb812bab035b 100644 --- a/app/code/Magento/Payment/Model/ResourceModel/Grid/TypeList.php +++ b/app/code/Magento/Payment/Model/ResourceModel/Grid/TypeList.php @@ -8,7 +8,7 @@ /** * Sales transaction payment method types option array */ -class TypeList implements \Magento\Framework\Option\ArrayInterface +class TypeList implements \Magento\Framework\Data\OptionSourceInterface { /** * Payment data diff --git a/app/code/Magento/Payment/Model/Source/Cctype.php b/app/code/Magento/Payment/Model/Source/Cctype.php index 7929e147e05b9..f75da4c7747b8 100644 --- a/app/code/Magento/Payment/Model/Source/Cctype.php +++ b/app/code/Magento/Payment/Model/Source/Cctype.php @@ -13,7 +13,7 @@ * @api * @since 100.0.2 */ -class Cctype implements \Magento\Framework\Option\ArrayInterface +class Cctype implements \Magento\Framework\Data\OptionSourceInterface { /** * Allowed CC types diff --git a/app/code/Magento/Payment/Model/Source/Invoice.php b/app/code/Magento/Payment/Model/Source/Invoice.php index 1c8551aace312..cabdbc54c1a30 100644 --- a/app/code/Magento/Payment/Model/Source/Invoice.php +++ b/app/code/Magento/Payment/Model/Source/Invoice.php @@ -13,7 +13,7 @@ * @api * @since 100.0.2 */ -class Invoice implements \Magento\Framework\Option\ArrayInterface +class Invoice implements \Magento\Framework\Data\OptionSourceInterface { /** * {@inheritdoc} diff --git a/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement/Options/TransactionEvents.php b/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement/Options/TransactionEvents.php index ad47e7b84fe20..7cf9520cd5417 100644 --- a/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement/Options/TransactionEvents.php +++ b/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement/Options/TransactionEvents.php @@ -10,7 +10,7 @@ * * @author Magento Core Team */ -class TransactionEvents implements \Magento\Framework\Option\ArrayInterface +class TransactionEvents implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\Paypal\Model\Report\Settlement\Row diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/BuyerCountry.php b/app/code/Magento/Paypal/Model/System/Config/Source/BuyerCountry.php index dc0c1183bc25f..15edbb749ae6f 100644 --- a/app/code/Magento/Paypal/Model/System/Config/Source/BuyerCountry.php +++ b/app/code/Magento/Paypal/Model/System/Config/Source/BuyerCountry.php @@ -8,7 +8,7 @@ /** * Source model for buyer countries supported by PayPal */ -class BuyerCountry implements \Magento\Framework\Option\ArrayInterface +class BuyerCountry implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\Paypal\Model\ConfigFactory diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/FetchingSchedule.php b/app/code/Magento/Paypal/Model/System/Config/Source/FetchingSchedule.php index b9f66926a8459..40ccfe66c00d1 100644 --- a/app/code/Magento/Paypal/Model/System/Config/Source/FetchingSchedule.php +++ b/app/code/Magento/Paypal/Model/System/Config/Source/FetchingSchedule.php @@ -8,7 +8,7 @@ /** * Source model for available settlement report fetching intervals */ -class FetchingSchedule implements \Magento\Framework\Option\ArrayInterface +class FetchingSchedule implements \Magento\Framework\Data\OptionSourceInterface { /** * {@inheritdoc} diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/Logo.php b/app/code/Magento/Paypal/Model/System/Config/Source/Logo.php index 2377a8bf3fde4..86ebff600f298 100644 --- a/app/code/Magento/Paypal/Model/System/Config/Source/Logo.php +++ b/app/code/Magento/Paypal/Model/System/Config/Source/Logo.php @@ -8,7 +8,7 @@ /** * Source model for available logo types */ -class Logo implements \Magento\Framework\Option\ArrayInterface +class Logo implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\Paypal\Model\ConfigFactory diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/MerchantCountry.php b/app/code/Magento/Paypal/Model/System/Config/Source/MerchantCountry.php index b4efcd14a81c8..8dfa6ecf47491 100644 --- a/app/code/Magento/Paypal/Model/System/Config/Source/MerchantCountry.php +++ b/app/code/Magento/Paypal/Model/System/Config/Source/MerchantCountry.php @@ -8,7 +8,7 @@ /** * Source model for merchant countries supported by PayPal */ -class MerchantCountry implements \Magento\Framework\Option\ArrayInterface +class MerchantCountry implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\Paypal\Model\ConfigFactory diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/PaymentActions.php b/app/code/Magento/Paypal/Model/System/Config/Source/PaymentActions.php index 1111612a6cc9b..24d51695d1d15 100644 --- a/app/code/Magento/Paypal/Model/System/Config/Source/PaymentActions.php +++ b/app/code/Magento/Paypal/Model/System/Config/Source/PaymentActions.php @@ -8,7 +8,7 @@ /** * Source model for available payment actions */ -class PaymentActions implements \Magento\Framework\Option\ArrayInterface +class PaymentActions implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\Paypal\Model\ConfigFactory diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/PaymentActions/Express.php b/app/code/Magento/Paypal/Model/System/Config/Source/PaymentActions/Express.php index 47cfaf74af2ed..00cbc66017bb6 100644 --- a/app/code/Magento/Paypal/Model/System/Config/Source/PaymentActions/Express.php +++ b/app/code/Magento/Paypal/Model/System/Config/Source/PaymentActions/Express.php @@ -8,7 +8,7 @@ /** * Source model for available paypal express payment actions */ -class Express implements \Magento\Framework\Option\ArrayInterface +class Express implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\Paypal\Model\ConfigFactory diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/RequireBillingAddress.php b/app/code/Magento/Paypal/Model/System/Config/Source/RequireBillingAddress.php index 2fc86f8e6ef58..093a6f97bbbe4 100644 --- a/app/code/Magento/Paypal/Model/System/Config/Source/RequireBillingAddress.php +++ b/app/code/Magento/Paypal/Model/System/Config/Source/RequireBillingAddress.php @@ -8,7 +8,7 @@ /** * Source model for Require Billing Address */ -class RequireBillingAddress implements \Magento\Framework\Option\ArrayInterface +class RequireBillingAddress implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\Paypal\Model\ConfigFactory diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/UrlMethod.php b/app/code/Magento/Paypal/Model/System/Config/Source/UrlMethod.php index 9769b9b1bce21..7842a8d5fbc67 100644 --- a/app/code/Magento/Paypal/Model/System/Config/Source/UrlMethod.php +++ b/app/code/Magento/Paypal/Model/System/Config/Source/UrlMethod.php @@ -8,7 +8,7 @@ /** * Source model for url method: GET/POST */ -class UrlMethod implements \Magento\Framework\Option\ArrayInterface +class UrlMethod implements \Magento\Framework\Data\OptionSourceInterface { /** * {@inheritdoc} diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/Yesnoshortcut.php b/app/code/Magento/Paypal/Model/System/Config/Source/Yesnoshortcut.php index 638f3d05ab114..10f07f1f4dccd 100644 --- a/app/code/Magento/Paypal/Model/System/Config/Source/Yesnoshortcut.php +++ b/app/code/Magento/Paypal/Model/System/Config/Source/Yesnoshortcut.php @@ -8,7 +8,7 @@ /** * Used in creating options for Yes|No config value selection */ -class Yesnoshortcut implements \Magento\Framework\Option\ArrayInterface +class Yesnoshortcut implements \Magento\Framework\Data\OptionSourceInterface { /** * Options getter diff --git a/app/code/Magento/Sales/Model/Config/Source/Order/Status.php b/app/code/Magento/Sales/Model/Config/Source/Order/Status.php index 80daf4707279b..145dbd4965fb8 100644 --- a/app/code/Magento/Sales/Model/Config/Source/Order/Status.php +++ b/app/code/Magento/Sales/Model/Config/Source/Order/Status.php @@ -14,7 +14,7 @@ * @api * @since 100.0.2 */ -class Status implements \Magento\Framework\Option\ArrayInterface +class Status implements \Magento\Framework\Data\OptionSourceInterface { const UNDEFINED_OPTION_LABEL = '-- Please Select --'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Grid/StatusList.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Grid/StatusList.php index 858a0d52b44a7..2bbe701f7a84b 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Grid/StatusList.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Grid/StatusList.php @@ -8,7 +8,7 @@ /** * Sales creditmemo statuses option array */ -class StatusList implements \Magento\Framework\Option\ArrayInterface +class StatusList implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\Sales\Api\CreditmemoRepositoryInterface diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/StatusList.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/StatusList.php index f6160bd243326..2ebc8762cb8a4 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/StatusList.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/StatusList.php @@ -8,7 +8,7 @@ /** * Sales invoices statuses option array */ -class StatusList implements \Magento\Framework\Option\ArrayInterface +class StatusList implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\Sales\Api\InvoiceRepositoryInterface diff --git a/app/code/Magento/Sales/Model/ResourceModel/Transaction/Grid/TypeList.php b/app/code/Magento/Sales/Model/ResourceModel/Transaction/Grid/TypeList.php index f9dc1d023f5a2..43ba073f382ec 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Transaction/Grid/TypeList.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Transaction/Grid/TypeList.php @@ -10,7 +10,7 @@ /** * Sales transaction types option array */ -class TypeList implements \Magento\Framework\Option\ArrayInterface +class TypeList implements \Magento\Framework\Data\OptionSourceInterface { /** * @var TransactionRepositoryInterface diff --git a/app/code/Magento/SalesRule/Model/System/Config/Source/Coupon/Format.php b/app/code/Magento/SalesRule/Model/System/Config/Source/Coupon/Format.php index 04e9b525f5274..9d50481d81471 100644 --- a/app/code/Magento/SalesRule/Model/System/Config/Source/Coupon/Format.php +++ b/app/code/Magento/SalesRule/Model/System/Config/Source/Coupon/Format.php @@ -10,7 +10,7 @@ * * @author Magento Core Team */ -class Format implements \Magento\Framework\Option\ArrayInterface +class Format implements \Magento\Framework\Data\OptionSourceInterface { /** * Sales rule coupon diff --git a/app/code/Magento/Search/Model/Adminhtml/System/Config/Source/Engine.php b/app/code/Magento/Search/Model/Adminhtml/System/Config/Source/Engine.php index a7595aba9b664..49065bb142ac8 100644 --- a/app/code/Magento/Search/Model/Adminhtml/System/Config/Source/Engine.php +++ b/app/code/Magento/Search/Model/Adminhtml/System/Config/Source/Engine.php @@ -11,7 +11,7 @@ * @api * @since 100.0.2 */ -class Engine implements \Magento\Framework\Option\ArrayInterface +class Engine implements \Magento\Framework\Data\OptionSourceInterface { /** * Engines list diff --git a/app/code/Magento/Security/Model/Config/Source/ResetMethod.php b/app/code/Magento/Security/Model/Config/Source/ResetMethod.php index b925262747fd0..f7c35f81e67c0 100644 --- a/app/code/Magento/Security/Model/Config/Source/ResetMethod.php +++ b/app/code/Magento/Security/Model/Config/Source/ResetMethod.php @@ -10,7 +10,7 @@ * Source model for setting "Limit Password Reset Requests Method" * */ -class ResetMethod implements \Magento\Framework\Option\ArrayInterface +class ResetMethod implements \Magento\Framework\Data\OptionSourceInterface { const OPTION_BY_IP_AND_EMAIL = 1; const OPTION_BY_IP = 2; diff --git a/app/code/Magento/SendFriend/Model/Source/Checktype.php b/app/code/Magento/SendFriend/Model/Source/Checktype.php index 231e5944beb9a..e152ade135bd0 100644 --- a/app/code/Magento/SendFriend/Model/Source/Checktype.php +++ b/app/code/Magento/SendFriend/Model/Source/Checktype.php @@ -11,7 +11,7 @@ */ namespace Magento\SendFriend\Model\Source; -class Checktype implements \Magento\Framework\Option\ArrayInterface +class Checktype implements \Magento\Framework\Data\OptionSourceInterface { /** * Retrieve Check Type Option array diff --git a/app/code/Magento/Shipping/Model/Config/Source/Allmethods.php b/app/code/Magento/Shipping/Model/Config/Source/Allmethods.php index e310df8ed11cb..510c2bb7703cf 100644 --- a/app/code/Magento/Shipping/Model/Config/Source/Allmethods.php +++ b/app/code/Magento/Shipping/Model/Config/Source/Allmethods.php @@ -5,7 +5,7 @@ */ namespace Magento\Shipping\Model\Config\Source; -class Allmethods implements \Magento\Framework\Option\ArrayInterface +class Allmethods implements \Magento\Framework\Data\OptionSourceInterface { /** * Core store config diff --git a/app/code/Magento/Shipping/Model/Config/Source/Allspecificcountries.php b/app/code/Magento/Shipping/Model/Config/Source/Allspecificcountries.php index ebd84c51e0ee5..f5957576ec824 100644 --- a/app/code/Magento/Shipping/Model/Config/Source/Allspecificcountries.php +++ b/app/code/Magento/Shipping/Model/Config/Source/Allspecificcountries.php @@ -5,7 +5,7 @@ */ namespace Magento\Shipping\Model\Config\Source; -class Allspecificcountries implements \Magento\Framework\Option\ArrayInterface +class Allspecificcountries implements \Magento\Framework\Data\OptionSourceInterface { /** * {@inheritdoc} diff --git a/app/code/Magento/Shipping/Model/Source/HandlingAction.php b/app/code/Magento/Shipping/Model/Source/HandlingAction.php index f56cce631b0ef..845d924706c14 100644 --- a/app/code/Magento/Shipping/Model/Source/HandlingAction.php +++ b/app/code/Magento/Shipping/Model/Source/HandlingAction.php @@ -5,7 +5,7 @@ */ namespace Magento\Shipping\Model\Source; -class HandlingAction implements \Magento\Framework\Option\ArrayInterface +class HandlingAction implements \Magento\Framework\Data\OptionSourceInterface { /** * {@inheritdoc} diff --git a/app/code/Magento/Shipping/Model/Source/HandlingType.php b/app/code/Magento/Shipping/Model/Source/HandlingType.php index 8d876338654fd..eb78c1dac8a4e 100644 --- a/app/code/Magento/Shipping/Model/Source/HandlingType.php +++ b/app/code/Magento/Shipping/Model/Source/HandlingType.php @@ -5,7 +5,7 @@ */ namespace Magento\Shipping\Model\Source; -class HandlingType implements \Magento\Framework\Option\ArrayInterface +class HandlingType implements \Magento\Framework\Data\OptionSourceInterface { /** * {@inheritdoc} diff --git a/app/code/Magento/Sitemap/Model/Config/Source/Frequency.php b/app/code/Magento/Sitemap/Model/Config/Source/Frequency.php index 87ce87189229c..4ad99448f386b 100644 --- a/app/code/Magento/Sitemap/Model/Config/Source/Frequency.php +++ b/app/code/Magento/Sitemap/Model/Config/Source/Frequency.php @@ -5,7 +5,7 @@ */ namespace Magento\Sitemap\Model\Config\Source; -class Frequency implements \Magento\Framework\Option\ArrayInterface +class Frequency implements \Magento\Framework\Data\OptionSourceInterface { /** * {@inheritdoc} diff --git a/app/code/Magento/Sitemap/Model/Source/Product/Image/IncludeImage.php b/app/code/Magento/Sitemap/Model/Source/Product/Image/IncludeImage.php index 9dd905d63d9e2..e8f5bee10e0dd 100644 --- a/app/code/Magento/Sitemap/Model/Source/Product/Image/IncludeImage.php +++ b/app/code/Magento/Sitemap/Model/Source/Product/Image/IncludeImage.php @@ -14,7 +14,7 @@ * @api * @since 100.0.2 */ -class IncludeImage implements \Magento\Framework\Option\ArrayInterface +class IncludeImage implements \Magento\Framework\Data\OptionSourceInterface { /**#@+ * Add Images into Sitemap possible values diff --git a/app/code/Magento/Tax/Model/Config/Source/Apply/On.php b/app/code/Magento/Tax/Model/Config/Source/Apply/On.php index 3068574dbc899..f1c8d6b9d0291 100644 --- a/app/code/Magento/Tax/Model/Config/Source/Apply/On.php +++ b/app/code/Magento/Tax/Model/Config/Source/Apply/On.php @@ -5,7 +5,7 @@ */ namespace Magento\Tax\Model\Config\Source\Apply; -class On implements \Magento\Framework\Option\ArrayInterface +class On implements \Magento\Framework\Data\OptionSourceInterface { /** * @return array diff --git a/app/code/Magento/Tax/Model/Config/Source/Basedon.php b/app/code/Magento/Tax/Model/Config/Source/Basedon.php index 0db022775448d..dbb1c410b1f8d 100644 --- a/app/code/Magento/Tax/Model/Config/Source/Basedon.php +++ b/app/code/Magento/Tax/Model/Config/Source/Basedon.php @@ -5,7 +5,7 @@ */ namespace Magento\Tax\Model\Config\Source; -class Basedon implements \Magento\Framework\Option\ArrayInterface +class Basedon implements \Magento\Framework\Data\OptionSourceInterface { /** * @return array diff --git a/app/code/Magento/Tax/Model/Config/Source/Catalog.php b/app/code/Magento/Tax/Model/Config/Source/Catalog.php index f46089646579b..6867554cdb632 100644 --- a/app/code/Magento/Tax/Model/Config/Source/Catalog.php +++ b/app/code/Magento/Tax/Model/Config/Source/Catalog.php @@ -5,7 +5,7 @@ */ namespace Magento\Tax\Model\Config\Source; -class Catalog implements \Magento\Framework\Option\ArrayInterface +class Catalog implements \Magento\Framework\Data\OptionSourceInterface { /** * @return array diff --git a/app/code/Magento/Tax/Model/System/Config/Source/Algorithm.php b/app/code/Magento/Tax/Model/System/Config/Source/Algorithm.php index 550823588a86b..bb9f92c77bdbf 100644 --- a/app/code/Magento/Tax/Model/System/Config/Source/Algorithm.php +++ b/app/code/Magento/Tax/Model/System/Config/Source/Algorithm.php @@ -5,7 +5,7 @@ */ namespace Magento\Tax\Model\System\Config\Source; -class Algorithm implements \Magento\Framework\Option\ArrayInterface +class Algorithm implements \Magento\Framework\Data\OptionSourceInterface { /** * @var array diff --git a/app/code/Magento/Tax/Model/System/Config/Source/Apply.php b/app/code/Magento/Tax/Model/System/Config/Source/Apply.php index a82637a9da419..cafec1419dc30 100644 --- a/app/code/Magento/Tax/Model/System/Config/Source/Apply.php +++ b/app/code/Magento/Tax/Model/System/Config/Source/Apply.php @@ -5,7 +5,7 @@ */ namespace Magento\Tax\Model\System\Config\Source; -class Apply implements \Magento\Framework\Option\ArrayInterface +class Apply implements \Magento\Framework\Data\OptionSourceInterface { /** * @var array diff --git a/app/code/Magento/Tax/Model/System/Config/Source/PriceType.php b/app/code/Magento/Tax/Model/System/Config/Source/PriceType.php index 480a6d0a94e9b..6ffd004a49de6 100644 --- a/app/code/Magento/Tax/Model/System/Config/Source/PriceType.php +++ b/app/code/Magento/Tax/Model/System/Config/Source/PriceType.php @@ -5,7 +5,7 @@ */ namespace Magento\Tax\Model\System\Config\Source; -class PriceType implements \Magento\Framework\Option\ArrayInterface +class PriceType implements \Magento\Framework\Data\OptionSourceInterface { /** * @var array diff --git a/app/code/Magento/Tax/Model/System/Config/Source/Tax/Display/Type.php b/app/code/Magento/Tax/Model/System/Config/Source/Tax/Display/Type.php index 6897a7d9e75e3..7d53f8b29454c 100644 --- a/app/code/Magento/Tax/Model/System/Config/Source/Tax/Display/Type.php +++ b/app/code/Magento/Tax/Model/System/Config/Source/Tax/Display/Type.php @@ -11,7 +11,7 @@ */ namespace Magento\Tax\Model\System\Config\Source\Tax\Display; -class Type implements \Magento\Framework\Option\ArrayInterface +class Type implements \Magento\Framework\Data\OptionSourceInterface { /** * @var array diff --git a/app/code/Magento/Tax/Model/System/Config/Source/Tax/Region.php b/app/code/Magento/Tax/Model/System/Config/Source/Tax/Region.php index a3e105788cb31..233ad9ca46ec5 100644 --- a/app/code/Magento/Tax/Model/System/Config/Source/Tax/Region.php +++ b/app/code/Magento/Tax/Model/System/Config/Source/Tax/Region.php @@ -5,7 +5,7 @@ */ namespace Magento\Tax\Model\System\Config\Source\Tax; -class Region implements \Magento\Framework\Option\ArrayInterface +class Region implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\Directory\Model\ResourceModel\Region\CollectionFactory diff --git a/app/code/Magento/Theme/Model/Layout/Source/Layout.php b/app/code/Magento/Theme/Model/Layout/Source/Layout.php index f39481b824758..b34752a403aa6 100644 --- a/app/code/Magento/Theme/Model/Layout/Source/Layout.php +++ b/app/code/Magento/Theme/Model/Layout/Source/Layout.php @@ -5,7 +5,7 @@ */ namespace Magento\Theme\Model\Layout\Source; -class Layout implements \Magento\Framework\Option\ArrayInterface +class Layout implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\Theme\Model\Layout\Config diff --git a/app/code/Magento/Translation/Model/Js/Config/Source/Strategy.php b/app/code/Magento/Translation/Model/Js/Config/Source/Strategy.php index f3d3bb7606648..92b27bbb3d4dc 100644 --- a/app/code/Magento/Translation/Model/Js/Config/Source/Strategy.php +++ b/app/code/Magento/Translation/Model/Js/Config/Source/Strategy.php @@ -7,7 +7,7 @@ use Magento\Translation\Model\Js\Config; -class Strategy implements \Magento\Framework\Option\ArrayInterface +class Strategy implements \Magento\Framework\Data\OptionSourceInterface { /** * {@inheritdoc} diff --git a/app/code/Magento/UrlRewrite/Model/OptionProvider.php b/app/code/Magento/UrlRewrite/Model/OptionProvider.php index ec70dad90e7cc..d9a0e10a2d4aa 100644 --- a/app/code/Magento/UrlRewrite/Model/OptionProvider.php +++ b/app/code/Magento/UrlRewrite/Model/OptionProvider.php @@ -7,12 +7,12 @@ */ namespace Magento\UrlRewrite\Model; -use Magento\Framework\Option\ArrayInterface; +use Magento\Framework\Data\OptionSourceInterface; /** * @codeCoverageIgnore */ -class OptionProvider implements ArrayInterface +class OptionProvider implements OptionSourceInterface { /** * Permanent redirect code diff --git a/app/code/Magento/User/Model/System/Config/Source/Password.php b/app/code/Magento/User/Model/System/Config/Source/Password.php index 12535b82bad77..410145e3c5ba9 100644 --- a/app/code/Magento/User/Model/System/Config/Source/Password.php +++ b/app/code/Magento/User/Model/System/Config/Source/Password.php @@ -11,7 +11,7 @@ */ namespace Magento\User\Model\System\Config\Source; -class Password extends \Magento\Framework\DataObject implements \Magento\Framework\Option\ArrayInterface +class Password extends \Magento\Framework\DataObject implements \Magento\Framework\Data\OptionSourceInterface { /** * Get options for select diff --git a/app/code/Magento/Variable/Model/Source/Variables.php b/app/code/Magento/Variable/Model/Source/Variables.php index 38c2f92d25545..a770e149439e7 100644 --- a/app/code/Magento/Variable/Model/Source/Variables.php +++ b/app/code/Magento/Variable/Model/Source/Variables.php @@ -8,7 +8,7 @@ /** * Store Contact Information source model. */ -class Variables implements \Magento\Framework\Option\ArrayInterface +class Variables implements \Magento\Framework\Data\OptionSourceInterface { /** * Variable types diff --git a/app/code/Magento/Weee/Model/Config/Source/Display.php b/app/code/Magento/Weee/Model/Config/Source/Display.php index 72432180f9b25..9cd55b7319965 100644 --- a/app/code/Magento/Weee/Model/Config/Source/Display.php +++ b/app/code/Magento/Weee/Model/Config/Source/Display.php @@ -5,7 +5,7 @@ */ namespace Magento\Weee\Model\Config\Source; -class Display implements \Magento\Framework\Option\ArrayInterface +class Display implements \Magento\Framework\Data\OptionSourceInterface { /** * Retrieve list of available options to display FPT diff --git a/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/ThemeId.php b/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/ThemeId.php index 8e5d8d63840fb..1156de7bcb5ed 100644 --- a/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/ThemeId.php +++ b/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/ThemeId.php @@ -12,7 +12,7 @@ * @deprecated 100.2.0 created new class that correctly loads theme options and whose name follows naming convention * @see \Magento\Widget\Model\ResourceModel\Widget\Instance\Options\Themes */ -class ThemeId implements \Magento\Framework\Option\ArrayInterface +class ThemeId implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\Widget\Model\Widget\Instance diff --git a/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/Types.php b/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/Types.php index 0db3362753a65..5ac79e8b7c332 100644 --- a/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/Types.php +++ b/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/Types.php @@ -9,7 +9,7 @@ /** * Widget Instance Types Options */ -class Types implements \Magento\Framework\Option\ArrayInterface +class Types implements \Magento\Framework\Data\OptionSourceInterface { /** * @var \Magento\Widget\Model\Widget\Instance diff --git a/app/code/Magento/Widget/Model/Widget/Instance/OptionsFactory.php b/app/code/Magento/Widget/Model/Widget/Instance/OptionsFactory.php index 9067753804829..c4b5b20f3a40a 100644 --- a/app/code/Magento/Widget/Model/Widget/Instance/OptionsFactory.php +++ b/app/code/Magento/Widget/Model/Widget/Instance/OptionsFactory.php @@ -25,7 +25,7 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan * * @param string $type * @param array $data - * @return \Magento\Framework\Option\ArrayInterface + * @return \Magento\Framework\Data\OptionSourceInterface */ public function create($type, array $data = []) { diff --git a/app/code/Magento/Wishlist/Model/Config/Source/Summary.php b/app/code/Magento/Wishlist/Model/Config/Source/Summary.php index 9c6a2c9f2d22c..37d4c04c86b91 100644 --- a/app/code/Magento/Wishlist/Model/Config/Source/Summary.php +++ b/app/code/Magento/Wishlist/Model/Config/Source/Summary.php @@ -5,7 +5,7 @@ */ namespace Magento\Wishlist\Model\Config\Source; -class Summary implements \Magento\Framework\Option\ArrayInterface +class Summary implements \Magento\Framework\Data\OptionSourceInterface { /** * @return array diff --git a/lib/internal/Magento/Framework/App/Scope/Source.php b/lib/internal/Magento/Framework/App/Scope/Source.php index 926edc5e0694e..49c6ac9876a01 100644 --- a/lib/internal/Magento/Framework/App/Scope/Source.php +++ b/lib/internal/Magento/Framework/App/Scope/Source.php @@ -6,9 +6,9 @@ namespace Magento\Framework\App\Scope; use Magento\Framework\App\ScopeResolverPool; -use Magento\Framework\Option\ArrayInterface; +use Magento\Framework\Data\OptionSourceInterface; -class Source implements ArrayInterface +class Source implements OptionSourceInterface { /** * @var ScopeResolverPool diff --git a/lib/internal/Magento/Framework/Data/Collection.php b/lib/internal/Magento/Framework/Data/Collection.php index 9c789e81913c4..2c7907324e93d 100644 --- a/lib/internal/Magento/Framework/Data/Collection.php +++ b/lib/internal/Magento/Framework/Data/Collection.php @@ -6,7 +6,7 @@ namespace Magento\Framework\Data; use Magento\Framework\Data\Collection\EntityFactoryInterface; -use Magento\Framework\Option\ArrayInterface; +use Magento\Framework\Data\OptionSourceInterface; /** * Data collection @@ -15,7 +15,7 @@ * * @api */ -class Collection implements \IteratorAggregate, \Countable, ArrayInterface, CollectionDataSourceInterface +class Collection implements \IteratorAggregate, \Countable, OptionSourceInterface, CollectionDataSourceInterface { const SORT_ORDER_ASC = 'ASC'; diff --git a/lib/internal/Magento/Framework/Option/ArrayInterface.php b/lib/internal/Magento/Framework/Option/ArrayInterface.php index ecfa71227f9f2..8e4f47774a923 100644 --- a/lib/internal/Magento/Framework/Option/ArrayInterface.php +++ b/lib/internal/Magento/Framework/Option/ArrayInterface.php @@ -7,6 +7,7 @@ /** * @todo Remove in favor of the ancestor interface + * @deprecated */ interface ArrayInterface extends \Magento\Framework\Data\OptionSourceInterface { diff --git a/lib/internal/Magento/Framework/Option/ArrayPool.php b/lib/internal/Magento/Framework/Option/ArrayPool.php index 5ac349d99b82e..e4cf6ac32fdf8 100644 --- a/lib/internal/Magento/Framework/Option/ArrayPool.php +++ b/lib/internal/Magento/Framework/Option/ArrayPool.php @@ -28,13 +28,15 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan * * @param string $model * @throws \InvalidArgumentException - * @return \Magento\Framework\Option\ArrayInterface + * @return \Magento\Framework\Data\OptionSourceInterface */ public function get($model) { $modelInstance = $this->_objectManager->get($model); - if (false == $modelInstance instanceof \Magento\Framework\Option\ArrayInterface) { - throw new \InvalidArgumentException($model . 'doesn\'t implement \Magento\Framework\Option\ArrayInterface'); + if (false == $modelInstance instanceof \Magento\Framework\Data\OptionSourceInterface) { + throw new \InvalidArgumentException( + $model . 'doesn\'t implement \Magento\Framework\Data\OptionSourceInterface' + ); } return $modelInstance; } diff --git a/lib/internal/Magento/Framework/Option/README.md b/lib/internal/Magento/Framework/Option/README.md index 689cc2023dede..6c2c8c2e00ec2 100644 --- a/lib/internal/Magento/Framework/Option/README.md +++ b/lib/internal/Magento/Framework/Option/README.md @@ -1 +1 @@ -This module is used to create option values in models to value-label pairs that are used in forms. The model must implement Magento\Framework\Option\ArrayInterface or an exception will be thrown. \ No newline at end of file +This module is used to create option values in models to value-label pairs that are used in forms. The model must implement Magento\Framework\Data\OptionSourceInterface or an exception will be thrown. \ No newline at end of file diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Label.php b/lib/internal/Magento/Framework/View/Design/Theme/Label.php index ff7203603572f..3e22f6f73df64 100644 --- a/lib/internal/Magento/Framework/View/Design/Theme/Label.php +++ b/lib/internal/Magento/Framework/View/Design/Theme/Label.php @@ -9,7 +9,7 @@ */ namespace Magento\Framework\View\Design\Theme; -class Label implements \Magento\Framework\Option\ArrayInterface +class Label implements \Magento\Framework\Data\OptionSourceInterface { /** * Labels collection array diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Label/Options.php b/lib/internal/Magento/Framework/View/Design/Theme/Label/Options.php index 323cc1a9b61c9..6e1a7c6183b88 100644 --- a/lib/internal/Magento/Framework/View/Design/Theme/Label/Options.php +++ b/lib/internal/Magento/Framework/View/Design/Theme/Label/Options.php @@ -5,9 +5,9 @@ */ namespace Magento\Framework\View\Design\Theme\Label; -use Magento\Framework\Option\ArrayInterface; +use Magento\Framework\Data\OptionSourceInterface; -class Options implements ArrayInterface +class Options implements OptionSourceInterface { /** * @var ListInterface